diff --git a/.github/workflows/actions-nightly.yml b/.github/workflows/actions-nightly.yml
index 355a53883c..2539363ff9 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@v3.2.0
+    uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.3.1
     with:
       rust-toolchain: nightly-2024-05-22
       path-to-sc-meta: framework/meta
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index dc0bcc8596..58ea9e80c6 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,11 +14,23 @@ 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@4ec1f927bd99ed90a816ded805daa75fd2040258
     with:
       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
     secrets:
-      token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+      token: ${{ secrets.GITHUB_TOKEN }}
+
+  formatting:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      # Ensure rustfmt is installed and setup problem matcher
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          components: rustfmt
+      - name: Rustfmt Check
+        uses: actions-rust-lang/rustfmt@v1
diff --git a/.github/workflows/lldb-formatter-tests.yml b/.github/workflows/lldb-formatter-tests.yml
index 9aaba9eadd..257476c191 100644
--- a/.github/workflows/lldb-formatter-tests.yml
+++ b/.github/workflows/lldb-formatter-tests.yml
@@ -22,14 +22,14 @@ jobs:
         uses: robinraju/release-downloader@v1.5
         with:
           repository: vadimcn/vscode-lldb
-          latest: true
-          fileName: codelldb-x86_64-linux.vsix
+          tag: v1.11.0
+          fileName: codelldb-linux-x64.vsix
 
       - name: Setup vscode-lldb
         run: |
-          unzip codelldb-x86_64-linux.vsix -d vscode-lldb
-          mkdir -p $HOME/.vscode/extensions/vadimcn.vscode-lldb-x.x.x/
-          mv vscode-lldb/extension/* $HOME/.vscode/extensions/vadimcn.vscode-lldb-x.x.x/
+          unzip codelldb-linux-x64.vsix -d vscode-lldb
+          mkdir -p $HOME/.vscode/extensions/vadimcn.vscode-lldb-1.11.0/
+          mv vscode-lldb/extension/* $HOME/.vscode/extensions/vadimcn.vscode-lldb-1.11.0/
 
       - name: Run the rust tests
         run: |
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
diff --git a/.gitignore b/.gitignore
index 8295450d89..00a4be02e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 **/target/**
+**/dist
 
 # Remove Cargo.lock from the framework, but not from the wasm contracts.
 # In contracts it helps with tracing builds.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16cf669c27..9d6c7ae1da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,9 +23,107 @@ They are:
 - `multiversx-sc-codec`, in short `codec`, the serializer/deserializer, 2 crates:
 	- `multiversx-sc-codec`
 	- `multiversx-sc-codec-derive`
-- `multiversx-chain-vm`, in short `vm`, a Rust VM implementation, 1 crate.
+- Chain crates, in short `chain`. Formerly it was only the VM (`vm`). 2 crates:
+	- `multiversx-chain-core` - *a common crate for chain types, constants, flags*
+	- `multiversx-chain-vm` - *a Rust VM implementation*
 - `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.
+- `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 3 crates:
+	- `multiversx-sdk`
+	- `multiversx-sdk-http`
+	- `multiversx-sdk-dapp`
+
+## [sc 0.54.1] - 2024-11-13
+- `sc-meta` `cs` - ChainSimulator CLI, which provides handy functionality to:
+	- install the chain simulator image in Docker;
+	- start/stop the chain simulator;
+	- quick testing using the `chain-simulator-tests` feature flag.
+- Adder interactor cleanup, including in template.
+- Interactor - `use_chain_simulator` builder method, for improved backwards compatibility.
+- `MultiValueEncodedCounted` - a lazy multi-value encoding, but with known number of elements.
+
+## [sc 0.54.0, sdk 0.7.0, chain 0.11.0] - 2024-11-06
+- New crate, `multiversx-chain-core`, to be used in both framework and Rust VM. It contains common types, flags, and constants that refer to the protocol.
+- Major SDK/interactor refactor:
+	- Added support for Chain Simulator in interactors:
+		- Added chain-simulator-specific endpoints: feed account, advance blocks
+		- Added a system to set up accounts in the chain simulator from the interactor;
+		- Support for advancing blocks in the interactor;
+	- Split SDK crate into:
+		- `multiversx-sdk` - only contains the specifications of the gateway API, without a mechanism to call the API;
+		- `multiversx-sdk-http` - functionality to call the gateway via reqwest;
+		- `multiversx-sdk-dapp` - functionality to call the gateway via wasm-bindgen, to be used in WebAssembly front-ends;
+	- Major improvements in the retrieving of transactions and other blockchain data fron the API, many bugs fixed;
+	- Support for writing integration tests for interactors, using the Chain Simulator;
+		- Also added support for test-related `chain-simulator-tests` feature flag in `sc-meta`;
+	- Interactors on the front-end:
+		- Interactor type made generic over the gateway API implementation, so that it can be used in both front-end and back-end, with no change in the code base;
+		- Support for custom random number generation for the front-end;
+	- Mechanism for fixing file paths in the interactor context;
+	- Fixed an issue with the account tool;
+	- Adjusted `sc-meta snippets` for the new syntax and the chain simulator support;
+- Unified syntax:
+	- `ReturnsHandledOrError` result handler, which can gracefully deal with failed transactions;
+	- `ReturnsGasUsed` result handler;
+	- `PassValue` result handler for providing a closure-like context for multi-transaction call/deploy;
+	- More specific back transfer result handlers: `ReturnsBackTransfersEGLD`, `ReturnsBackTransfersMultiESDT`, `ReturnsBackTransfersSingleESDT`;
+	- Fixed an issue with the update functionality not being general enough;
+	- Deprecated `prepare_async()`, developers can now call `run()` directly, asynchronously;
+- `sc-meta` improvements:
+	- New mechanism for detecting and warning about storage writes in readonly endpoints, integrated into the build system;
+	- Support for referencing the framework via git commit, branch, or tag, to make it easier to try out unreleased versions;
+	- Support for `default-features`;
+	- Better representation in console of the contract/lib folders, as well as better error messages.
+	- Refactoring of the dependency handling logic.
+- Fixed the debugger, following changes in the Rust debug tooling.
+- `ManagedVec` `set` always consumes ownership. Preparations for a profound memory management cleanup.
+- ABI:
+	- `title` field and annotation;
+	- Refactoring.
+
+## [sc 0.53.2] - 2024-10-02
+- `StakingModule` fix.
+
+## [sc 0.53.1, sdk 0.6.1] - 2024-10-01
+- Interactor: 
+  - Allow signature to be empty in TransactionOnNetwork;
+  - Allow return data to be empty in VMOutputApi.
+
+## [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.
+
+## [sc 0.52.2] - 2024-08-01
+- `ManagedBufferReadToEnd` extract data methods.
+
+## [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.
+- 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 5a348bfd06..95a73a2974 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,18 +47,29 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
 
 [[package]]
 name = "ahash"
@@ -100,9 +111,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -115,58 +126,64 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+
+[[package]]
+name = "anymap2"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
  "derive_arbitrary",
 ]
 
 [[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"
@@ -176,23 +193,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -201,6 +218,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
 [[package]]
 name = "basic-features"
 version = "0.0.0"
@@ -219,6 +242,7 @@ dependencies = [
  "clap",
  "multiversx-sc-snippets",
  "serde",
+ "tokio",
  "toml",
 ]
 
@@ -231,21 +255,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "basic-interact"
+name = "basic-interactor"
 version = "0.0.0"
 dependencies = [
  "adder",
  "clap",
  "multiversx-sc-snippets",
  "serde",
+ "tokio",
  "toml",
 ]
 
 [[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"
@@ -272,30 +297,43 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bip39"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
+checksum = "33415e24172c1b7d6066f6d999545375ab8e1d95421d6784bdfff9496f292387"
 dependencies = [
  "bitcoin_hashes",
- "rand 0.8.5",
- "rand_core 0.6.4",
+ "rand",
+ "rand_core",
  "serde",
  "unicode-normalization",
 ]
 
 [[package]]
-name = "bitcoin_hashes"
-version = "0.11.0"
+name = "bitcoin-internals"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
+checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
 
 [[package]]
-name = "bitflags"
-version = "1.3.2"
+name = "bitcoin_hashes"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
+dependencies = [
+ "bitcoin-internals",
+ "hex-conservative",
+]
 
 [[package]]
 name = "bitflags"
@@ -303,15 +341,6 @@ 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"
@@ -338,11 +367,17 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "boolinator"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9"
+
 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
  "memchr",
  "serde",
@@ -378,15 +413,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "cc"
-version = "1.1.5"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -394,6 +432,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "check-pause"
 version = "0.0.0"
@@ -429,11 +473,21 @@ 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.9"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -441,9 +495,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.9"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -453,27 +507,27 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.8"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
@@ -509,6 +563,32 @@ dependencies = [
  "vault",
 ]
 
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "console_log"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89f72f65e8501878b8a004d5a1afb780987e2ce2b4532c562e367a72c57499f"
+dependencies = [
+ "log",
+ "web-sys",
+]
+
+[[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"
@@ -539,15 +619,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.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
 dependencies = [
  "libc",
 ]
@@ -664,37 +744,61 @@ 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"
+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",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[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.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -703,7 +807,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",
 ]
@@ -732,29 +836,30 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[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",
 ]
 
@@ -783,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -798,9 +903,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 +913,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",
@@ -1001,9 +1106,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "first-contract"
@@ -1024,9 +1135,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1163,9 +1274,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1178,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1188,15 +1299,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1205,38 +1316,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1260,17 +1371,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"
@@ -1280,21 +1380,21 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -1304,124 +1404,356 @@ dependencies = [
 ]
 
 [[package]]
-name = "h2"
-version = "0.4.5"
+name = "gloo"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d"
 dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
+ "gloo-console",
+ "gloo-dialogs",
+ "gloo-events",
+ "gloo-file",
+ "gloo-history",
+ "gloo-net 0.3.1",
+ "gloo-render",
+ "gloo-storage",
+ "gloo-timers",
+ "gloo-utils 0.1.7",
+ "gloo-worker",
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "gloo-console"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f"
 dependencies = [
- "ahash",
+ "gloo-utils 0.1.7",
+ "js-sys",
  "serde",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "heck"
-version = "0.5.0"
+name = "gloo-dialogs"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "gloo-events"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "hex"
-version = "0.4.3"
+name = "gloo-file"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7"
+dependencies = [
+ "futures-channel",
+ "gloo-events",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "hex-literal"
-version = "0.4.1"
+name = "gloo-history"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f"
+dependencies = [
+ "gloo-events",
+ "gloo-utils 0.1.7",
+ "serde",
+ "serde-wasm-bindgen",
+ "serde_urlencoded",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
+]
 
 [[package]]
-name = "hmac"
-version = "0.12.1"
+name = "gloo-net"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620"
 dependencies = [
- "digest 0.10.7",
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils 0.1.7",
+ "http 0.2.12",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
-name = "http"
-version = "1.1.0"
+name = "gloo-net"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580"
 dependencies = [
- "bytes",
- "fnv",
- "itoa",
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils 0.2.0",
+ "http 1.1.0",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
-name = "http-body"
-version = "1.0.1"
+name = "gloo-render"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764"
 dependencies = [
- "bytes",
- "http",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "http-body-util"
-version = "0.1.2"
+name = "gloo-storage"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480"
 dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
+ "gloo-utils 0.1.7",
+ "js-sys",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "web-sys",
 ]
 
 [[package]]
-name = "httparse"
-version = "1.9.4"
+name = "gloo-timers"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
 
 [[package]]
-name = "humantime"
+name = "gloo-utils"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
+dependencies = [
+ "js-sys",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-utils"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
+dependencies = [
+ "js-sys",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "gloo-worker"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a"
+dependencies = [
+ "anymap2",
+ "bincode",
+ "gloo-console",
+ "gloo-utils 0.1.7",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.6.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "serde",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex-conservative"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
+
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+
+[[package]]
+name = "humantime"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
  "h2",
- "http",
+ "http 1.1.0",
  "http-body",
  "httparse",
  "itoa",
@@ -1433,12 +1765,12 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http",
+ "http 1.1.0",
  "hyper",
  "hyper-util",
  "rustls",
@@ -1446,6 +1778,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -1466,39 +1799,167 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http",
+ "http 1.1.0",
  "http-body",
  "hyper",
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+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 2.0.77",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -1510,17 +1971,45 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "implicit-clone"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd6201e7c30ccb24773cac7efa6fec1e06189d414b7439ce756a481c8bfbf53"
+dependencies = [
+ "indexmap 1.9.3",
+]
+
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+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.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.15.1",
  "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"
@@ -1529,20 +2018,21 @@ dependencies = [
  "multiversx-sc",
  "multiversx-sc-snippets",
  "serde",
+ "tokio",
  "toml",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[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"
@@ -1561,9 +2051,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1662,11 +2152,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "linked-list-repeat"
@@ -1691,6 +2187,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"
@@ -1810,22 +2312,23 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "wasi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1870,6 +2373,7 @@ dependencies = [
  "multiversx-sc-scenario",
  "multiversx-sc-snippets",
  "serde",
+ "tokio",
  "toml",
 ]
 
@@ -1881,9 +2385,17 @@ dependencies = [
  "multiversx-sc-meta-lib",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-chain-scenario-format"
-version = "0.22.3"
+version = "0.23.0"
 dependencies = [
  "bech32",
  "hex",
@@ -1896,38 +2408,39 @@ dependencies = [
 
 [[package]]
 name = "multiversx-chain-vm"
-version = "0.9.0"
+version = "0.11.0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "colored",
  "ed25519-dalek",
  "hex",
  "hex-literal",
  "itertools",
+ "multiversx-chain-core",
  "multiversx-chain-vm-executor",
  "num-bigint",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "rand_seeder",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
 ]
 
 [[package]]
 name = "multiversx-chain-vm-executor"
 version = "0.2.0"
-source = "git+https://github.com/multiversx/mx-vm-executor-rs?branch=rc/v1.7.next1#95acf80fb611fb51a8b7e20f5e7086e4aae68539"
+source = "git+https://github.com/multiversx/mx-vm-executor-rs?branch=rc/v1.7.next1#009e15459c023ec3b94fcebd826b381f7706229c"
 
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "arrayvec",
- "getrandom 0.2.15",
+ "getrandom",
  "multiversx-sc",
  "multiversx-sc-modules",
  "multiversx-sc-scenario",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -1941,10 +2454,11 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -1953,7 +2467,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -1963,29 +2477,30 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
  "quote",
  "radix_trie",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "multiversx-sc-meta"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
+ "bip39",
  "clap",
  "colored",
  "common-path",
@@ -2007,7 +2522,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-meta-lib"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "clap",
  "colored",
@@ -2020,20 +2535,21 @@ dependencies = [
  "serde",
  "serde_json",
  "toml",
- "wasmparser",
+ "wasmparser 0.216.0",
  "wasmprinter",
+ "wat",
 ]
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-scenario"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "base64",
  "bech32",
@@ -2051,14 +2567,15 @@ dependencies = [
  "pathdiff",
  "serde",
  "serde_json",
- "sha2 0.10.8",
+ "sha2",
  "unwrap-infallible",
 ]
 
 [[package]]
 name = "multiversx-sc-snippets"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
+ "anyhow",
  "base64",
  "env_logger",
  "futures",
@@ -2067,45 +2584,80 @@ dependencies = [
  "multiversx-chain-scenario-format",
  "multiversx-sc-scenario",
  "multiversx-sdk",
+ "multiversx-sdk-dapp",
+ "multiversx-sdk-http",
  "serde_json",
  "tokio",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sdk"
-version = "0.5.0"
+version = "0.7.0"
 dependencies = [
+ "aes",
  "anyhow",
  "base64",
  "bech32",
  "bip39",
+ "ctr",
  "hex",
  "hmac",
  "itertools",
  "log",
+ "multiversx-chain-core",
  "pbkdf2",
  "pem",
- "rand 0.8.5",
- "reqwest",
+ "rand",
+ "scrypt",
  "serde",
  "serde_json",
  "serde_repr",
- "sha2 0.10.8",
+ "sha2",
  "sha3",
- "tokio",
+ "uuid",
  "zeroize",
 ]
 
+[[package]]
+name = "multiversx-sdk-dapp"
+version = "0.7.0"
+dependencies = [
+ "anyhow",
+ "getrandom",
+ "gloo-net 0.6.0",
+ "hex",
+ "itertools",
+ "js-sys",
+ "log",
+ "multiversx-sdk",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "multiversx-sdk-http"
+version = "0.7.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "itertools",
+ "log",
+ "multiversx-sdk",
+ "reqwest",
+ "tokio",
+]
+
 [[package]]
 name = "multiversx-wegld-swap-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
  "multiversx-sc-modules",
@@ -2247,32 +2799,26 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.1"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "openssl"
-version = "0.10.64"
+version = "0.10.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2289,7 +2835,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -2300,9 +2846,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.102"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -2390,11 +2936,22 @@ 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",
+ "subtle",
+]
+
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
 
 [[package]]
 name = "payable-features"
@@ -2422,7 +2979,8 @@ version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
- "digest 0.10.7",
+ "digest",
+ "hmac",
 ]
 
 [[package]]
@@ -2443,29 +3001,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2473,6 +3031,21 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "ping-pong-dapp"
+version = "0.1.0"
+dependencies = [
+ "console_log",
+ "log",
+ "multiversx-sc-snippets",
+ "serde",
+ "serde_json",
+ "wasm-bindgen-futures",
+ "yew",
+ "yew-router",
+ "yew_icons",
+]
+
 [[package]]
 name = "ping-pong-egld"
 version = "0.0.2"
@@ -2481,6 +3054,18 @@ dependencies = [
  "multiversx-sc-scenario",
 ]
 
+[[package]]
+name = "ping-pong-egld-interact"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "multiversx-sc-snippets",
+ "ping-pong-egld",
+ "serde",
+ "tokio",
+ "toml",
+]
+
 [[package]]
 name = "ping-pong-egld-meta"
 version = "0.0.0"
@@ -2489,17 +3074,75 @@ dependencies = [
  "ping-pong-egld",
 ]
 
+[[package]]
+name = "pinned"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a829027bd95e54cfe13e3e258a1ae7b645960553fb82b75ff852c29688ee595b"
+dependencies = [
+ "futures",
+ "rustversion",
+ "thiserror",
+]
+
+[[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"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -2510,6 +3153,23 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prokio"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488"
+dependencies = [
+ "futures",
+ "gloo",
+ "num_cpus",
+ "once_cell",
+ "pin-project",
+ "pinned",
+ "tokio",
+ "tokio-stream",
+ "wasm-bindgen-futures",
+]
+
 [[package]]
 name = "promises-features"
 version = "0.0.0"
@@ -2593,75 +3253,92 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.36"
+name = "quinn"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
- "proc-macro2",
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
-name = "radix_trie"
-version = "0.2.1"
+name = "quinn-proto"
+version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
- "endian-type",
- "nibble_vec",
+ "bytes",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.3"
+name = "quinn-udp"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
 dependencies = [
- "getrandom 0.1.16",
+ "cfg_aliases",
  "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "rand"
-version = "0.8.5"
+name = "quote"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
+ "proc-macro2",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.2.2"
+name = "radix_trie"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "endian-type",
+ "nibble_vec",
 ]
 
 [[package]]
-name = "rand_chacha"
-version = "0.3.1"
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
+ "libc",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
-name = "rand_core"
-version = "0.5.1"
+name = "rand_chacha"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
- "getrandom 0.1.16",
+ "ppv-lite86",
+ "rand_core",
 ]
 
 [[package]]
@@ -2670,25 +3347,16 @@ 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]]
 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 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -2717,18 +3385,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2738,9 +3406,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2749,15 +3417,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.5"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64",
  "bytes",
@@ -2766,7 +3434,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http",
+ "http 1.1.0",
  "http-body",
  "http-body-util",
  "hyper",
@@ -2781,7 +3449,10 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "quinn",
+ "rustls",
  "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -2789,12 +3460,14 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg",
+ "webpki-roots",
+ "windows-registry",
 ]
 
 [[package]]
@@ -2822,13 +3495,19 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom",
  "libc",
  "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "route-recognizer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
+
 [[package]]
 name = "ruplacer"
 version = "0.8.2"
@@ -2888,22 +3567,28 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[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.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -2912,11 +3597,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.11"
+version = "0.23.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
+checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
 dependencies = [
  "once_cell",
+ "ring",
  "rustls-pki-types",
  "rustls-webpki",
  "subtle",
@@ -2925,37 +3611,51 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+
 [[package]]
 name = "ryu"
 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"
@@ -2983,11 +3683,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2996,6 +3696,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",
+]
+
 [[package]]
 name = "second-contract"
 version = "0.0.0"
@@ -3019,7 +3731,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",
@@ -3028,9 +3740,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -3077,32 +3789,44 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
- "indexmap",
+ "indexmap 2.6.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -3115,14 +3839,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -3156,19 +3880,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"
@@ -3177,7 +3888,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.7",
+ "digest",
 ]
 
 [[package]]
@@ -3186,10 +3897,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"
@@ -3201,9 +3918,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"
@@ -3259,6 +3979,22 @@ 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 = "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"
@@ -3289,9 +4025,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+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.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3303,38 +4050,64 @@ name = "sync_wrapper"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
 
 [[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",
 ]
 
+[[package]]
+name = "system-sc-interact"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "multiversx-sc-snippets",
+ "serde",
+ "tokio",
+ "toml",
+]
+
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3348,22 +4121,32 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
 ]
 
 [[package]]
@@ -3399,32 +4182,31 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 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",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3448,11 +4230,22 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3463,11 +4256,11 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.15"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "indexmap",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3476,52 +4269,31 @@ 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.16"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
 
-[[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",
-]
-
-[[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"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -3530,9 +4302,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@@ -3572,17 +4356,11 @@ 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"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
@@ -3595,9 +4373,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "untrusted"
@@ -3613,9 +4397,9 @@ checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3640,12 +4424,33 @@ 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.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "uuid"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "vault"
 version = "0.0.0"
@@ -3687,9 +4492,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"
@@ -3710,12 +4515,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"
@@ -3724,34 +4523,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3761,9 +4561,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3771,65 +4571,146 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "wasm-encoder"
+version = "0.220.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "ebf48234b389415b226a4daef6562933d38c7b28a8b8f64c5c4130dad1561ab7"
+dependencies = [
+ "leb128",
+ "wasmparser 0.220.0",
+]
 
 [[package]]
 name = "wasmparser"
-version = "0.212.0"
+version = "0.216.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d28bc49ba1e5c5b61ffa7a2eace10820443c4b7d1c0b144109261d14570fdf8"
+checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3"
 dependencies = [
  "ahash",
- "bitflags 2.6.0",
- "hashbrown",
- "indexmap",
+ "bitflags",
+ "hashbrown 0.14.5",
+ "indexmap 2.6.0",
  "semver",
  "serde",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.220.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e246c2772ce3ebc83f89a2d4487ac5794cad6c309b2071818a88c7db7c36d87b"
+dependencies = [
+ "bitflags",
+ "indexmap 2.6.0",
+]
+
 [[package]]
 name = "wasmprinter"
-version = "0.212.0"
+version = "0.216.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfac65326cc561112af88c3028f6dfdb140acff67ede33a8e86be2dc6b8956f7"
+checksum = "8f82916f3892e53620639217d6ec78fe15c678352a3fbf3f3745b6417d0bd70f"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser",
+ "wasmparser 0.216.0",
+]
+
+[[package]]
+name = "wast"
+version = "220.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e708c8de08751fd66e70961a32bae9d71901f14a70871e181cb8461a3bb3165"
+dependencies = [
+ "bumpalo",
+ "leb128",
+ "memchr",
+ "unicode-width",
+ "wasm-encoder",
+]
+
+[[package]]
+name = "wat"
+version = "1.220.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de4f1d7d59614ba690541360102b995c4eb1b9ed373701d5102cc1a968b1c5a3"
+dependencies = [
+ "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[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]]
@@ -3850,6 +4731,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"
@@ -3973,21 +4863,125 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.13"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winreg"
-version = "0.52.0"
+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 = "yew"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+checksum = "5dbecfe44343b70cc2932c3eb445425969ae21754a8ab3a0966981c1cf7af1cc"
 dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
+ "console_error_panic_hook",
+ "futures",
+ "gloo",
+ "implicit-clone",
+ "indexmap 1.9.3",
+ "js-sys",
+ "prokio",
+ "rustversion",
+ "serde",
+ "slab",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "yew-macro",
+]
+
+[[package]]
+name = "yew-macro"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b64c253c1d401f1ea868ca9988db63958cfa15a69f739101f338d6f05eea8301"
+dependencies = [
+ "boolinator",
+ "once_cell",
+ "prettyplease",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "yew-router"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "426ee0486d2572a6c5e39fbdbc48b58d59bb555f3326f54631025266cf04146e"
+dependencies = [
+ "gloo",
+ "js-sys",
+ "route-recognizer",
+ "serde",
+ "serde_urlencoded",
+ "tracing",
+ "wasm-bindgen",
+ "web-sys",
+ "yew",
+ "yew-router-macro",
+]
+
+[[package]]
+name = "yew-router-macro"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b249cdb39e0cddaf0644dedc781854524374664793479fdc01e6a65d6e6ae3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "yew_icons"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2f01768685c7bba96996a1ba91902653a37b2bfd6e937c73cfd132201693d4b"
+dependencies = [
+ "yew",
+]
+
+[[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 2.0.77",
+ "synstructure",
 ]
 
 [[package]]
@@ -3996,6 +4990,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
@@ -4007,7 +5002,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
+]
+
+[[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 2.0.77",
+ "synstructure",
 ]
 
 [[package]]
@@ -4015,33 +5031,41 @@ name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
 dependencies = [
- "zeroize_derive",
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
 ]
 
 [[package]]
-name = "zeroize_derive"
-version = "1.4.2"
+name = "zerovec-derive"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "zip"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39"
+checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
  "arbitrary",
  "crc32fast",
  "crossbeam-utils",
  "displaydoc",
  "flate2",
- "indexmap",
+ "indexmap 2.6.0",
  "memchr",
  "thiserror",
  "zopfli",
diff --git a/Cargo.toml b/Cargo.toml
index 2f599c6e03..3cc34e3bd4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,14 +13,18 @@ members = [
   "framework/snippets",
   "framework/wasm-adapter",
 
+  "chain/core",
+  "chain/vm",
+
   "sdk/core",
+  "sdk/dapp",
+  "sdk/http",
   "sdk/scenario-format",
 
   "tools/mxpy-snippet-generator",
   "tools/payload-macro-generator",
   # "tools/plotter",
-
-  "vm",
+  "tools/interactor-system-func-calls/",
 
   "contracts/modules",
 
@@ -51,7 +55,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",
@@ -97,6 +101,8 @@ members = [
   "contracts/examples/proxy-pause/meta",
   "contracts/examples/ping-pong-egld",
   "contracts/examples/ping-pong-egld/meta",
+  "contracts/examples/ping-pong-egld/interactor",
+  "contracts/examples/ping-pong-egld/dapp",
   "contracts/examples/rewards-distribution",
   "contracts/examples/rewards-distribution/meta",
   "contracts/examples/seed-nft-minter",
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..0208ab3f4a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+chain-simulator:
+	@docker compose -f docker-compose.yml build
+	@docker compose -f docker-compose.yml up & sc-meta test -c
+	@docker compose -f docker-compose.yml down -v
\ No newline at end of file
diff --git a/chain/core/Cargo.toml b/chain/core/Cargo.toml
new file mode 100644
index 0000000000..79387716af
--- /dev/null
+++ b/chain/core/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "multiversx-chain-core"
+version = "0.11.0"
+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 chain interfaces, constants, and base types"
+keywords = ["multiversx", "blockchain", "vm", "tools"]
+categories = ["cryptography::cryptocurrencies", "development-tools::debugging"]
+
+[dependencies]
+bitflags = "=2.6.0"
+
+[dependencies.multiversx-sc-codec]
+version = "=0.21.0"
+path = "../../data/codec"
+features = ["derive"]
diff --git a/chain/core/README.md b/chain/core/README.md
new file mode 100644
index 0000000000..76827c0b17
--- /dev/null
+++ b/chain/core/README.md
@@ -0,0 +1,16 @@
+# MultiversX blockchain base types, interfaces and builtin function names
+
+It provides various types and contants referring to the MultiversX blockchain base implementation.
+
+This functionality is designed to be minimal and to be used from both smart contract code and VM implementations.
+
+It can be viewed as a collection of system specs, which hold for any MultiversX-related implementation. For example:
+- `Address` - MultiversX adresses are 32 bytes long. This is the old SC address type, it holds the bytes on the heap. It is also used in the MultiversX Rust VM.
+- `H256` - same as address, currently used for transaction hashes.
+- Flags:
+    - Code metadata - a bitflag encoding the SC code metadta, as it is stored on the blockchain, and encoded in smart contracts;
+    - ESDT local roles
+        - as enum
+        - as bitflags
+    - ESDT token types
+
diff --git a/framework/base/src/types/interaction/system_proxy/builtin_func_names.rs b/chain/core/src/builtin_func_names.rs
similarity index 100%
rename from framework/base/src/types/interaction/system_proxy/builtin_func_names.rs
rename to chain/core/src/builtin_func_names.rs
diff --git a/chain/core/src/lib.rs b/chain/core/src/lib.rs
new file mode 100644
index 0000000000..503f690d82
--- /dev/null
+++ b/chain/core/src/lib.rs
@@ -0,0 +1,9 @@
+#![no_std]
+
+extern crate alloc;
+
+pub mod builtin_func_names;
+pub mod types;
+
+/// Re-exported for convenience.
+pub use multiversx_sc_codec as codec;
diff --git a/chain/core/src/types.rs b/chain/core/src/types.rs
new file mode 100644
index 0000000000..6aa0159afd
--- /dev/null
+++ b/chain/core/src/types.rs
@@ -0,0 +1,13 @@
+mod address;
+mod boxed_bytes;
+mod flags;
+mod h256;
+mod heap_address;
+mod heap_h256;
+
+pub use address::Address;
+pub use boxed_bytes::BoxedBytes;
+pub use flags::*;
+pub use h256::H256;
+pub use heap_address::HeapAddress;
+pub use heap_h256::HeapH256;
diff --git a/framework/base/src/types/heap/h256_address.rs b/chain/core/src/types/address.rs
similarity index 85%
rename from framework/base/src/types/heap/h256_address.rs
rename to chain/core/src/types/address.rs
index a9fa69c2e7..0f5099fddb 100644
--- a/framework/base/src/types/heap/h256_address.rs
+++ b/chain/core/src/types/address.rs
@@ -1,12 +1,11 @@
-use super::h256::H256;
-use crate::{
-    abi::{TypeAbi, TypeAbiFrom, TypeName},
-    types::heap::BoxedBytes,
-};
+use super::H256;
 use alloc::{boxed::Box, vec::Vec};
 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] = &[5, 0];
 
 /// An Address is just a H256 with a different name.
 /// Has a different ABI name than H256.
@@ -16,6 +15,30 @@ const SC_ADDRESS_NUM_LEADING_ZEROS: u8 = 8;
 #[derive(Hash, PartialEq, Eq, Clone, Debug)]
 pub struct Address(H256);
 
+impl Address {
+    pub const fn new(bytes: [u8; 32]) -> Self {
+        Address(H256::new(bytes))
+    }
+
+    pub fn generate_mock_address(creator_address: &[u8], creator_nonce: u64) -> Self {
+        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 start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
+        result[start_index..(start_index + DEFAULT_VM_TYPE.len())].copy_from_slice(DEFAULT_VM_TYPE);
+
+        Address::from(result)
+    }
+}
+
 impl From<H256> for Address {
     #[inline]
     fn from(hash: H256) -> Self {
@@ -145,13 +168,6 @@ impl Address {
         self.0.is_zero()
     }
 
-    /// Transmutes self to an (in principle) variable length boxed bytes object.
-    /// Both BoxedBytes and H256 keep the data on the heap, so only the pointer to that data needs to be transmuted.
-    /// Does not reallocate or copy data, the data on the heap remains untouched.
-    pub fn into_boxed_bytes(self) -> BoxedBytes {
-        self.0.into_boxed_bytes()
-    }
-
     pub fn is_smart_contract_address(&self) -> bool {
         self.as_bytes()
             .iter()
@@ -202,20 +218,6 @@ impl TopDecode for Address {
     }
 }
 
-impl TypeAbiFrom<Self> for Address {}
-
-impl TypeAbi for Address {
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        "Address".into()
-    }
-
-    fn type_name_rust() -> TypeName {
-        "Address".into()
-    }
-}
-
 #[cfg(test)]
 mod address_tests {
     use super::*;
@@ -251,11 +253,4 @@ mod address_tests {
     fn test_is_zero() {
         assert!(Address::zero().is_zero());
     }
-
-    #[test]
-    fn test_size_of() {
-        use core::mem::size_of;
-        assert_eq!(size_of::<Address>(), size_of::<usize>());
-        assert_eq!(size_of::<Option<Address>>(), size_of::<usize>());
-    }
 }
diff --git a/framework/base/src/types/heap/boxed_bytes.rs b/chain/core/src/types/boxed_bytes.rs
similarity index 96%
rename from framework/base/src/types/heap/boxed_bytes.rs
rename to chain/core/src/types/boxed_bytes.rs
index 336b0874a8..b6fbb86297 100644
--- a/framework/base/src/types/heap/boxed_bytes.rs
+++ b/chain/core/src/types/boxed_bytes.rs
@@ -5,14 +5,14 @@ use alloc::{
     vec::Vec,
 };
 
-use crate::{
-    abi::{TypeAbi, TypeAbiFrom, TypeName},
-    codec::*,
-};
+use crate::codec::*;
 
 /// Simple wrapper around a boxed byte slice,
 /// but with a lot of optimized methods for manipulating it.
 /// The focus is on reducing code size rather improving speed.
+///
+/// Used to be used extensively in smart contracts, before the introduction of ManagedBuffer,
+/// but was superseded by it.
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct BoxedBytes(Box<[u8]>);
 
@@ -224,20 +224,6 @@ impl TopDecode for BoxedBytes {
     }
 }
 
-impl TypeAbiFrom<Self> for BoxedBytes {}
-
-impl TypeAbi for BoxedBytes {
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        "bytes".into()
-    }
-
-    fn type_name_rust() -> TypeName {
-        "BoxedBytes".into()
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #[cfg(test)]
diff --git a/framework/base/src/types/flags/mod.rs b/chain/core/src/types/flags.rs
similarity index 72%
rename from framework/base/src/types/flags/mod.rs
rename to chain/core/src/types/flags.rs
index b24a0d4fba..6b2522c386 100644
--- a/framework/base/src/types/flags/mod.rs
+++ b/chain/core/src/types/flags.rs
@@ -2,8 +2,12 @@ mod code_metadata;
 mod esdt_local_role;
 mod esdt_local_role_flags;
 mod esdt_token_type;
+mod return_code;
+mod token_type;
 
 pub use code_metadata::CodeMetadata;
 pub use esdt_local_role::EsdtLocalRole;
 pub use esdt_local_role_flags::EsdtLocalRoleFlags;
 pub use esdt_token_type::EsdtTokenType;
+pub use return_code::ReturnCode;
+pub use token_type::TokenType;
diff --git a/framework/base/src/types/flags/code_metadata.rs b/chain/core/src/types/flags/code_metadata.rs
similarity index 69%
rename from framework/base/src/types/flags/code_metadata.rs
rename to chain/core/src/types/flags/code_metadata.rs
index 9275e976cf..596bf9744c 100644
--- a/framework/base/src/types/flags/code_metadata.rs
+++ b/chain/core/src/types/flags/code_metadata.rs
@@ -1,17 +1,13 @@
 #![allow(clippy::bad_bit_mask)]
 
-use crate::{
-    abi::{TypeAbi, TypeAbiFrom, TypeName},
-    codec::*,
-    formatter::{hex_util, FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex},
-};
+use crate::codec::*;
 use bitflags::bitflags;
 
-const UPGRADEABLE_STRING: &[u8] = b"Upgradeable";
-const READABLE_STRING: &[u8] = b"Readable";
-const PAYABLE_STRING: &[u8] = b"Payable";
-const PAYABLE_BY_SC_STRING: &[u8] = b"PayableBySC";
-const DEFAULT_STRING: &[u8] = b"Default";
+const UPGRADEABLE_STRING: &str = "Upgradeable";
+const READABLE_STRING: &str = "Readable";
+const PAYABLE_STRING: &str = "Payable";
+const PAYABLE_BY_SC_STRING: &str = "PayableBySC";
+const DEFAULT_STRING: &str = "Default";
 
 bitflags! {
     #[derive(Default, PartialEq, Debug, Clone, Copy)]
@@ -45,6 +41,43 @@ impl CodeMetadata {
     pub fn to_byte_array(&self) -> [u8; 2] {
         self.bits().to_be_bytes()
     }
+
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.to_byte_array().to_vec()
+    }
+
+    pub fn for_each_string_token<F: FnMut(&'static str)>(&self, mut f: F) {
+        let mut nothing_printed: bool = true;
+        if self.is_upgradeable() {
+            f(UPGRADEABLE_STRING);
+            nothing_printed = false;
+        }
+        if self.is_readable() {
+            if !nothing_printed {
+                f("|");
+            }
+            f(READABLE_STRING);
+            nothing_printed = false;
+        }
+        if self.is_payable() {
+            if !nothing_printed {
+                f("|");
+            }
+            f(PAYABLE_STRING);
+            nothing_printed = false;
+        }
+        if self.is_payable_by_sc() {
+            if !nothing_printed {
+                f("|");
+            }
+            f(PAYABLE_BY_SC_STRING);
+            nothing_printed = false;
+        }
+
+        if nothing_printed {
+            f(DEFAULT_STRING);
+        }
+    }
 }
 
 impl From<[u8; 2]> for CodeMetadata {
@@ -61,6 +94,19 @@ impl From<u16> for CodeMetadata {
     }
 }
 
+impl From<&[u8]> for CodeMetadata {
+    fn from(slice: &[u8]) -> Self {
+        let arr: [u8; 2] = slice.try_into().unwrap_or_default();
+        CodeMetadata::from(arr)
+    }
+}
+
+impl From<&Vec<u8>> for CodeMetadata {
+    fn from(v: &Vec<u8>) -> Self {
+        CodeMetadata::from(v.as_slice())
+    }
+}
+
 impl NestedEncode for CodeMetadata {
     fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
     where
@@ -103,74 +149,6 @@ impl TopDecode for CodeMetadata {
     }
 }
 
-impl TypeAbiFrom<Self> for CodeMetadata {}
-
-impl TypeAbi for CodeMetadata {
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        "CodeMetadata".into()
-    }
-
-    fn type_name_rust() -> TypeName {
-        "CodeMetadata".into()
-    }
-}
-
-impl SCDisplay for CodeMetadata {
-    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        let mut nothing_printed: bool = true;
-        verify_metadata_and_append(
-            self.is_upgradeable(),
-            f,
-            UPGRADEABLE_STRING,
-            &mut nothing_printed,
-        );
-        verify_metadata_and_append(self.is_readable(), f, READABLE_STRING, &mut nothing_printed);
-        verify_metadata_and_append(self.is_payable(), f, PAYABLE_STRING, &mut nothing_printed);
-        verify_metadata_and_append(
-            self.is_payable_by_sc(),
-            f,
-            PAYABLE_BY_SC_STRING,
-            &mut nothing_printed,
-        );
-        if nothing_printed {
-            f.append_bytes(DEFAULT_STRING);
-        }
-    }
-}
-
-impl SCLowerHex for CodeMetadata {
-    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        let num = self.bits().to_be_bytes();
-        f.append_bytes(&hex_util::byte_to_hex_digits(num[0])[..]);
-        f.append_bytes(&hex_util::byte_to_hex_digits(num[1])[..]);
-    }
-}
-
-impl SCBinary for CodeMetadata {
-    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        let num = self.bits().to_be_bytes();
-        f.append_bytes(&hex_util::byte_to_binary_digits(num[0])[..]);
-        f.append_bytes(&hex_util::byte_to_binary_digits(num[1])[..]);
-    }
-}
-
-fn verify_metadata_and_append<F: FormatByteReceiver>(
-    constraint: bool,
-    f: &mut F,
-    bytes_to_append: &[u8],
-    nothing_printed: &mut bool,
-) {
-    if constraint {
-        if !*nothing_printed {
-            f.append_bytes(b"|");
-        }
-        f.append_bytes(bytes_to_append);
-        *nothing_printed = false;
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/vm/src/types/vm_esdt_local_role.rs b/chain/core/src/types/flags/esdt_local_role.rs
similarity index 92%
rename from vm/src/types/vm_esdt_local_role.rs
rename to chain/core/src/types/flags/esdt_local_role.rs
index 40c383b869..048d3876ce 100644
--- a/vm/src/types/vm_esdt_local_role.rs
+++ b/chain/core/src/types/flags/esdt_local_role.rs
@@ -1,4 +1,8 @@
 use super::EsdtLocalRoleFlags;
+use crate::codec::{
+    self,
+    derive::{NestedDecode, NestedEncode, TopDecode, TopEncode},
+};
 
 const ESDT_ROLE_NONE: &str = "";
 const ESDT_ROLE_LOCAL_MINT: &str = "ESDTRoleLocalMint";
@@ -10,12 +14,7 @@ const ESDT_ROLE_NFT_ADD_URI: &str = "ESDTRoleNFTAddURI";
 const ESDT_ROLE_NFT_UPDATE_ATTRIBUTES: &str = "ESDTRoleNFTUpdateAttributes";
 const ESDT_ROLE_TRANSFER: &str = "ESDTTransferRole";
 
-/// The VM implementation for EsdtLocalRole, used internally in builtin functions.
-///
-/// 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(Clone, PartialEq, Eq, Debug, Copy)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
 pub enum EsdtLocalRole {
     None,
     Mint,
@@ -43,6 +42,10 @@ impl EsdtLocalRole {
         }
     }
 
+    pub fn as_role_name(&self) -> &'static [u8] {
+        self.name().as_bytes()
+    }
+
     pub fn name(&self) -> &'static str {
         match self {
             Self::None => ESDT_ROLE_NONE,
diff --git a/framework/base/src/types/flags/esdt_local_role_flags.rs b/chain/core/src/types/flags/esdt_local_role_flags.rs
similarity index 100%
rename from framework/base/src/types/flags/esdt_local_role_flags.rs
rename to chain/core/src/types/flags/esdt_local_role_flags.rs
diff --git a/framework/base/src/types/flags/esdt_token_type.rs b/chain/core/src/types/flags/esdt_token_type.rs
similarity index 89%
rename from framework/base/src/types/flags/esdt_token_type.rs
rename to chain/core/src/types/flags/esdt_token_type.rs
index e80b91590d..74db07c9a6 100644
--- a/framework/base/src/types/flags/esdt_token_type.rs
+++ b/chain/core/src/types/flags/esdt_token_type.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_derive::{type_abi, ManagedVecItem};
+// use multiversx_sc_derive::{type_abi, ManagedVecItem};
 
 use crate::codec::{
     self,
@@ -11,14 +11,9 @@ const ESDT_TYPE_SEMI_FUNGIBLE: &[u8] = b"SemiFungibleESDT";
 const ESDT_TYPE_META: &[u8] = b"MetaESDT";
 const ESDT_TYPE_INVALID: &[u8] = &[];
 
-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,
-)]
+#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug)]
 pub enum EsdtTokenType {
     Fungible,
     NonFungible,
diff --git a/chain/core/src/types/flags/return_code.rs b/chain/core/src/types/flags/return_code.rs
new file mode 100644
index 0000000000..2374d58762
--- /dev/null
+++ b/chain/core/src/types/flags/return_code.rs
@@ -0,0 +1,135 @@
+const MESSAGE_OK: &str = "ok";
+const MESSAGE_FUNCTION_NOT_FOUND: &str = "function not found";
+const MESSAGE_WRONG_SIGNATURE: &str = "wrong signature for function";
+const MESSAGE_CONTRACT_NOT_FOUND: &str = "contract not found";
+const MESSAGE_USER_ERROR: &str = "user error";
+const MESSAGE_OUT_OF_GAS: &str = "out of gas";
+const MESSAGE_ACCOUNT_COLLISION: &str = "account collision";
+const MESSAGE_OUT_OF_FUNDS: &str = "out of funds";
+const MESSAGE_CALL_STACK_OVERFLOW: &str = "call stack overflow";
+const MESSAGE_CONTRACT_INVALID: &str = "contract invalid";
+const MESSAGE_EXECUTION_FAILED: &str = "execution failed";
+const MESSAGE_UNKNOWN_ERROR: &str = "unknown error";
+const MESSAGE_NETWORK_TIMEOUT: &str = "network timeout";
+
+#[derive(Clone, Copy, Default, PartialEq, Eq, Debug)]
+pub enum ReturnCode {
+    /// Returned when execution was completed normally.
+    #[default]
+    Success = 0,
+
+    /// Returned when the input specifies a function name that does not exist or is not public.
+    FunctionNotFound = 1,
+
+    /// Returned when the wrong number of arguments is provided.
+    FunctionWrongSignature = 2,
+
+    /// Returned when the called contract does not exist.
+    ContractNotFound = 3,
+
+    /// Returned for various execution errors.
+    UserError = 4,
+
+    /// Returned when VM execution runs out of gas.
+    OutOfGas = 5,
+
+    /// Returned when created account already exists.
+    AccountCollision = 6,
+
+    /// Returned when the caller (sender) runs out of funds.
+    OutOfFunds = 7,
+
+    /// Returned when stack overflow occurs.
+    CallStackOverFlow = 8,
+
+    /// Returned when the contract is invalid.
+    ContractInvalid = 9,
+
+    /// Returned when the execution of the specified function has failed.
+    ExecutionFailed = 10,
+
+    /// Returned when the upgrade of the contract has failed
+    UpgradeFailed = 11,
+
+    /// Returned when tx simulation fails execution
+    SimulateFailed = 12,
+
+    /// Only occurs in the debugger context.
+    DebugApiError = 100,
+
+    // Returned when a connection timeout occurs
+    NetworkTimeout = 101,
+}
+
+impl ReturnCode {
+    pub fn as_u64(self) -> u64 {
+        self as u64
+    }
+
+    pub fn is_success(self) -> bool {
+        self == ReturnCode::Success
+    }
+
+    pub fn message(self) -> &'static str {
+        match self {
+            ReturnCode::Success => MESSAGE_OK,
+            ReturnCode::FunctionNotFound => MESSAGE_FUNCTION_NOT_FOUND,
+            ReturnCode::FunctionWrongSignature => MESSAGE_WRONG_SIGNATURE,
+            ReturnCode::ContractNotFound => MESSAGE_CONTRACT_NOT_FOUND,
+            ReturnCode::UserError => MESSAGE_USER_ERROR,
+            ReturnCode::OutOfGas => MESSAGE_OUT_OF_GAS,
+            ReturnCode::AccountCollision => MESSAGE_ACCOUNT_COLLISION,
+            ReturnCode::OutOfFunds => MESSAGE_OUT_OF_FUNDS,
+            ReturnCode::CallStackOverFlow => MESSAGE_CALL_STACK_OVERFLOW,
+            ReturnCode::ContractInvalid => MESSAGE_CONTRACT_INVALID,
+            ReturnCode::ExecutionFailed => MESSAGE_EXECUTION_FAILED,
+            ReturnCode::NetworkTimeout => MESSAGE_NETWORK_TIMEOUT,
+            _ => MESSAGE_UNKNOWN_ERROR,
+        }
+    }
+
+    pub fn from_u64(value: u64) -> Option<ReturnCode> {
+        match value {
+            0 => Some(ReturnCode::Success),
+            1 => Some(ReturnCode::FunctionNotFound),
+            2 => Some(ReturnCode::FunctionWrongSignature),
+            3 => Some(ReturnCode::ContractNotFound),
+            4 => Some(ReturnCode::UserError),
+            5 => Some(ReturnCode::OutOfGas),
+            6 => Some(ReturnCode::AccountCollision),
+            7 => Some(ReturnCode::OutOfFunds),
+            8 => Some(ReturnCode::CallStackOverFlow),
+            9 => Some(ReturnCode::ContractInvalid),
+            10 => Some(ReturnCode::ExecutionFailed),
+            11 => Some(ReturnCode::UpgradeFailed),
+            12 => Some(ReturnCode::SimulateFailed),
+            100 => Some(ReturnCode::DebugApiError),
+            101 => Some(ReturnCode::NetworkTimeout),
+            _ => None,
+        }
+    }
+
+    pub fn from_message(message: &str) -> Option<ReturnCode> {
+        match message {
+            MESSAGE_OK => Some(ReturnCode::Success),
+            MESSAGE_FUNCTION_NOT_FOUND => Some(ReturnCode::FunctionNotFound),
+            MESSAGE_WRONG_SIGNATURE => Some(ReturnCode::FunctionWrongSignature),
+            MESSAGE_CONTRACT_NOT_FOUND => Some(ReturnCode::ContractNotFound),
+            MESSAGE_USER_ERROR => Some(ReturnCode::UserError),
+            MESSAGE_OUT_OF_GAS => Some(ReturnCode::OutOfGas),
+            MESSAGE_ACCOUNT_COLLISION => Some(ReturnCode::AccountCollision),
+            MESSAGE_OUT_OF_FUNDS => Some(ReturnCode::OutOfFunds),
+            MESSAGE_CALL_STACK_OVERFLOW => Some(ReturnCode::CallStackOverFlow),
+            MESSAGE_CONTRACT_INVALID => Some(ReturnCode::ContractInvalid),
+            MESSAGE_EXECUTION_FAILED => Some(ReturnCode::ExecutionFailed),
+            MESSAGE_NETWORK_TIMEOUT => Some(ReturnCode::NetworkTimeout),
+            _ => None,
+        }
+    }
+}
+
+impl core::fmt::Display for ReturnCode {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        self.as_u64().fmt(f)
+    }
+}
diff --git a/vm/src/types/vm_token_type.rs b/chain/core/src/types/flags/token_type.rs
similarity index 51%
rename from vm/src/types/vm_token_type.rs
rename to chain/core/src/types/flags/token_type.rs
index 18670a90dc..77ff975a45 100644
--- a/vm/src/types/vm_token_type.rs
+++ b/chain/core/src/types/flags/token_type.rs
@@ -1,18 +1,18 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum VMTokenType {
+pub enum TokenType {
     Fungible,
     SemiFungible,
     Meta,
     NonFungible,
 }
 
-impl VMTokenType {
+impl TokenType {
     pub fn from_system_sc_arg(raw: &[u8]) -> Self {
         match raw {
-            b"FNG" => VMTokenType::Fungible,
-            b"SFT" => VMTokenType::SemiFungible,
-            b"META" => VMTokenType::Meta,
-            b"NFT" => VMTokenType::NonFungible,
+            b"FNG" => TokenType::Fungible,
+            b"SFT" => TokenType::SemiFungible,
+            b"META" => TokenType::Meta,
+            b"NFT" => TokenType::NonFungible,
             _ => panic!("invalid token type"),
         }
     }
diff --git a/chain/core/src/types/h256.rs b/chain/core/src/types/h256.rs
new file mode 100644
index 0000000000..8a7b63d1a1
--- /dev/null
+++ b/chain/core/src/types/h256.rs
@@ -0,0 +1,223 @@
+use alloc::{boxed::Box, vec::Vec};
+use core::fmt::Debug;
+
+const ZERO_32: &[u8] = &[0u8; 32];
+
+/// Type that holds 32 bytes of data.
+/// Data is kept on the heap to keep wasm size low and avoid copies.
+#[derive(Hash, PartialEq, Eq, Clone, Debug)]
+pub struct H256([u8; 32]);
+
+impl H256 {
+    pub const fn new(bytes: [u8; 32]) -> Self {
+        H256(bytes)
+    }
+}
+
+impl From<[u8; 32]> for H256 {
+    /// Constructs a hash type from the given bytes array of fixed length.
+    ///
+    /// # Note
+    ///
+    /// The given bytes are interpreted in big endian order.
+    fn from(arr: [u8; 32]) -> Self {
+        H256::new(arr)
+    }
+}
+
+impl<'a> From<&'a [u8; 32]> for H256 {
+    /// Constructs a hash type from the given reference
+    /// to the bytes array of fixed length.
+    ///
+    /// # Note
+    ///
+    /// The given bytes are interpreted in big endian order.
+    #[inline]
+    fn from(bytes: &'a [u8; 32]) -> Self {
+        H256::new(*bytes)
+    }
+}
+
+impl<'a> From<&'a mut [u8; 32]> for H256 {
+    /// Constructs a hash type from the given reference
+    /// to the mutable bytes array of fixed length.
+    ///
+    /// # Note
+    ///
+    /// The given bytes are interpreted in big endian order.
+    #[inline]
+    fn from(bytes: &'a mut [u8; 32]) -> Self {
+        H256::new(*bytes)
+    }
+}
+
+impl From<Box<[u8; 32]>> for H256 {
+    #[inline]
+    fn from(bytes: Box<[u8; 32]>) -> Self {
+        H256::new(*bytes)
+    }
+}
+
+impl H256 {
+    pub fn from_slice(slice: &[u8]) -> Self {
+        let mut arr = [0u8; 32];
+        let len = core::cmp::min(slice.len(), 32);
+        arr[..len].copy_from_slice(&slice[..len]);
+        H256::new(arr)
+    }
+}
+
+impl From<H256> for [u8; 32] {
+    fn from(s: H256) -> Self {
+        s.0
+    }
+}
+
+impl AsRef<[u8]> for H256 {
+    #[inline]
+    fn as_ref(&self) -> &[u8] {
+        self.as_bytes()
+    }
+}
+
+impl AsMut<[u8]> for H256 {
+    #[inline]
+    fn as_mut(&mut self) -> &mut [u8] {
+        self.0.as_mut()
+    }
+}
+
+impl H256 {
+    /// Returns a new zero-initialized fixed hash.
+    pub fn zero() -> Self {
+        H256([0u8; 32])
+    }
+
+    /// Returns the size of this hash in bytes.
+    #[inline]
+    pub fn len_bytes() -> usize {
+        32
+    }
+
+    /// Extracts a byte slice containing the entire fixed hash.
+    #[inline]
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_ref()
+    }
+
+    #[inline]
+    pub fn as_array(&self) -> &[u8; 32] {
+        &self.0
+    }
+
+    #[inline]
+    pub fn copy_to_array(&self, target: &mut [u8; 32]) {
+        target.copy_from_slice(&self.0[..]);
+    }
+
+    #[inline]
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.0[..].to_vec()
+    }
+
+    /// Pointer to the data on the heap.
+    #[inline]
+    pub fn as_ptr(&self) -> *const u8 {
+        self.0.as_ptr()
+    }
+
+    /// Returns an unsafe mutable pointer to the data on the heap.
+    /// Used by the API to populate data.
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut u8 {
+        self.0.as_mut_ptr()
+    }
+
+    /// True if all 32 bytes of the hash are zero.
+    pub fn is_zero(&self) -> bool {
+        self.as_bytes() == ZERO_32
+    }
+}
+
+use crate::codec::*;
+
+impl NestedEncode for H256 {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, _h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        dest.write(&self.0[..]);
+        Ok(())
+    }
+}
+
+impl TopEncode for H256 {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, _h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        output.set_slice_u8(&self.0[..]);
+        Ok(())
+    }
+}
+
+impl NestedDecode for H256 {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        let mut res = H256::zero();
+        input.read_into(res.as_mut(), h)?;
+        Ok(res)
+    }
+}
+
+impl TopDecode for H256 {
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(Self::new(<[u8; 32]>::top_decode_or_handle_err(input, h)?))
+    }
+}
+
+#[cfg(test)]
+mod h256_tests {
+    use super::*;
+    use crate::codec::test_util::{check_top_encode, check_top_encode_decode};
+    use alloc::vec::Vec;
+
+    #[test]
+    fn test_h256_from_array() {
+        let addr = H256::from([4u8; 32]);
+        check_top_encode_decode(addr, &[4u8; 32]);
+    }
+
+    #[test]
+    fn test_opt_h256() {
+        let addr = H256::from([4u8; 32]);
+        let mut expected: Vec<u8> = Vec::new();
+        expected.push(1u8);
+        expected.extend_from_slice(&[4u8; 32]);
+        check_top_encode_decode(Some(addr), expected.as_slice());
+    }
+
+    #[test]
+    fn test_ser_h256_ref() {
+        let addr = H256::from([4u8; 32]);
+        let expected_bytes: &[u8] = &[4u8; 32 * 3];
+
+        let tuple = (&addr, &&&addr, addr.clone());
+        let serialized_bytes = check_top_encode(&tuple);
+        assert_eq!(serialized_bytes.as_slice(), expected_bytes);
+    }
+
+    #[test]
+    fn test_is_zero() {
+        assert!(H256::zero().is_zero());
+    }
+}
diff --git a/chain/core/src/types/heap_address.rs b/chain/core/src/types/heap_address.rs
new file mode 100644
index 0000000000..57e053e815
--- /dev/null
+++ b/chain/core/src/types/heap_address.rs
@@ -0,0 +1,243 @@
+use super::{heap_h256::HeapH256, BoxedBytes};
+
+use alloc::{boxed::Box, vec::Vec};
+use core::fmt::Debug;
+
+const SC_ADDRESS_NUM_LEADING_ZEROS: u8 = 8;
+
+/// Old smart contracts were using this Address implementation,
+/// which was explicitly relying on the heap, to avoid large data copies on the stack.
+///
+/// It is no longer used, kept for reference.
+#[derive(Hash, PartialEq, Eq, Clone, Debug)]
+pub struct HeapAddress(HeapH256);
+
+impl From<HeapH256> for HeapAddress {
+    #[inline]
+    fn from(hash: HeapH256) -> Self {
+        HeapAddress(hash)
+    }
+}
+
+impl From<HeapAddress> for HeapH256 {
+    #[inline]
+    fn from(address: HeapAddress) -> Self {
+        address.0
+    }
+}
+
+impl<'a> From<&'a HeapAddress> for &'a HeapH256 {
+    #[inline]
+    fn from(address: &'a HeapAddress) -> Self {
+        &address.0
+    }
+}
+
+impl From<[u8; 32]> for HeapAddress {
+    #[inline]
+    fn from(arr: [u8; 32]) -> Self {
+        HeapAddress(HeapH256::from(arr))
+    }
+}
+
+impl<'a> From<&'a [u8; 32]> for HeapAddress {
+    #[inline]
+    fn from(bytes: &'a [u8; 32]) -> Self {
+        HeapAddress(HeapH256::from(bytes))
+    }
+}
+
+impl<'a> From<&'a mut [u8; 32]> for HeapAddress {
+    #[inline]
+    fn from(bytes: &'a mut [u8; 32]) -> Self {
+        HeapAddress(HeapH256::from(bytes))
+    }
+}
+
+impl From<Box<[u8; 32]>> for HeapAddress {
+    #[inline]
+    fn from(bytes: Box<[u8; 32]>) -> Self {
+        HeapAddress(HeapH256::from(bytes))
+    }
+}
+
+impl HeapAddress {
+    pub fn from_slice(slice: &[u8]) -> Self {
+        HeapAddress(HeapH256::from_slice(slice))
+    }
+}
+
+impl From<HeapAddress> for [u8; 32] {
+    #[inline]
+    fn from(addr: HeapAddress) -> Self {
+        addr.0.into()
+    }
+}
+
+impl AsRef<[u8]> for HeapAddress {
+    #[inline]
+    fn as_ref(&self) -> &[u8] {
+        self.0.as_ref()
+    }
+}
+
+impl AsMut<[u8]> for HeapAddress {
+    #[inline]
+    fn as_mut(&mut self) -> &mut [u8] {
+        self.0.as_mut()
+    }
+}
+
+impl HeapAddress {
+    /// Returns a new address of 32 zeros.
+    /// Allocates directly in heap.
+    /// Minimal resulting wasm code (14 bytes if not inlined).
+    pub fn zero() -> Self {
+        HeapAddress(HeapH256::zero())
+    }
+
+    /// Returns the size of an address in bytes.
+    #[inline]
+    pub fn len_bytes() -> usize {
+        HeapH256::len_bytes()
+    }
+
+    /// Extracts a byte slice containing the entire fixed hash.
+    #[inline]
+    pub fn as_bytes(&self) -> &[u8] {
+        self.0.as_bytes()
+    }
+
+    #[inline]
+    pub fn as_array(&self) -> &[u8; 32] {
+        self.0.as_array()
+    }
+
+    #[inline]
+    pub fn copy_to_array(&self, target: &mut [u8; 32]) {
+        self.0.copy_to_array(target)
+    }
+
+    #[inline]
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.0.to_vec()
+    }
+
+    /// Pointer to the data on the heap.
+    #[inline]
+    pub fn as_ptr(&self) -> *const u8 {
+        self.0.as_ptr()
+    }
+
+    /// Returns an unsafe mutable pointer to the data on the heap.
+    /// Used by the API to populate data.
+    #[inline]
+    pub fn as_mut_ptr(&mut self) -> *mut u8 {
+        self.0.as_mut_ptr()
+    }
+
+    /// True if all 32 bytes of the hash are zero.
+    pub fn is_zero(&self) -> bool {
+        self.0.is_zero()
+    }
+
+    /// Transmutes self to an (in principle) variable length boxed bytes object.
+    /// Both BoxedBytes and H256 keep the data on the heap, so only the pointer to that data needs to be transmuted.
+    /// Does not reallocate or copy data, the data on the heap remains untouched.
+    pub fn into_boxed_bytes(self) -> BoxedBytes {
+        self.0.into_boxed_bytes()
+    }
+
+    pub fn is_smart_contract_address(&self) -> bool {
+        self.as_bytes()
+            .iter()
+            .take(SC_ADDRESS_NUM_LEADING_ZEROS.into())
+            .all(|item| item == &0u8)
+    }
+}
+
+use crate::codec::*;
+
+impl NestedEncode for HeapAddress {
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.0.dep_encode_or_handle_err(dest, h)
+    }
+}
+
+impl TopEncode for HeapAddress {
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.0.top_encode_or_handle_err(output, h)
+    }
+}
+
+impl NestedDecode for HeapAddress {
+    fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: NestedDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(HeapAddress(HeapH256::dep_decode_or_handle_err(input, h)?))
+    }
+}
+
+impl TopDecode for HeapAddress {
+    fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeInput,
+        H: DecodeErrorHandler,
+    {
+        Ok(HeapAddress(HeapH256::top_decode_or_handle_err(input, h)?))
+    }
+}
+
+#[cfg(test)]
+mod address_tests {
+    use super::*;
+    use crate::codec::test_util::{check_top_encode, check_top_encode_decode};
+    use alloc::vec::Vec;
+
+    #[test]
+    fn test_address() {
+        let addr = HeapAddress::from([4u8; 32]);
+        check_top_encode_decode(addr, &[4u8; 32]);
+    }
+
+    #[test]
+    fn test_opt_address() {
+        let addr = HeapAddress::from([4u8; 32]);
+        let mut expected: Vec<u8> = Vec::new();
+        expected.push(1u8);
+        expected.extend_from_slice(&[4u8; 32]);
+        check_top_encode_decode(Some(addr), expected.as_slice());
+    }
+
+    #[test]
+    fn test_ser_address_ref() {
+        let addr = HeapAddress::from([4u8; 32]);
+        let expected_bytes: &[u8] = &[4u8; 32 * 3];
+
+        let tuple = (&addr, &&&addr, addr.clone());
+        let serialized_bytes = check_top_encode(&tuple);
+        assert_eq!(serialized_bytes.as_slice(), expected_bytes);
+    }
+
+    #[test]
+    fn test_is_zero() {
+        assert!(HeapAddress::zero().is_zero());
+    }
+
+    #[test]
+    fn test_size_of() {
+        use core::mem::size_of;
+        assert_eq!(size_of::<HeapAddress>(), size_of::<usize>());
+        assert_eq!(size_of::<Option<HeapAddress>>(), size_of::<usize>());
+    }
+}
diff --git a/framework/base/src/types/heap/h256.rs b/chain/core/src/types/heap_h256.rs
similarity index 80%
rename from framework/base/src/types/heap/h256.rs
rename to chain/core/src/types/heap_h256.rs
index f440765d00..80f5a54f67 100644
--- a/framework/base/src/types/heap/h256.rs
+++ b/chain/core/src/types/heap_h256.rs
@@ -1,19 +1,17 @@
-use crate::{
-    abi::{TypeAbi, TypeAbiFrom, TypeName},
-    types::heap::BoxedBytes,
-};
 use alloc::{boxed::Box, vec::Vec};
 use core::fmt::Debug;
 
 const ERR_BAD_H256_LENGTH: &str = "bad H256 length";
 const ZERO_32: &[u8] = &[0u8; 32];
 
-/// Type that holds 32 bytes of data.
-/// Data is kept on the heap to keep wasm size low and avoid copies.
+/// Old smart contracts were using this H256 implementation,
+/// which was explicitly relying on the heap, to avoid large data copies on the stack.
+///
+/// It is no longer used, kept for reference.
 #[derive(Hash, PartialEq, Eq, Clone, Debug)]
-pub struct H256(Box<[u8; 32]>);
+pub struct HeapH256(Box<[u8; 32]>);
 
-impl From<[u8; 32]> for H256 {
+impl From<[u8; 32]> for HeapH256 {
     /// Constructs a hash type from the given bytes array of fixed length.
     ///
     /// # Note
@@ -21,11 +19,11 @@ impl From<[u8; 32]> for H256 {
     /// The given bytes are interpreted in big endian order.
     #[inline]
     fn from(arr: [u8; 32]) -> Self {
-        H256(Box::new(arr))
+        HeapH256(Box::new(arr))
     }
 }
 
-impl<'a> From<&'a [u8; 32]> for H256 {
+impl<'a> From<&'a [u8; 32]> for HeapH256 {
     /// Constructs a hash type from the given reference
     /// to the bytes array of fixed length.
     ///
@@ -34,11 +32,11 @@ impl<'a> From<&'a [u8; 32]> for H256 {
     /// The given bytes are interpreted in big endian order.
     #[inline]
     fn from(bytes: &'a [u8; 32]) -> Self {
-        H256(Box::new(*bytes))
+        HeapH256(Box::new(*bytes))
     }
 }
 
-impl<'a> From<&'a mut [u8; 32]> for H256 {
+impl<'a> From<&'a mut [u8; 32]> for HeapH256 {
     /// Constructs a hash type from the given reference
     /// to the mutable bytes array of fixed length.
     ///
@@ -47,48 +45,48 @@ impl<'a> From<&'a mut [u8; 32]> for H256 {
     /// The given bytes are interpreted in big endian order.
     #[inline]
     fn from(bytes: &'a mut [u8; 32]) -> Self {
-        H256(Box::new(*bytes))
+        HeapH256(Box::new(*bytes))
     }
 }
 
-impl From<Box<[u8; 32]>> for H256 {
+impl From<Box<[u8; 32]>> for HeapH256 {
     #[inline]
     fn from(bytes: Box<[u8; 32]>) -> Self {
-        H256(bytes)
+        HeapH256(bytes)
     }
 }
 
-impl H256 {
+impl HeapH256 {
     pub fn from_slice(slice: &[u8]) -> Self {
         let mut arr = [0u8; 32];
         let len = core::cmp::min(slice.len(), 32);
         arr[..len].copy_from_slice(&slice[..len]);
-        H256(Box::new(arr))
+        HeapH256(Box::new(arr))
     }
 }
 
-impl From<H256> for [u8; 32] {
+impl From<HeapH256> for [u8; 32] {
     #[inline]
-    fn from(s: H256) -> Self {
+    fn from(s: HeapH256) -> Self {
         *(s.0)
     }
 }
 
-impl AsRef<[u8]> for H256 {
+impl AsRef<[u8]> for HeapH256 {
     #[inline]
     fn as_ref(&self) -> &[u8] {
         self.as_bytes()
     }
 }
 
-impl AsMut<[u8]> for H256 {
+impl AsMut<[u8]> for HeapH256 {
     #[inline]
     fn as_mut(&mut self) -> &mut [u8] {
         self.0.as_mut()
     }
 }
 
-impl H256 {
+impl HeapH256 {
     /// Returns a new zero-initialized fixed hash.
     /// Allocates directly in heap.
     /// Minimal resulting wasm code (14 bytes if not inlined).
@@ -96,7 +94,7 @@ impl H256 {
         use alloc::alloc::{alloc_zeroed, Layout};
         unsafe {
             let ptr = alloc_zeroed(Layout::new::<[u8; 32]>()) as *mut [u8; 32];
-            H256(Box::from_raw(ptr))
+            HeapH256(Box::from_raw(ptr))
         }
     }
 
@@ -159,7 +157,9 @@ impl H256 {
 
 use crate::codec::*;
 
-impl NestedEncode for H256 {
+use super::BoxedBytes;
+
+impl NestedEncode for HeapH256 {
     fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, _h: H) -> Result<(), H::HandledErr>
     where
         O: NestedEncodeOutput,
@@ -170,7 +170,7 @@ impl NestedEncode for H256 {
     }
 }
 
-impl TopEncode for H256 {
+impl TopEncode for HeapH256 {
     fn top_encode_or_handle_err<O, H>(&self, output: O, _h: H) -> Result<(), H::HandledErr>
     where
         O: TopEncodeOutput,
@@ -181,19 +181,19 @@ impl TopEncode for H256 {
     }
 }
 
-impl NestedDecode for H256 {
+impl NestedDecode for HeapH256 {
     fn dep_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
     where
         I: NestedDecodeInput,
         H: DecodeErrorHandler,
     {
-        let mut res = H256::zero();
+        let mut res = HeapH256::zero();
         input.read_into(res.as_mut(), h)?;
         Ok(res)
     }
 }
 
-impl H256 {
+impl HeapH256 {
     // Transmutes directly from a (variable-sized) boxed byte slice.
     // Will exit early if the input length is not 32.
     // Designed to be used especially in deserializer implementations.
@@ -207,14 +207,14 @@ impl H256 {
         if input.len() == 32 {
             let raw = Box::into_raw(input);
             let array_box = unsafe { Box::<[u8; 32]>::from_raw(raw as *mut [u8; 32]) };
-            Ok(H256(array_box))
+            Ok(HeapH256(array_box))
         } else {
             Err(h.handle_error(DecodeError::from(ERR_BAD_H256_LENGTH)))
         }
     }
 }
 
-impl TopDecode for H256 {
+impl TopDecode for HeapH256 {
     fn top_decode_or_handle_err<I, H>(input: I, h: H) -> Result<Self, H::HandledErr>
     where
         I: TopDecodeInput,
@@ -224,20 +224,6 @@ impl TopDecode for H256 {
     }
 }
 
-impl TypeAbiFrom<Self> for H256 {}
-
-impl TypeAbi for H256 {
-    type Unmanaged = Self;
-
-    fn type_name() -> TypeName {
-        "H256".into()
-    }
-
-    fn type_name_rust() -> TypeName {
-        "H256".into()
-    }
-}
-
 #[cfg(test)]
 mod h256_tests {
     use super::*;
@@ -246,13 +232,13 @@ mod h256_tests {
 
     #[test]
     fn test_h256_from_array() {
-        let addr = H256::from([4u8; 32]);
+        let addr = HeapH256::from([4u8; 32]);
         check_top_encode_decode(addr, &[4u8; 32]);
     }
 
     #[test]
     fn test_opt_h256() {
-        let addr = H256::from([4u8; 32]);
+        let addr = HeapH256::from([4u8; 32]);
         let mut expected: Vec<u8> = Vec::new();
         expected.push(1u8);
         expected.extend_from_slice(&[4u8; 32]);
@@ -261,7 +247,7 @@ mod h256_tests {
 
     #[test]
     fn test_ser_h256_ref() {
-        let addr = H256::from([4u8; 32]);
+        let addr = HeapH256::from([4u8; 32]);
         let expected_bytes: &[u8] = &[4u8; 32 * 3];
 
         let tuple = (&addr, &&&addr, addr.clone());
@@ -271,20 +257,20 @@ mod h256_tests {
 
     #[test]
     fn test_is_zero() {
-        assert!(H256::zero().is_zero());
+        assert!(HeapH256::zero().is_zero());
     }
 
     #[test]
     fn test_size_of() {
         use core::mem::size_of;
-        assert_eq!(size_of::<H256>(), size_of::<usize>());
-        assert_eq!(size_of::<Option<H256>>(), size_of::<usize>());
+        assert_eq!(size_of::<HeapH256>(), size_of::<usize>());
+        assert_eq!(size_of::<Option<HeapH256>>(), size_of::<usize>());
     }
 
     #[test]
     fn test_into_boxed_bytes() {
         let array = b"32_bytes________________________";
-        let h256 = H256::from(array);
+        let h256 = HeapH256::from(array);
         let bb = h256.into_boxed_bytes();
         assert_eq!(bb.as_slice(), &array[..]);
     }
diff --git a/vm/Cargo.toml b/chain/vm/Cargo.toml
similarity index 83%
rename from vm/Cargo.toml
rename to chain/vm/Cargo.toml
index 2da432d240..e412a709af 100644
--- a/vm/Cargo.toml
+++ b/chain/vm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multiversx-chain-vm"
-version = "0.9.0"
+version = "0.11.0"
 edition = "2021"
 
 authors = [
@@ -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"]
 
 [dependencies]
 num-bigint = "0.4"
@@ -31,8 +31,12 @@ 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 }
-ed25519-dalek = { version = "1.0.1" , optional = true }
+rand_seeder = "0.3.0"
+ed25519-dalek = "2.1.0"
+
+[dependencies.multiversx-chain-core]
+version = "=0.11.0"
+path = "../core"
 
 [dependencies.multiversx-chain-vm-executor]
 # version = "0.2.0"
diff --git a/vm/README.md b/chain/vm/README.md
similarity index 100%
rename from vm/README.md
rename to chain/vm/README.md
diff --git a/chain/vm/src/crypto_functions.rs b/chain/vm/src/crypto_functions.rs
new file mode 100644
index 0000000000..3dae63aad7
--- /dev/null
+++ b/chain/vm/src/crypto_functions.rs
@@ -0,0 +1,44 @@
+use sha2::Sha256;
+use sha3::{Digest, Keccak256};
+
+pub const SHA256_RESULT_LEN: usize = 32;
+pub const KECCAK256_RESULT_LEN: usize = 32;
+
+pub fn sha256(data: &[u8]) -> [u8; SHA256_RESULT_LEN] {
+    let mut hasher = Sha256::new();
+    hasher.update(data);
+    hasher.finalize().into()
+}
+
+pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
+    let mut hasher = Keccak256::new();
+    hasher.update(data);
+    hasher.finalize().into()
+}
+
+pub fn verify_ed25519(key: &[u8], message: &[u8], signature: &[u8]) -> bool {
+    use ed25519_dalek::{Signature, Verifier, VerifyingKey};
+
+    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 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);
+
+    let result = verifying_key.verify(message, &sig);
+    result.is_ok()
+}
diff --git a/vm/src/display_util.rs b/chain/vm/src/display_util.rs
similarity index 100%
rename from vm/src/display_util.rs
rename to chain/vm/src/display_util.rs
diff --git a/vm/src/lib.rs b/chain/vm/src/lib.rs
similarity index 80%
rename from vm/src/lib.rs
rename to chain/vm/src/lib.rs
index 48f9c288e1..51e8931642 100644
--- a/vm/src/lib.rs
+++ b/chain/vm/src/lib.rs
@@ -14,5 +14,8 @@ pub use world_mock::BlockchainMock;
 // Re-exporting the executor, for convenience.
 pub use multiversx_chain_vm_executor as executor;
 
+// Re-exporting the VM-core, for convenience.
+pub use multiversx_chain_core as chain_core;
+
 #[macro_use]
 extern crate alloc;
diff --git a/vm/src/mem_conv.rs b/chain/vm/src/mem_conv.rs
similarity index 100%
rename from vm/src/mem_conv.rs
rename to chain/vm/src/mem_conv.rs
diff --git a/vm/src/tx_execution.rs b/chain/vm/src/tx_execution.rs
similarity index 100%
rename from vm/src/tx_execution.rs
rename to chain/vm/src/tx_execution.rs
diff --git a/vm/src/tx_execution/blockchain_vm.rs b/chain/vm/src/tx_execution/blockchain_vm.rs
similarity index 100%
rename from vm/src/tx_execution/blockchain_vm.rs
rename to chain/vm/src/tx_execution/blockchain_vm.rs
diff --git a/vm/src/tx_execution/builtin_function_mocks.rs b/chain/vm/src/tx_execution/builtin_function_mocks.rs
similarity index 70%
rename from vm/src/tx_execution/builtin_function_mocks.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks.rs
index dff42101cc..d50044d0c1 100644
--- a/vm/src/tx_execution/builtin_function_mocks.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks.rs
@@ -3,8 +3,6 @@ mod builtin_func_trait;
 mod esdt_nft;
 mod general;
 mod transfer;
-pub mod vm_builtin_function_names;
 
 pub use builtin_func_container::BuiltinFunctionContainer;
 pub use builtin_func_trait::{BuiltinFunction, BuiltinFunctionEsdtTransferInfo};
-pub use vm_builtin_function_names as builtin_function_names;
diff --git a/vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs b/chain/vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs
similarity index 99%
rename from vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs
index 8b5a302377..39220d9722 100644
--- a/vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/builtin_func_container.rs
@@ -1,6 +1,5 @@
 use super::{
     builtin_func_trait::BuiltinFunction,
-    builtin_function_names::*,
     esdt_nft::{
         ESDTLocalBurn, ESDTLocalMint, ESDTNftAddQuantity, ESDTNftAddUri, ESDTNftBurn,
         ESDTNftCreate, ESDTNftUpdateAttributes,
@@ -9,12 +8,15 @@ use super::{
     transfer::{ESDTMultiTransfer, ESDTNftTransfer, ESDTTransfer},
     BuiltinFunctionEsdtTransferInfo,
 };
+
 use crate::{
     tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
     types::EsdtLocalRole,
 };
 
+use crate::chain_core::builtin_func_names::*;
+
 /// Container for builtin function logic.
 ///
 /// Currently has no data, but could conceivably be configurable in the future.
diff --git a/vm/src/tx_execution/builtin_function_mocks/builtin_func_trait.rs b/chain/vm/src/tx_execution/builtin_function_mocks/builtin_func_trait.rs
similarity index 100%
rename from vm/src/tx_execution/builtin_function_mocks/builtin_func_trait.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/builtin_func_trait.rs
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs
similarity index 88%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs
index 88d84f5681..f87af9f766 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_burn.rs
@@ -1,7 +1,9 @@
+use multiversx_chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_LOCAL_BURN_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_LOCAL_BURN_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
 };
 
@@ -46,7 +48,7 @@ impl BuiltinFunction for ESDTLocalBurn {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs
similarity index 88%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs
index 73f35aef69..b82c7ca8b4 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_local_mint.rs
@@ -1,8 +1,9 @@
+use multiversx_chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 
-use crate::tx_execution::{builtin_function_names::ESDT_LOCAL_MINT_FUNC_NAME, BlockchainVMRef};
-
 use crate::{
+    chain_core::builtin_func_names::ESDT_LOCAL_MINT_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     world_mock::EsdtInstanceMetadata,
 };
@@ -50,7 +51,7 @@ impl BuiltinFunction for ESDTLocalMint {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs
similarity index 91%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs
index f462d64ef3..c773ee80bc 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_quantity_mock.rs
@@ -1,13 +1,11 @@
+use multiversx_chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 
 use crate::{
+    chain_core::builtin_func_names::ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
     tx_execution::BlockchainVMRef,
-    types::{top_decode_u64, top_encode_u64},
-};
-
-use crate::{
-    tx_execution::builtin_function_names::ESDT_NFT_ADD_QUANTITY_FUNC_NAME,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
+    types::{top_decode_u64, top_encode_u64},
     world_mock::EsdtInstanceMetadata,
 };
 
@@ -59,7 +57,7 @@ impl BuiltinFunction for ESDTNftAddQuantity {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
similarity index 89%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
index 19966902b4..9685063fc9 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_add_uri_mock.rs
@@ -1,5 +1,8 @@
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_NFT_ADD_URI_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_NFT_ADD_URI_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::{top_decode_u64, top_encode_u64},
 };
@@ -52,7 +55,7 @@ impl BuiltinFunction for ESDTNftAddUri {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs
similarity index 90%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs
index 26ffe468a6..f92d89efbd 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_burn_mock.rs
@@ -1,7 +1,9 @@
+use multiversx_chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_NFT_BURN_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_NFT_BURN_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::{top_decode_u64, top_encode_u64},
 };
@@ -52,7 +54,7 @@ impl BuiltinFunction for ESDTNftBurn {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs
similarity index 93%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs
index 2f538c9e67..5966330213 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_create_mock.rs
@@ -1,7 +1,9 @@
+use multiversx_chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_NFT_CREATE_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_NFT_CREATE_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::{top_decode_u64, top_encode_u64},
     world_mock::{EsdtInstance, EsdtInstanceMetadata},
@@ -78,7 +80,7 @@ impl BuiltinFunction for ESDTNftCreate {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_values: vec![top_encode_u64(new_nonce)],
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs
similarity index 89%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs
index 49c2629cfb..42a6f965ae 100644
--- a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/esdt_nft_update_attriutes_mock.rs
@@ -1,5 +1,8 @@
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::{top_decode_u64, top_encode_u64},
 };
@@ -51,7 +54,7 @@ impl BuiltinFunction for ESDTNftUpdateAttributes {
         };
 
         let tx_result = TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_logs: vec![esdt_nft_create_log],
             ..Default::default()
         };
diff --git a/vm/src/tx_execution/builtin_function_mocks/esdt_nft/mod.rs b/chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/mod.rs
similarity index 100%
rename from vm/src/tx_execution/builtin_function_mocks/esdt_nft/mod.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/esdt_nft/mod.rs
diff --git a/vm/src/tx_execution/builtin_function_mocks/general.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general.rs
similarity index 100%
rename from vm/src/tx_execution/builtin_function_mocks/general.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general.rs
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs
similarity index 90%
rename from vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs
index 8352b606cd..17d168a4cd 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/change_owner_mock.rs
@@ -1,8 +1,6 @@
-use crate::tx_execution::{
-    builtin_function_names::CHANGE_OWNER_BUILTIN_FUNC_NAME, BlockchainVMRef,
-};
-
 use crate::{
+    chain_core::builtin_func_names::CHANGE_OWNER_BUILTIN_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
     types::VMAddress,
 };
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
similarity index 89%
rename from vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
index 0b7e9c694f..3d705959f1 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/claim_developer_rewards_mock.rs
@@ -1,10 +1,11 @@
-use crate::tx_execution::{
-    builtin_function_names::CLAIM_DEVELOPER_REWARDS_FUNC_NAME, BlockchainVMRef,
-};
 use num_bigint::BigUint;
 use num_traits::Zero;
 
-use crate::tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult};
+use crate::{
+    chain_core::builtin_func_names::CLAIM_DEVELOPER_REWARDS_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
+    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
+};
 
 use super::super::builtin_func_trait::BuiltinFunction;
 
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs
similarity index 82%
rename from vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs
index c697f76859..719454c20a 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/delete_username_mock.rs
@@ -1,6 +1,8 @@
-use crate::tx_execution::{builtin_function_names::DELETE_USERNAME_FUNC_NAME, BlockchainVMRef};
-
-use crate::tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult};
+use crate::{
+    chain_core::builtin_func_names::DELETE_USERNAME_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
+    tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult},
+};
 
 use super::super::builtin_func_trait::BuiltinFunction;
 
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs
similarity index 93%
rename from vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs
index ea7c5ec57a..8674aed324 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/migrate_username_mock.rs
@@ -1,5 +1,5 @@
-use crate::tx_execution::{builtin_function_names::MIGRATE_USERNAME_FUNC_NAME, BlockchainVMRef};
-
+use crate::chain_core::builtin_func_names::MIGRATE_USERNAME_FUNC_NAME;
+use crate::tx_execution::BlockchainVMRef;
 use crate::tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult};
 
 use super::super::builtin_func_trait::BuiltinFunction;
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs
similarity index 91%
rename from vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs
index 8df9d6316d..65e1c95f1e 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/set_username_mock.rs
@@ -1,5 +1,5 @@
-use crate::tx_execution::{builtin_function_names::SET_USERNAME_FUNC_NAME, BlockchainVMRef};
-
+use crate::chain_core::builtin_func_names::SET_USERNAME_FUNC_NAME;
+use crate::tx_execution::BlockchainVMRef;
 use crate::tx_mock::{BlockchainUpdate, TxCache, TxInput, TxResult};
 
 use super::super::builtin_func_trait::BuiltinFunction;
diff --git a/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs b/chain/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs
similarity index 94%
rename from vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs
index 7de2032273..18ed1783ec 100644
--- a/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs
@@ -1,8 +1,6 @@
-use crate::tx_execution::{
-    builtin_function_names::UPGRADE_CONTRACT_FUNC_NAME, create_transfer_value_log, BlockchainVMRef,
-};
-
 use crate::{
+    chain_core::builtin_func_names::UPGRADE_CONTRACT_FUNC_NAME,
+    tx_execution::{create_transfer_value_log, BlockchainVMRef},
     tx_mock::{BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxResult},
     types::VMCodeMetadata,
 };
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
similarity index 97%
rename from vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
index 183819f372..0235d68f9e 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_multi_transfer_mock.rs
@@ -1,5 +1,6 @@
 use crate::{
-    tx_execution::{builtin_function_names::ESDT_MULTI_TRANSFER_FUNC_NAME, BlockchainVMRef},
+    chain_core::builtin_func_names::ESDT_MULTI_TRANSFER_FUNC_NAME,
+    tx_execution::BlockchainVMRef,
     tx_mock::TxLog,
     types::{top_decode_u64, top_encode_u64},
 };
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
similarity index 95%
rename from vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
index 24d5925662..39bbe7f1cb 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_nft_transfer_mock.rs
@@ -1,8 +1,6 @@
 use crate::{
-    tx_execution::{
-        builtin_function_names::ESDT_NFT_TRANSFER_FUNC_NAME, BlockchainVMRef,
-        BuiltinFunctionEsdtTransferInfo,
-    },
+    chain_core::builtin_func_names::ESDT_NFT_TRANSFER_FUNC_NAME,
+    tx_execution::{BlockchainVMRef, BuiltinFunctionEsdtTransferInfo},
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
     types::VMAddress,
 };
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
similarity index 95%
rename from vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
index 8f5a912a2a..4d8bd08b2e 100644
--- a/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
+++ b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/esdt_transfer_mock.rs
@@ -1,8 +1,6 @@
 use crate::{
-    tx_execution::{
-        builtin_function_names::ESDT_TRANSFER_FUNC_NAME, BlockchainVMRef,
-        BuiltinFunctionEsdtTransferInfo,
-    },
+    chain_core::builtin_func_names::ESDT_TRANSFER_FUNC_NAME,
+    tx_execution::{BlockchainVMRef, BuiltinFunctionEsdtTransferInfo},
     tx_mock::{BlockchainUpdate, TxCache, TxInput, TxLog, TxResult},
 };
 
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/mod.rs b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/mod.rs
similarity index 100%
rename from vm/src/tx_execution/builtin_function_mocks/transfer/mod.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/transfer/mod.rs
diff --git a/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs b/chain/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
similarity index 100%
rename from vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
rename to chain/vm/src/tx_execution/builtin_function_mocks/transfer/transfer_common.rs
diff --git a/vm/src/tx_execution/exec_call.rs b/chain/vm/src/tx_execution/exec_call.rs
similarity index 98%
rename from vm/src/tx_execution/exec_call.rs
rename to chain/vm/src/tx_execution/exec_call.rs
index ffc48e12ae..1b8e50b855 100644
--- a/vm/src/tx_execution/exec_call.rs
+++ b/chain/vm/src/tx_execution/exec_call.rs
@@ -92,7 +92,7 @@ impl BlockchainVMRef {
             self.execute_builtin_function_or_default(tx_input, tx_cache, f)
         });
 
-        if tx_result.result_status == 0 {
+        if tx_result.result_status.is_success() {
             blockchain_updates.apply(state);
         }
 
@@ -155,7 +155,7 @@ impl BlockchainVMRef {
 
         // legacy async call
         // the async call also gets reset
-        if tx_result.result_status == 0 {
+        if tx_result.result_status.is_success() {
             if let Some(async_data) = pending_calls.async_call {
                 let (async_result, callback_result) =
                     self.execute_async_call_and_callback(async_data, state);
diff --git a/vm/src/tx_execution/exec_contract_endpoint.rs b/chain/vm/src/tx_execution/exec_contract_endpoint.rs
similarity index 100%
rename from vm/src/tx_execution/exec_contract_endpoint.rs
rename to chain/vm/src/tx_execution/exec_contract_endpoint.rs
diff --git a/vm/src/tx_execution/exec_create.rs b/chain/vm/src/tx_execution/exec_create.rs
similarity index 100%
rename from vm/src/tx_execution/exec_create.rs
rename to chain/vm/src/tx_execution/exec_create.rs
diff --git a/vm/src/tx_execution/exec_general_tx.rs b/chain/vm/src/tx_execution/exec_general_tx.rs
similarity index 100%
rename from vm/src/tx_execution/exec_general_tx.rs
rename to chain/vm/src/tx_execution/exec_general_tx.rs
diff --git a/vm/src/tx_execution/system_sc.rs b/chain/vm/src/tx_execution/system_sc.rs
similarity index 100%
rename from vm/src/tx_execution/system_sc.rs
rename to chain/vm/src/tx_execution/system_sc.rs
diff --git a/vm/src/tx_execution/system_sc/system_sc_issue.rs b/chain/vm/src/tx_execution/system_sc/system_sc_issue.rs
similarity index 100%
rename from vm/src/tx_execution/system_sc/system_sc_issue.rs
rename to chain/vm/src/tx_execution/system_sc/system_sc_issue.rs
diff --git a/vm/src/tx_execution/system_sc/system_sc_special_roles.rs b/chain/vm/src/tx_execution/system_sc/system_sc_special_roles.rs
similarity index 100%
rename from vm/src/tx_execution/system_sc/system_sc_special_roles.rs
rename to chain/vm/src/tx_execution/system_sc/system_sc_special_roles.rs
diff --git a/vm/src/tx_execution/system_sc/system_sc_unimplemented.rs b/chain/vm/src/tx_execution/system_sc/system_sc_unimplemented.rs
similarity index 100%
rename from vm/src/tx_execution/system_sc/system_sc_unimplemented.rs
rename to chain/vm/src/tx_execution/system_sc/system_sc_unimplemented.rs
diff --git a/vm/src/tx_mock.rs b/chain/vm/src/tx_mock.rs
similarity index 86%
rename from vm/src/tx_mock.rs
rename to chain/vm/src/tx_mock.rs
index bd508d569e..ce63ddfe7a 100644
--- a/vm/src/tx_mock.rs
+++ b/chain/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.rs b/chain/vm/src/tx_mock/blockchain_rng.rs
similarity index 100%
rename from vm/src/tx_mock/blockchain_rng.rs
rename to chain/vm/src/tx_mock/blockchain_rng.rs
diff --git a/vm/src/tx_mock/blockchain_rng_unsupported.rs b/chain/vm/src/tx_mock/blockchain_rng_unsupported.rs
similarity index 87%
rename from vm/src/tx_mock/blockchain_rng_unsupported.rs
rename to chain/vm/src/tx_mock/blockchain_rng_unsupported.rs
index 698be4ac11..6339cbaffc 100644
--- a/vm/src/tx_mock/blockchain_rng_unsupported.rs
+++ b/chain/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")
     }
 }
diff --git a/vm/src/tx_mock/blockchain_update.rs b/chain/vm/src/tx_mock/blockchain_update.rs
similarity index 100%
rename from vm/src/tx_mock/blockchain_update.rs
rename to chain/vm/src/tx_mock/blockchain_update.rs
diff --git a/vm/src/tx_mock/tx_async_call_data.rs b/chain/vm/src/tx_mock/tx_async_call_data.rs
similarity index 95%
rename from vm/src/tx_mock/tx_async_call_data.rs
rename to chain/vm/src/tx_mock/tx_async_call_data.rs
index 45cbce639c..ab1b744a3b 100644
--- a/vm/src/tx_mock/tx_async_call_data.rs
+++ b/chain/vm/src/tx_mock/tx_async_call_data.rs
@@ -56,8 +56,8 @@ pub fn async_callback_tx_input(
     async_result: &TxResult,
     builtin_functions: &BuiltinFunctionContainer,
 ) -> TxInput {
-    let mut args: Vec<Vec<u8>> = vec![result_status_bytes(async_result.result_status)];
-    if async_result.result_status == 0 {
+    let mut args: Vec<Vec<u8>> = vec![result_status_bytes(async_result.result_status.as_u64())];
+    if async_result.result_status.is_success() {
         args.extend_from_slice(async_result.result_values.as_slice());
     } else {
         args.push(async_result.result_message.clone().into_bytes());
@@ -108,7 +108,7 @@ pub fn async_promise_callback_tx_input(
     async_result: &TxResult,
     builtin_functions: &BuiltinFunctionContainer,
 ) -> TxInput {
-    let callback_name = if async_result.result_status == 0 {
+    let callback_name = if async_result.result_status.is_success() {
         promise.success_callback.clone()
     } else {
         promise.error_callback.clone()
@@ -122,7 +122,7 @@ pub fn async_promise_callback_tx_input(
 }
 
 pub fn merge_results(mut original: TxResult, mut new: TxResult) -> TxResult {
-    if original.result_status == 0 {
+    if original.result_status.is_success() {
         original.result_values.append(&mut new.result_values);
         original.result_logs.append(&mut new.result_logs);
         original.result_message = new.result_message;
diff --git a/vm/src/tx_mock/tx_async_promise.rs b/chain/vm/src/tx_mock/tx_async_promise.rs
similarity index 100%
rename from vm/src/tx_mock/tx_async_promise.rs
rename to chain/vm/src/tx_mock/tx_async_promise.rs
diff --git a/vm/src/tx_mock/tx_back_transfers.rs b/chain/vm/src/tx_mock/tx_back_transfers.rs
similarity index 100%
rename from vm/src/tx_mock/tx_back_transfers.rs
rename to chain/vm/src/tx_mock/tx_back_transfers.rs
diff --git a/vm/src/tx_mock/tx_cache.rs b/chain/vm/src/tx_mock/tx_cache.rs
similarity index 100%
rename from vm/src/tx_mock/tx_cache.rs
rename to chain/vm/src/tx_mock/tx_cache.rs
diff --git a/vm/src/tx_mock/tx_cache_balance_util.rs b/chain/vm/src/tx_mock/tx_cache_balance_util.rs
similarity index 100%
rename from vm/src/tx_mock/tx_cache_balance_util.rs
rename to chain/vm/src/tx_mock/tx_cache_balance_util.rs
diff --git a/vm/src/tx_mock/tx_cache_source.rs b/chain/vm/src/tx_mock/tx_cache_source.rs
similarity index 100%
rename from vm/src/tx_mock/tx_cache_source.rs
rename to chain/vm/src/tx_mock/tx_cache_source.rs
diff --git a/vm/src/tx_mock/tx_context.rs b/chain/vm/src/tx_mock/tx_context.rs
similarity index 100%
rename from vm/src/tx_mock/tx_context.rs
rename to chain/vm/src/tx_mock/tx_context.rs
diff --git a/vm/src/tx_mock/tx_context_ref.rs b/chain/vm/src/tx_mock/tx_context_ref.rs
similarity index 100%
rename from vm/src/tx_mock/tx_context_ref.rs
rename to chain/vm/src/tx_mock/tx_context_ref.rs
diff --git a/vm/src/tx_mock/tx_context_stack.rs b/chain/vm/src/tx_mock/tx_context_stack.rs
similarity index 100%
rename from vm/src/tx_mock/tx_context_stack.rs
rename to chain/vm/src/tx_mock/tx_context_stack.rs
diff --git a/vm/src/tx_mock/tx_input.rs b/chain/vm/src/tx_mock/tx_input.rs
similarity index 100%
rename from vm/src/tx_mock/tx_input.rs
rename to chain/vm/src/tx_mock/tx_input.rs
diff --git a/vm/src/tx_mock/tx_input_call_type.rs b/chain/vm/src/tx_mock/tx_input_call_type.rs
similarity index 100%
rename from vm/src/tx_mock/tx_input_call_type.rs
rename to chain/vm/src/tx_mock/tx_input_call_type.rs
diff --git a/vm/src/tx_mock/tx_input_function.rs b/chain/vm/src/tx_mock/tx_input_function.rs
similarity index 100%
rename from vm/src/tx_mock/tx_input_function.rs
rename to chain/vm/src/tx_mock/tx_input_function.rs
diff --git a/vm/src/tx_mock/tx_log.rs b/chain/vm/src/tx_mock/tx_log.rs
similarity index 100%
rename from vm/src/tx_mock/tx_log.rs
rename to chain/vm/src/tx_mock/tx_log.rs
diff --git a/vm/src/tx_mock/tx_managed_types.rs b/chain/vm/src/tx_mock/tx_managed_types.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types.rs
rename to chain/vm/src/tx_mock/tx_managed_types.rs
diff --git a/vm/src/tx_mock/tx_managed_types/handle_map.rs b/chain/vm/src/tx_mock/tx_managed_types/handle_map.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types/handle_map.rs
rename to chain/vm/src/tx_mock/tx_managed_types/handle_map.rs
diff --git a/vm/src/tx_mock/tx_managed_types/tx_big_float.rs b/chain/vm/src/tx_mock/tx_managed_types/tx_big_float.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types/tx_big_float.rs
rename to chain/vm/src/tx_mock/tx_managed_types/tx_big_float.rs
diff --git a/vm/src/tx_mock/tx_managed_types/tx_big_int.rs b/chain/vm/src/tx_mock/tx_managed_types/tx_big_int.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types/tx_big_int.rs
rename to chain/vm/src/tx_mock/tx_managed_types/tx_big_int.rs
diff --git a/vm/src/tx_mock/tx_managed_types/tx_managed_buffer.rs b/chain/vm/src/tx_mock/tx_managed_types/tx_managed_buffer.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types/tx_managed_buffer.rs
rename to chain/vm/src/tx_mock/tx_managed_types/tx_managed_buffer.rs
diff --git a/vm/src/tx_mock/tx_managed_types/tx_managed_map.rs b/chain/vm/src/tx_mock/tx_managed_types/tx_managed_map.rs
similarity index 100%
rename from vm/src/tx_mock/tx_managed_types/tx_managed_map.rs
rename to chain/vm/src/tx_mock/tx_managed_types/tx_managed_map.rs
diff --git a/vm/src/tx_mock/tx_panic.rs b/chain/vm/src/tx_mock/tx_panic.rs
similarity index 54%
rename from vm/src/tx_mock/tx_panic.rs
rename to chain/vm/src/tx_mock/tx_panic.rs
index 63d1154558..86875f765f 100644
--- a/vm/src/tx_mock/tx_panic.rs
+++ b/chain/vm/src/tx_mock/tx_panic.rs
@@ -1,11 +1,13 @@
+use multiversx_chain_core::types::ReturnCode;
+
 #[derive(Debug, Clone)]
 pub struct TxPanic {
-    pub status: u64,
+    pub status: ReturnCode,
     pub message: String,
 }
 
 impl TxPanic {
-    pub fn new(status: u64, message: &str) -> Self {
+    pub fn new(status: ReturnCode, message: &str) -> Self {
         Self {
             status,
             message: message.to_string(),
@@ -13,10 +15,10 @@ impl TxPanic {
     }
 
     pub fn user_error(message: &str) -> TxPanic {
-        TxPanic::new(4, message)
+        TxPanic::new(ReturnCode::UserError, message)
     }
 
     pub fn vm_error(message: &str) -> TxPanic {
-        TxPanic::new(10, message)
+        TxPanic::new(ReturnCode::ExecutionFailed, message)
     }
 }
diff --git a/vm/src/tx_mock/tx_result.rs b/chain/vm/src/tx_mock/tx_result.rs
similarity index 90%
rename from vm/src/tx_mock/tx_result.rs
rename to chain/vm/src/tx_mock/tx_result.rs
index 4234f3a207..68a5319948 100644
--- a/vm/src/tx_mock/tx_result.rs
+++ b/chain/vm/src/tx_mock/tx_result.rs
@@ -1,11 +1,13 @@
 use std::fmt;
 
+use multiversx_chain_core::types::ReturnCode;
+
 use super::{AsyncCallTxData, TxLog, TxPanic, TxResultCalls};
 
 #[derive(Clone, Debug)]
 #[must_use]
 pub struct TxResult {
-    pub result_status: u64,
+    pub result_status: ReturnCode,
     pub result_message: String,
     pub result_values: Vec<Vec<u8>>,
     pub result_logs: Vec<TxLog>,
@@ -24,7 +26,7 @@ pub struct TxResult {
 impl Default for TxResult {
     fn default() -> Self {
         TxResult {
-            result_status: 0,
+            result_status: ReturnCode::Success,
             result_message: String::new(),
             result_values: Vec::new(),
             result_logs: Vec::new(),
@@ -55,7 +57,7 @@ impl TxResult {
 
     pub fn from_panic_string(s: &str) -> Self {
         TxResult {
-            result_status: 4,
+            result_status: ReturnCode::UserError,
             result_message: s.to_string(),
             result_values: Vec::new(),
             result_logs: Vec::new(),
@@ -72,7 +74,7 @@ impl TxResult {
         S: Into<String>,
     {
         TxResult {
-            result_status: 10,
+            result_status: ReturnCode::ExecutionFailed,
             result_message: result_message.into(),
             ..Default::default()
         }
@@ -94,7 +96,7 @@ impl TxResult {
 
     pub fn assert_ok(&self) {
         assert!(
-            self.result_status == 0,
+            self.result_status.is_success(),
             "Tx success expected, but failed. Status: {}, message: \"{}\"",
             self.result_status,
             self.result_message.as_str()
@@ -111,7 +113,7 @@ impl TxResult {
             self.result_message.as_str()
         );
         assert!(
-            self.result_status == expected_status,
+            self.result_status.as_u64() == expected_status,
             "Tx error status mismatch. Want status {}, message \"{}\". Have status {}, message \"{}\"",
             expected_status,
             expected_message,
@@ -121,7 +123,7 @@ impl TxResult {
     }
 
     pub fn assert_user_error(&self, expected_message: &str) {
-        self.assert_error(4, expected_message);
+        self.assert_error(ReturnCode::UserError.as_u64(), expected_message);
     }
 }
 
diff --git a/vm/src/tx_mock/tx_result_calls.rs b/chain/vm/src/tx_mock/tx_result_calls.rs
similarity index 100%
rename from vm/src/tx_mock/tx_result_calls.rs
rename to chain/vm/src/tx_mock/tx_result_calls.rs
diff --git a/vm/src/types.rs b/chain/vm/src/types.rs
similarity index 55%
rename from vm/src/types.rs
rename to chain/vm/src/types.rs
index d1ada0c0f6..9ab80284a5 100644
--- a/vm/src/types.rs
+++ b/chain/vm/src/types.rs
@@ -1,20 +1,14 @@
-mod vm_address;
-mod vm_code_metadata;
-mod vm_esdt_local_role;
-mod vm_esdt_local_role_flags;
-mod vm_h256;
-mod vm_token_type;
+pub use crate::chain_core::types::Address as VMAddress;
+pub use crate::chain_core::types::CodeMetadata as VMCodeMetadata;
+pub use crate::chain_core::types::EsdtLocalRole;
+pub use crate::chain_core::types::EsdtLocalRoleFlags;
+pub use crate::chain_core::types::TokenType as VMTokenType;
+pub use crate::chain_core::types::H256;
+
+pub type RawHandle = i32;
 
 use num_bigint::BigUint;
 use num_traits::Zero;
-pub use vm_address::VMAddress;
-pub use vm_code_metadata::VMCodeMetadata;
-pub use vm_esdt_local_role::EsdtLocalRole;
-pub use vm_esdt_local_role_flags::EsdtLocalRoleFlags;
-pub use vm_h256::H256;
-pub use vm_token_type::VMTokenType;
-
-pub type RawHandle = i32;
 
 pub(crate) fn top_encode_u64(value: u64) -> Vec<u8> {
     top_encode_big_uint(&BigUint::from(value))
diff --git a/vm/src/vm_err_msg.rs b/chain/vm/src/vm_err_msg.rs
similarity index 100%
rename from vm/src/vm_err_msg.rs
rename to chain/vm/src/vm_err_msg.rs
diff --git a/vm/src/vm_hooks.rs b/chain/vm/src/vm_hooks.rs
similarity index 100%
rename from vm/src/vm_hooks.rs
rename to chain/vm/src/vm_hooks.rs
diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/chain/vm/src/vm_hooks/vh_dispatcher.rs
similarity index 99%
rename from vm/src/vm_hooks/vh_dispatcher.rs
rename to chain/vm/src/vm_hooks/vh_dispatcher.rs
index 46c5153819..1af9bfbb6a 100644
--- a/vm/src/vm_hooks/vh_dispatcher.rs
+++ b/chain/vm/src/vm_hooks/vh_dispatcher.rs
@@ -1883,7 +1883,7 @@ impl VMHooks for VMHooksDispatcher {
     ) -> i32 {
         panic!("Unavailable: managed_multi_transfer_esdt_nft_execute_by_user")
     }
-    
+
     fn managed_verify_secp256r1(
         &self,
         key_handle: i32,
diff --git a/vm/src/vm_hooks/vh_handler.rs b/chain/vm/src/vm_hooks/vh_handler.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler.rs
rename to chain/vm/src/vm_hooks/vh_handler.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/chain/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
similarity index 99%
rename from vm/src/vm_hooks/vh_handler/vh_blockchain.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
index 43940d4a57..5dcd5e7c0d 100644
--- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
+++ b/chain/vm/src/vm_hooks/vh_handler/vh_blockchain.rs
@@ -1,5 +1,5 @@
 use crate::{
-    tx_execution::vm_builtin_function_names::*,
+    chain_core::builtin_func_names::*,
     types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress},
     vm_hooks::VMHooksHandlerSource,
     world_mock::{EsdtData, EsdtInstance},
diff --git a/vm/src/vm_hooks/vh_handler/vh_call_value.rs b/chain/vm/src/vm_hooks/vh_handler/vh_call_value.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_call_value.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_call_value.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_crypto.rs b/chain/vm/src/vm_hooks/vh_handler/vh_crypto.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_crypto.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_crypto.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs b/chain/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_endpoint_arg.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_endpoint_finish.rs b/chain/vm/src/vm_hooks/vh_handler/vh_endpoint_finish.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_endpoint_finish.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_endpoint_finish.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_error.rs b/chain/vm/src/vm_hooks/vh_handler/vh_error.rs
similarity index 81%
rename from vm/src/vm_hooks/vh_handler/vh_error.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_error.rs
index ac1b4b4448..9b72740c94 100644
--- a/vm/src/vm_hooks/vh_handler/vh_error.rs
+++ b/chain/vm/src/vm_hooks/vh_handler/vh_error.rs
@@ -1,3 +1,5 @@
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{types::RawHandle, vm_hooks::VMHooksHandlerSource};
 
 use super::VMHooksManagedTypes;
@@ -8,7 +10,7 @@ pub trait VMHooksError: VMHooksHandlerSource {
         // run `clear & cargo test -- --nocapture` to see the output
         println!("{}", std::str::from_utf8(message).unwrap());
 
-        self.halt_with_error(4, std::str::from_utf8(message).unwrap())
+        self.halt_with_error(ReturnCode::UserError, std::str::from_utf8(message).unwrap())
     }
 }
 
diff --git a/vm/src/vm_hooks/vh_handler/vh_log.rs b/chain/vm/src/vm_hooks/vh_handler/vh_log.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_log.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_log.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types.rs b/chain/vm/src/vm_hooks/vh_handler/vh_managed_types.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_managed_types.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_managed_types.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs b/chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_float.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_int.rs b/chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_int.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_int.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_big_int.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_buffer.rs b/chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_buffer.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_buffer.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_buffer.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_map.rs b/chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_map.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_map.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_managed_types/vh_managed_map.rs
diff --git a/vm/src/vm_hooks/vh_handler/vh_send.rs b/chain/vm/src/vm_hooks/vh_handler/vh_send.rs
similarity index 99%
rename from vm/src/vm_hooks/vh_handler/vh_send.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_send.rs
index 4d0584586b..67d590f772 100644
--- a/vm/src/vm_hooks/vh_handler/vh_send.rs
+++ b/chain/vm/src/vm_hooks/vh_handler/vh_send.rs
@@ -1,5 +1,5 @@
 use crate::{
-    tx_execution::builtin_function_names::{
+    chain_core::builtin_func_names::{
         ESDT_MULTI_TRANSFER_FUNC_NAME, ESDT_NFT_TRANSFER_FUNC_NAME, ESDT_TRANSFER_FUNC_NAME,
         UPGRADE_CONTRACT_FUNC_NAME,
     },
diff --git a/vm/src/vm_hooks/vh_handler/vh_storage.rs b/chain/vm/src/vm_hooks/vh_handler/vh_storage.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_handler/vh_storage.rs
rename to chain/vm/src/vm_hooks/vh_handler/vh_storage.rs
diff --git a/vm/src/vm_hooks/vh_impl.rs b/chain/vm/src/vm_hooks/vh_impl.rs
similarity index 100%
rename from vm/src/vm_hooks/vh_impl.rs
rename to chain/vm/src/vm_hooks/vh_impl.rs
diff --git a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs b/chain/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
similarity index 93%
rename from vm/src/vm_hooks/vh_impl/vh_debug_api.rs
rename to chain/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
index 618788d966..20ba8d20b3 100644
--- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
+++ b/chain/vm/src/vm_hooks/vh_impl/vh_debug_api.rs
@@ -1,5 +1,6 @@
 use std::sync::{Arc, MutexGuard};
 
+use multiversx_chain_core::types::ReturnCode;
 use multiversx_chain_vm_executor::BreakpointValue;
 
 use crate::{
@@ -36,10 +37,10 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         self.0.m_types_lock()
     }
 
-    fn halt_with_error(&self, status: u64, message: &str) -> ! {
+    fn halt_with_error(&self, status: ReturnCode, message: &str) -> ! {
         *self.0.result_lock() = TxResult::from_panic_obj(&TxPanic::new(status, message));
         let breakpoint = match status {
-            4 => BreakpointValue::SignalError,
+            ReturnCode::UserError => BreakpointValue::SignalError,
             _ => BreakpointValue::ExecutionFailed,
         };
         std::panic::panic_any(breakpoint);
@@ -127,7 +128,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
             execute_current_tx_context_input,
         );
 
-        if tx_result.result_status == 0 {
+        if tx_result.result_status.is_success() {
             self.sync_call_post_processing(tx_result, blockchain_updates)
         } else {
             // also kill current execution
@@ -168,11 +169,11 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         );
 
         match tx_result.result_status {
-            0 => (
+            ReturnCode::Success => (
                 new_address,
                 self.sync_call_post_processing(tx_result, blockchain_updates),
             ),
-            10 => self.vm_error(&tx_result.result_message), // TODO: not sure it's the right condition, it catches insufficient funds
+            ReturnCode::ExecutionFailed => self.vm_error(&tx_result.result_message), // TODO: not sure it's the right condition, it catches insufficient funds
             _ => self.vm_error(vm_err_msg::ERROR_SIGNALLED_BY_SMARTCONTRACT),
         }
     }
@@ -198,12 +199,12 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler {
         );
 
         match tx_result.result_status {
-            0 => {
+            ReturnCode::Success => {
                 self.0.result_lock().all_calls.push(async_call_data);
 
                 let _ = self.sync_call_post_processing(tx_result, blockchain_updates);
             },
-            10 => self.vm_error(&tx_result.result_message), // TODO: not sure it's the right condition, it catches insufficient funds
+            ReturnCode::ExecutionFailed => self.vm_error(&tx_result.result_message), // TODO: not sure it's the right condition, it catches insufficient funds
             _ => self.vm_error(vm_err_msg::ERROR_SIGNALLED_BY_SMARTCONTRACT),
         }
     }
diff --git a/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs b/chain/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
similarity index 97%
rename from vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
rename to chain/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
index 27fa484a4a..d29eb20ef4 100644
--- a/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
+++ b/chain/vm/src/vm_hooks/vh_impl/vh_single_tx_api.rs
@@ -3,6 +3,8 @@ use std::{
     sync::{Arc, Mutex, MutexGuard},
 };
 
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{
     tx_mock::{BackTransfers, TxFunctionName, TxInput, TxManagedTypes, TxResult},
     types::{VMAddress, VMCodeMetadata},
@@ -57,7 +59,7 @@ impl VMHooksHandlerSource for SingleTxApiVMHooksHandler {
         self.0.managed_types.lock().unwrap()
     }
 
-    fn halt_with_error(&self, status: u64, message: &str) -> ! {
+    fn halt_with_error(&self, status: ReturnCode, message: &str) -> ! {
         panic!("VM error occured, status: {status}, message: {message}")
     }
 
diff --git a/vm/src/vm_hooks/vh_impl/vh_static_api.rs b/chain/vm/src/vm_hooks/vh_impl/vh_static_api.rs
similarity index 97%
rename from vm/src/vm_hooks/vh_impl/vh_static_api.rs
rename to chain/vm/src/vm_hooks/vh_impl/vh_static_api.rs
index aba07908e0..9f9a445b37 100644
--- a/vm/src/vm_hooks/vh_impl/vh_static_api.rs
+++ b/chain/vm/src/vm_hooks/vh_impl/vh_static_api.rs
@@ -1,5 +1,7 @@
 use std::sync::{Mutex, MutexGuard};
 
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{
     tx_mock::{BackTransfers, TxFunctionName, TxInput, TxLog, TxManagedTypes, TxResult},
     types::{VMAddress, VMCodeMetadata},
@@ -28,7 +30,7 @@ impl VMHooksHandlerSource for StaticApiVMHooksHandler {
         self.0.lock().unwrap()
     }
 
-    fn halt_with_error(&self, status: u64, message: &str) -> ! {
+    fn halt_with_error(&self, status: ReturnCode, message: &str) -> ! {
         panic!("VM error occured, status: {status}, message: {message}")
     }
 
diff --git a/vm/src/vm_hooks/vh_source.rs b/chain/vm/src/vm_hooks/vh_source.rs
similarity index 93%
rename from vm/src/vm_hooks/vh_source.rs
rename to chain/vm/src/vm_hooks/vh_source.rs
index 0ad2e59e2a..7370c09e87 100644
--- a/vm/src/vm_hooks/vh_source.rs
+++ b/chain/vm/src/vm_hooks/vh_source.rs
@@ -1,5 +1,7 @@
 use std::{fmt::Debug, sync::MutexGuard};
 
+use multiversx_chain_core::types::ReturnCode;
+
 use crate::{
     tx_mock::{BackTransfers, TxFunctionName, TxInput, TxLog, TxManagedTypes, TxResult},
     types::{VMAddress, VMCodeMetadata, H256},
@@ -10,10 +12,10 @@ use crate::{
 pub trait VMHooksHandlerSource: Debug {
     fn m_types_lock(&self) -> MutexGuard<TxManagedTypes>;
 
-    fn halt_with_error(&self, status: u64, message: &str) -> !;
+    fn halt_with_error(&self, status: ReturnCode, message: &str) -> !;
 
     fn vm_error(&self, message: &str) -> ! {
-        self.halt_with_error(10, message)
+        self.halt_with_error(ReturnCode::ExecutionFailed, message)
     }
 
     fn input_ref(&self) -> &TxInput;
diff --git a/vm/src/with_shared.rs b/chain/vm/src/with_shared.rs
similarity index 100%
rename from vm/src/with_shared.rs
rename to chain/vm/src/with_shared.rs
diff --git a/vm/src/with_shared/shareable.rs b/chain/vm/src/with_shared/shareable.rs
similarity index 100%
rename from vm/src/with_shared/shareable.rs
rename to chain/vm/src/with_shared/shareable.rs
diff --git a/vm/src/with_shared/with_shared_mut_ref.rs b/chain/vm/src/with_shared/with_shared_mut_ref.rs
similarity index 100%
rename from vm/src/with_shared/with_shared_mut_ref.rs
rename to chain/vm/src/with_shared/with_shared_mut_ref.rs
diff --git a/vm/src/world_mock.rs b/chain/vm/src/world_mock.rs
similarity index 100%
rename from vm/src/world_mock.rs
rename to chain/vm/src/world_mock.rs
diff --git a/vm/src/world_mock/account_data.rs b/chain/vm/src/world_mock/account_data.rs
similarity index 100%
rename from vm/src/world_mock/account_data.rs
rename to chain/vm/src/world_mock/account_data.rs
diff --git a/vm/src/world_mock/block_info.rs b/chain/vm/src/world_mock/block_info.rs
similarity index 100%
rename from vm/src/world_mock/block_info.rs
rename to chain/vm/src/world_mock/block_info.rs
diff --git a/vm/src/world_mock/blockchain_mock.rs b/chain/vm/src/world_mock/blockchain_mock.rs
similarity index 100%
rename from vm/src/world_mock/blockchain_mock.rs
rename to chain/vm/src/world_mock/blockchain_mock.rs
diff --git a/vm/src/world_mock/blockchain_mock_account_util.rs b/chain/vm/src/world_mock/blockchain_mock_account_util.rs
similarity index 100%
rename from vm/src/world_mock/blockchain_mock_account_util.rs
rename to chain/vm/src/world_mock/blockchain_mock_account_util.rs
diff --git a/vm/src/world_mock/blockchain_state.rs b/chain/vm/src/world_mock/blockchain_state.rs
similarity index 100%
rename from vm/src/world_mock/blockchain_state.rs
rename to chain/vm/src/world_mock/blockchain_state.rs
diff --git a/vm/src/world_mock/esdt_data.rs b/chain/vm/src/world_mock/esdt_data.rs
similarity index 100%
rename from vm/src/world_mock/esdt_data.rs
rename to chain/vm/src/world_mock/esdt_data.rs
diff --git a/vm/src/world_mock/esdt_instance.rs b/chain/vm/src/world_mock/esdt_instance.rs
similarity index 100%
rename from vm/src/world_mock/esdt_instance.rs
rename to chain/vm/src/world_mock/esdt_instance.rs
diff --git a/vm/src/world_mock/esdt_instance_metadata.rs b/chain/vm/src/world_mock/esdt_instance_metadata.rs
similarity index 100%
rename from vm/src/world_mock/esdt_instance_metadata.rs
rename to chain/vm/src/world_mock/esdt_instance_metadata.rs
diff --git a/vm/src/world_mock/esdt_instances.rs b/chain/vm/src/world_mock/esdt_instances.rs
similarity index 100%
rename from vm/src/world_mock/esdt_instances.rs
rename to chain/vm/src/world_mock/esdt_instances.rs
diff --git a/vm/src/world_mock/esdt_roles.rs b/chain/vm/src/world_mock/esdt_roles.rs
similarity index 100%
rename from vm/src/world_mock/esdt_roles.rs
rename to chain/vm/src/world_mock/esdt_roles.rs
diff --git a/vm/src/world_mock/failing_executor.rs b/chain/vm/src/world_mock/failing_executor.rs
similarity index 100%
rename from vm/src/world_mock/failing_executor.rs
rename to chain/vm/src/world_mock/failing_executor.rs
diff --git a/vm/src/world_mock/reserved.rs b/chain/vm/src/world_mock/reserved.rs
similarity index 100%
rename from vm/src/world_mock/reserved.rs
rename to chain/vm/src/world_mock/reserved.rs
diff --git a/vm/tests/test_crypto.rs b/chain/vm/tests/test_crypto.rs
similarity index 100%
rename from vm/tests/test_crypto.rs
rename to chain/vm/tests/test_crypto.rs
diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml
index f1e1b7b64e..3839cb0cce 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml
index a6a8d9e7aa..a49565f5dc 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 4a74775c67..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
@@ -2,6 +2,7 @@ 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/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock
index 289ec8cd46..cc64c94b71 100755
--- a/contracts/benchmarks/large-storage/wasm/Cargo.lock
+++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml
index c481293914..232c4e755a 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.54.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 e3fcca37fc..9d4937e5bd 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 1f18cd76d5..01ec3a47a0 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 ab3f7debd9..08d13ad501 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 aa2edf237f..65f2b9c8af 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,6 +8,7 @@ const OWNER_ADDRESS: TestAddress = TestAddress::new("owner");
 
 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, 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 442754a06b..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
@@ -2,6 +2,7 @@ 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/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
index c5198ccc73..a0400bf725 100644
--- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -61,12 +61,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -75,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml
index 7e1c03fd7c..66fedeaf66 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.54.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 530bd65318..e76ee51f18 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 b723dc821a..ffb99d9ea0 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 ce7eabb8eb..8ae30eaf45 100644
--- a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ 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/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
index af149a9b16..3367ef1e2b 100644
--- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -61,12 +61,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -75,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml
index f6bd495169..4d2f7008da 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.54.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 674e0d5032..935fae99e0 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 61b83fa4ea..2ec3ba763a 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 9f4596ae21..4e7ac9ba66 100644
--- a/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ 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/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
index 149c26607d..3d64b5317b 100644
--- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -45,12 +45,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -59,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml
index 4a40181bb3..807fcae425 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.54.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 9b1c9851aa..0cacb9c436 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 a5f334cbcc..3823304a70 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 ec2352ec65..ba9fda4f46 100644
--- a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ 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/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
index 17ba237632..e621aaf1a0 100644
--- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -45,12 +45,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -59,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -164,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml
index 80b6514c8e..cf5d232be7 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.54.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 42c91c2682..24dde257ef 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 883187759a..73c19632a3 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 d235f08b2e..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
@@ -2,6 +2,7 @@ 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/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
index 28d2099883..514a14413e 100644
--- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -45,12 +45,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -59,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -164,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml
index d2bf4ef9d7..0c5708859f 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.54.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 636d2f04b9..7f9427e635 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 33c72948de..5ac8d750e6 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 d47d38ec79..49407163df 100644
--- a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ 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/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
index 5266d763ec..1d1ae4dbbf 100644
--- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "benchmark-common"
@@ -45,12 +45,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -59,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -78,7 +87,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -89,7 +98,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -148,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -159,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml
index f1fdaee1f8..92d7578542 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.54.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 fc5b8026b9..f07988b264 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 482926723c..e0ec605e1d 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 cccbea31c1..96aec299cd 100644
--- a/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/benchmarks/send-tx-repeat");
     blockchain.register_contract(
         "mxsc:output/send-tx-repeat.mxsc.json",
         send_tx_repeat::ContractBuilder,
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
index b001662f23..635335e8fd 100755
--- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml
index 5fd9d6efee..d1ebce52f9 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml
index be9ea096bb..da419475b2 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.54.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml
index 99e41cff30..f954b6930e 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
index 4fcef41480..92ec5d245a 100644
--- a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
+++ b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs
@@ -2,6 +2,7 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/benchmarks/str-repeat");
     blockchain.register_contract(
         "mxsc:output/str-repeat.mxsc.json",
         str_repeat::ContractBuilder,
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..ed7ae42723 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..7d0711a217 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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..40d776c7af 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..5dcf036922 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
index fa214167b3..a1257120a6 100755
--- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock
+++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml
index 7a887af1de..0fe0913be3 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml
index 2d9856ad84..c110868ad9 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.54.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.1"
+version = "0.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
 [dependencies]
diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml
index df8b0fd27d..f83ec4c141 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.54.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/price-aggregator/src/events.rs b/contracts/core/price-aggregator/src/events.rs
index d485e622db..ee80b25594 100644
--- a/contracts/core/price-aggregator/src/events.rs
+++ b/contracts/core/price-aggregator/src/events.rs
@@ -2,15 +2,28 @@ multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
 use crate::price_aggregator_data::{TimestampedPrice, TokenPair};
+pub type RoundId = u32;
+pub type Round = usize;
+pub type Block = u64;
+pub type Epoch = u64;
+pub type Timestamp = u64;
 
 #[type_abi]
 #[derive(TopEncode)]
 pub struct NewRoundEvent<M: ManagedTypeApi> {
     price: BigUint<M>,
-    timestamp: u64,
+    timestamp: Timestamp,
     decimals: u8,
-    block: u64,
-    epoch: u64,
+    block: Block,
+    epoch: Epoch,
+}
+
+#[type_abi]
+#[derive(TopEncode)]
+pub struct DiscardSubmissionEvent {
+    submission_timestamp: Timestamp,
+    first_submission_timestamp: Timestamp,
+    has_caller_already_submitted: bool,
 }
 
 #[multiversx_sc::module]
@@ -18,13 +31,14 @@ pub trait EventsModule {
     fn emit_new_round_event(
         &self,
         token_pair: &TokenPair<Self::Api>,
+        round: Round,
         price_feed: &TimestampedPrice<Self::Api>,
     ) {
         let epoch = self.blockchain().get_block_epoch();
         self.new_round_event(
             &token_pair.from.clone(),
             &token_pair.to.clone(),
-            epoch,
+            round,
             &NewRoundEvent {
                 price: price_feed.price.clone(),
                 timestamp: price_feed.timestamp,
@@ -40,7 +54,53 @@ pub trait EventsModule {
         &self,
         #[indexed] from: &ManagedBuffer,
         #[indexed] to: &ManagedBuffer,
-        #[indexed] epoch: u64,
+        #[indexed] round: Round,
         new_round_event: &NewRoundEvent<Self::Api>,
     );
+
+    fn emit_discard_submission_event(
+        &self,
+        token_pair: &TokenPair<Self::Api>,
+        round: Round,
+        submission_timestamp: Timestamp,
+        first_submission_timestamp: Timestamp,
+        has_caller_already_submitted: bool,
+    ) {
+        self.discard_submission_event(
+            &token_pair.from.clone(),
+            &token_pair.to.clone(),
+            round,
+            &DiscardSubmissionEvent {
+                submission_timestamp,
+                first_submission_timestamp,
+                has_caller_already_submitted,
+            },
+        )
+    }
+
+    #[event("discard_submission")]
+    fn discard_submission_event(
+        &self,
+        #[indexed] from: &ManagedBuffer,
+        #[indexed] to: &ManagedBuffer,
+        #[indexed] round: Round,
+        discard_submission_event: &DiscardSubmissionEvent,
+    );
+
+    #[event("discard_round")]
+    fn discard_round_event(
+        &self,
+        #[indexed] from: &ManagedBuffer,
+        #[indexed] to: &ManagedBuffer,
+        #[indexed] round: Round,
+    );
+
+    #[event("add_submission")]
+    fn add_submission_event(
+        &self,
+        #[indexed] from: &ManagedBuffer,
+        #[indexed] to: &ManagedBuffer,
+        #[indexed] round: Round,
+        price: &BigUint,
+    );
 }
diff --git a/contracts/core/price-aggregator/src/lib.rs b/contracts/core/price-aggregator/src/lib.rs
index 1dbed54848..39f6eb5484 100644
--- a/contracts/core/price-aggregator/src/lib.rs
+++ b/contracts/core/price-aggregator/src/lib.rs
@@ -6,6 +6,7 @@ mod events;
 pub mod median;
 pub mod price_aggregator_data;
 
+use events::{Round, Timestamp};
 use multiversx_sc_modules::staking;
 use price_aggregator_data::{OracleStatus, PriceFeed, TimestampedPrice, TokenPair};
 
@@ -47,6 +48,11 @@ pub trait PriceAggregator:
         self.set_paused(true);
     }
 
+    #[upgrade]
+    fn upgrade(&self) {
+        self.set_paused(true);
+    }
+
     #[only_owner]
     #[endpoint(changeAmounts)]
     fn change_amounts(&self, staking_amount: BigUint, slash_amount: BigUint) {
@@ -118,29 +124,24 @@ pub trait PriceAggregator:
         &self,
         from: ManagedBuffer,
         to: ManagedBuffer,
-        submission_timestamp: u64,
+        submission_timestamp: Timestamp,
         price: BigUint,
         decimals: u8,
     ) {
         self.require_not_paused();
         self.require_is_oracle();
 
-        let current_timestamp = self.blockchain().get_block_timestamp();
-        require!(
-            submission_timestamp <= current_timestamp,
-            "Timestamp is from the future"
-        );
+        self.require_valid_submission_timestamp(submission_timestamp);
 
         self.check_decimals(&from, &to, decimals);
 
-        self.submit_unchecked(from, to, submission_timestamp, price, decimals);
+        self.submit_unchecked(from, to, price, decimals);
     }
 
     fn submit_unchecked(
         &self,
         from: ManagedBuffer,
         to: ManagedBuffer,
-        submission_timestamp: u64,
         price: BigUint,
         decimals: u8,
     ) {
@@ -154,11 +155,15 @@ pub trait PriceAggregator:
         let first_sub_time_mapper = self.first_submission_timestamp(&token_pair);
         let last_sub_time_mapper = self.last_submission_timestamp(&token_pair);
 
+        let mut round_id = 0;
+        let wrapped_rounds = self.rounds().get(&token_pair);
+        if wrapped_rounds.is_some() {
+            round_id = wrapped_rounds.unwrap().len() + 1;
+        }
+
         let current_timestamp = self.blockchain().get_block_timestamp();
         let mut is_first_submission = false;
         let mut first_submission_timestamp = if submissions.is_empty() {
-            self.require_valid_first_submission(submission_timestamp, current_timestamp);
-
             first_sub_time_mapper.set(current_timestamp);
             is_first_submission = true;
 
@@ -169,24 +174,38 @@ pub trait PriceAggregator:
 
         // round was not completed in time, so it's discarded
         if current_timestamp > first_submission_timestamp + MAX_ROUND_DURATION_SECONDS {
-            self.require_valid_first_submission(submission_timestamp, current_timestamp);
-
             submissions.clear();
             first_sub_time_mapper.set(current_timestamp);
             last_sub_time_mapper.set(current_timestamp);
 
             first_submission_timestamp = current_timestamp;
             is_first_submission = true;
+            self.discard_round_event(&token_pair.from.clone(), &token_pair.to.clone(), round_id)
         }
 
         let caller = self.blockchain().get_caller();
-        let accepted = !submissions.contains_key(&caller)
-            && (is_first_submission || submission_timestamp >= first_submission_timestamp);
+        let has_caller_already_submitted = submissions.contains_key(&caller);
+        let accepted = !has_caller_already_submitted
+            && (is_first_submission || current_timestamp >= first_submission_timestamp);
         if accepted {
-            submissions.insert(caller, price);
+            submissions.insert(caller.clone(), price.clone());
             last_sub_time_mapper.set(current_timestamp);
 
-            self.create_new_round(token_pair, submissions, decimals);
+            self.create_new_round(token_pair.clone(), round_id, submissions, decimals);
+            self.add_submission_event(
+                &token_pair.from.clone(),
+                &token_pair.to.clone(),
+                round_id,
+                &price,
+            );
+        } else {
+            self.emit_discard_submission_event(
+                &token_pair,
+                round_id,
+                current_timestamp,
+                first_submission_timestamp,
+                has_caller_already_submitted,
+            );
         }
 
         self.oracle_status()
@@ -197,7 +216,12 @@ pub trait PriceAggregator:
             });
     }
 
-    fn require_valid_first_submission(&self, submission_timestamp: u64, current_timestamp: u64) {
+    fn require_valid_submission_timestamp(&self, submission_timestamp: u64) {
+        let current_timestamp = self.blockchain().get_block_timestamp();
+        require!(
+            submission_timestamp <= current_timestamp,
+            "Timestamp is from the future"
+        );
         require!(
             current_timestamp - submission_timestamp <= FIRST_SUBMISSION_TIMESTAMP_MAX_DIFF_SECONDS,
             "First submission too old"
@@ -207,24 +231,22 @@ pub trait PriceAggregator:
     #[endpoint(submitBatch)]
     fn submit_batch(
         &self,
-        submissions: MultiValueEncoded<MultiValue5<ManagedBuffer, ManagedBuffer, u64, BigUint, u8>>,
+        submissions: MultiValueEncoded<
+            MultiValue5<ManagedBuffer, ManagedBuffer, Timestamp, BigUint, u8>,
+        >,
     ) {
         self.require_not_paused();
         self.require_is_oracle();
 
-        let current_timestamp = self.blockchain().get_block_timestamp();
         for (from, to, submission_timestamp, price, decimals) in submissions
             .into_iter()
             .map(|submission| submission.into_tuple())
         {
-            require!(
-                submission_timestamp <= current_timestamp,
-                "Timestamp is from the future"
-            );
+            self.require_valid_submission_timestamp(submission_timestamp);
 
             self.check_decimals(&from, &to, decimals);
 
-            self.submit_unchecked(from, to, submission_timestamp, price, decimals);
+            self.submit_unchecked(from, to, price, decimals);
         }
     }
 
@@ -248,6 +270,7 @@ pub trait PriceAggregator:
     fn create_new_round(
         &self,
         token_pair: TokenPair<Self::Api>,
+        round: Round,
         mut submissions: MapMapper<ManagedAddress, BigUint>,
         decimals: u8,
     ) {
@@ -281,7 +304,7 @@ pub trait PriceAggregator:
                 .or_default()
                 .get()
                 .push(&price_feed);
-            self.emit_new_round_event(&token_pair, &price_feed);
+            self.emit_new_round_event(&token_pair, round, &price_feed);
         }
     }
 
@@ -358,6 +381,7 @@ pub trait PriceAggregator:
     }
 
     #[view(getOracles)]
+    #[title("oracles")]
     fn get_oracles(&self) -> MultiValueEncoded<ManagedAddress> {
         let mut result = MultiValueEncoded::new();
         for key in self.oracle_status().keys() {
@@ -377,9 +401,11 @@ pub trait PriceAggregator:
     #[only_owner]
     #[endpoint(setPairDecimals)]
     fn set_pair_decimals(&self, from: ManagedBuffer, to: ManagedBuffer, decimals: u8) {
-        self.require_paused();
-
-        self.pair_decimals(&from, &to).set(Some(decimals));
+        let pair_decimals_mapper = self.pair_decimals(&from, &to);
+        if !pair_decimals_mapper.is_empty() {
+            self.require_paused();
+        }
+        pair_decimals_mapper.set(Some(decimals));
         let pair = TokenPair { from, to };
         self.clear_submissions(&pair);
     }
@@ -422,13 +448,13 @@ pub trait PriceAggregator:
     fn first_submission_timestamp(
         &self,
         token_pair: &TokenPair<Self::Api>,
-    ) -> SingleValueMapper<u64>;
+    ) -> SingleValueMapper<Timestamp>;
 
     #[storage_mapper("last_submission_timestamp")]
     fn last_submission_timestamp(
         &self,
         token_pair: &TokenPair<Self::Api>,
-    ) -> SingleValueMapper<u64>;
+    ) -> SingleValueMapper<Timestamp>;
 
     #[storage_mapper("submissions")]
     fn submissions(
diff --git a/contracts/core/price-aggregator/src/median.rs b/contracts/core/price-aggregator/src/median.rs
index 714acf9632..53227bc9d7 100644
--- a/contracts/core/price-aggregator/src/median.rs
+++ b/contracts/core/price-aggregator/src/median.rs
@@ -1,5 +1,4 @@
 multiversx_sc::imports!();
-multiversx_sc::derive_imports!();
 
 /// Returns the sorted middle, or the average of the two middle indexed items if the
 /// vector has an even number of elements.
diff --git a/contracts/core/price-aggregator/src/price_aggregator_data.rs b/contracts/core/price-aggregator/src/price_aggregator_data.rs
index c348b67d22..e5fd64d4eb 100644
--- a/contracts/core/price-aggregator/src/price_aggregator_data.rs
+++ b/contracts/core/price-aggregator/src/price_aggregator_data.rs
@@ -1,3 +1,5 @@
+use crate::events::{RoundId, Timestamp};
+
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();
 
@@ -11,10 +13,10 @@ pub struct TokenPair<M: ManagedTypeApi> {
 #[type_abi]
 #[derive(NestedEncode, NestedDecode, TopEncode, TopDecode)]
 pub struct PriceFeed<M: ManagedTypeApi> {
-    pub round_id: u32,
+    pub round_id: RoundId,
     pub from: ManagedBuffer<M>,
     pub to: ManagedBuffer<M>,
-    pub timestamp: u64,
+    pub timestamp: Timestamp,
     pub price: BigUint<M>,
     pub decimals: u8,
 }
@@ -23,7 +25,7 @@ pub struct PriceFeed<M: ManagedTypeApi> {
 #[derive(TopEncode, TopDecode, Debug, PartialEq, Eq)]
 pub struct TimestampedPrice<M: ManagedTypeApi> {
     pub price: BigUint<M>,
-    pub timestamp: u64,
+    pub timestamp: Timestamp,
     pub decimals: u8,
 }
 
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..c9af71568a 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::*;
@@ -24,6 +24,7 @@ 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,
@@ -35,7 +36,6 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl PriceAggregatorTestState {
@@ -57,16 +57,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 +194,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 +229,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 +247,8 @@ fn test_price_aggregator_submit() {
                     accepted_submissions: 1
                 }
             );
-        });
+        },
+    );
 }
 
 #[test]
@@ -283,9 +277,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 +306,8 @@ fn test_price_aggregator_submit_round_ok() {
                     decimals
                 }
             );
-        });
+        },
+    );
 }
 
 #[test]
@@ -338,9 +333,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 +348,8 @@ fn test_price_aggregator_discarded_round() {
                     .unwrap(),
                 managed_biguint!(11_000)
             );
-        });
+        },
+    );
 }
 
 #[test]
diff --git a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
index e96244d668..7a7e2aaa74 100644
--- a/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
+++ b/contracts/core/price-aggregator/tests/price_aggregator_proxy.rs
@@ -72,6 +72,25 @@ where
     }
 }
 
+#[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 upgrade(
+        self,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .original_result()
+    }
+}
+
 #[rustfmt::skip]
 impl<Env, From, To, Gas> PriceAggregatorProxyMethods<Env, From, To, Gas>
 where
@@ -387,3 +406,11 @@ where
     pub block: u64,
     pub epoch: u64,
 }
+
+#[type_abi]
+#[derive(TopEncode)]
+pub struct DiscardSubmissionEvent {
+    pub submission_timestamp: u64,
+    pub first_submission_timestamp: u64,
+    pub has_caller_already_submitted: bool,
+}
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..e46ab22e58 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::*;
@@ -23,6 +23,7 @@ mod price_aggregator_proxy;
 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,
@@ -34,7 +35,6 @@ fn world() -> ScenarioWorld {
 struct PriceAggregatorTestState {
     world: ScenarioWorld,
     oracles: Vec<AddressValue>,
-    price_aggregator_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl PriceAggregatorTestState {
@@ -60,16 +60,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 +161,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 +198,8 @@ fn test_price_aggregator_submit() {
                     }
                 );
             }
-        });
+        },
+    );
 
     // submit last that resets the round
     state.submit(
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..f44d9f76fc 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,13 +17,15 @@ 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();
 
+    blockchain.set_current_dir_from_workspace("contracts/core/price-aggregator");
     blockchain.register_contract(
         PRICE_AGGREGATOR_PATH_EXPR,
         multiversx_price_aggregator_sc::ContractBuilder,
@@ -35,31 +37,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 +65,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 +90,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 +105,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 +156,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 +213,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 +231,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 +246,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 +320,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 +338,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 +439,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 +480,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/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock
index 83b9347247..ceeb62370c 100644
--- a/contracts/core/price-aggregator/wasm/Cargo.lock
+++ b/contracts/core/price-aggregator/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -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"
@@ -65,18 +71,18 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "log"
@@ -84,9 +90,17 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-price-aggregator-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "arrayvec",
  "getrandom",
@@ -105,10 +119,11 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -117,7 +132,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -126,7 +141,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -136,7 +151,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -147,14 +162,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -179,15 +194,18 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -200,9 +218,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",
 ]
@@ -255,9 +273,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -266,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
@@ -284,19 +302,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -309,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -319,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -332,6 +351,27 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[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/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml
index bd3972ce4b..73fa57078e 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/core/price-aggregator/wasm/src/lib.rs b/contracts/core/price-aggregator/wasm/src/lib.rs
index 667c425afd..a8e75f4942 100644
--- a/contracts/core/price-aggregator/wasm/src/lib.rs
+++ b/contracts/core/price-aggregator/wasm/src/lib.rs
@@ -5,9 +5,10 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
+// Upgrade:                              1
 // Endpoints:                           21
 // Async Callback (empty):               1
-// Total number of exported functions:  23
+// Total number of exported functions:  24
 
 #![no_std]
 
@@ -18,6 +19,7 @@ multiversx_sc_wasm_adapter::endpoints! {
     multiversx_price_aggregator_sc
     (
         init => init
+        upgrade => upgrade
         changeAmounts => change_amounts
         addOracles => add_oracles
         removeOracles => remove_oracles
diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml
index da24ab3218..3e7aafeb5d 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.54.1"
 
 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml
index 5412bdceca..b062cfd9df 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.54.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/core/wegld-swap/src/wegld.rs b/contracts/core/wegld-swap/src/wegld.rs
index 4a38cab09e..23a4493494 100644
--- a/contracts/core/wegld-swap/src/wegld.rs
+++ b/contracts/core/wegld-swap/src/wegld.rs
@@ -55,12 +55,14 @@ pub trait EgldEsdtSwap: multiversx_sc_modules::pause::PauseModule {
     }
 
     #[view(getLockedEgldBalance)]
+    #[title("lockedEgldBalance")]
     fn get_locked_egld_balance(&self) -> BigUint {
         self.blockchain()
             .get_sc_balance(&EgldOrEsdtTokenIdentifier::egld(), 0)
     }
 
     #[view(getWrappedEgldTokenId)]
+    #[title("wrappedEgldTokenId")]
     #[storage_mapper("wrappedEgldTokenId")]
     fn wrapped_egld_token_id(&self) -> SingleValueMapper<TokenIdentifier>;
 }
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 a93bedb10f..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
@@ -2,6 +2,7 @@ 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/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml
index 36108d6fbe..0895bbae9e 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml
index 0f3fdd5743..fbe8a8ff88 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
-path = "../../../framework/scenario"
+version = "0.54.1"
+path = "../../../framework/scenario"
\ No newline at end of file
diff --git a/contracts/examples/adder/interact/adder-owner.pem b/contracts/examples/adder/interact/adder-owner.pem
deleted file mode 100644
index 66f04c2160..0000000000
--- a/contracts/examples/adder/interact/adder-owner.pem
+++ /dev/null
@@ -1,5 +0,0 @@
------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/config.toml b/contracts/examples/adder/interact/config.toml
deleted file mode 100644
index 61ac8dbf87..0000000000
--- a/contracts/examples/adder/interact/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 262eb13631..0000000000
--- a/contracts/examples/adder/interact/src/basic_interact.rs
+++ /dev/null
@@ -1,245 +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";
-
-const ADDER_CODE_PATH: MxscPath = MxscPath::new("../output/adder.mxsc.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)) => {
-            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;
-        },
-        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;
-        },
-        Some(basic_interact_cli::InteractCliCommand::Upgrade(args)) => {
-            basic_interact.upgrade(args.value).await
-        },
-        None => {},
-    }
-}
-
-#[allow(unused)]
-struct AdderInteract {
-    interactor: Interactor,
-    adder_owner_address: Bech32Address,
-    wallet_address: Bech32Address,
-    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 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(),
-        }
-    }
-
-    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;
-    }
-
-    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
-            .interactor
-            .tx()
-            .from(&self.adder_owner_address)
-            .gas(3_000_000)
-            .typed(adder_proxy::AdderProxy)
-            .init(0u32)
-            .code(ADDER_CODE_PATH)
-            .code_metadata(CodeMetadata::UPGRADEABLE)
-            .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: usize) {
-        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(ADDER_CODE_PATH)
-                    .gas(3_000_000)
-                    .returns(ReturnsNewBech32Address)
-            });
-        }
-
-        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}");
-
-            self.state.set_adder_address(new_address);
-        }
-    }
-
-    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()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .egld(NumExpr("0,050000000000000000"))
-            .prepare_async()
-            .run()
-            .await;
-    }
-
-    async fn add(&mut self, value: u32) {
-        self.interactor
-            .tx()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .gas(3_000_000)
-            .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(ReturnsResultUnmanaged)
-            .prepare_async()
-            .run()
-            .await;
-
-        println!("sum: {sum}");
-    }
-
-    async fn upgrade(&mut self, new_value: u32) {
-        let response = self
-            .interactor
-            .tx()
-            .from(&self.wallet_address)
-            .to(self.state.current_adder_address())
-            .gas(3_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)
-            .prepare_async()
-            .run()
-            .await;
-        assert_eq!(sum, RustBigUint::from(new_value));
-
-        println!("response: {response:?}");
-    }
-}
-
-#[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.upgrade(7u32).await;
-}
diff --git a/contracts/examples/adder/interact/src/basic_interact_config.rs b/contracts/examples/adder/interact/src/basic_interact_config.rs
deleted file mode 100644
index e17d0cbe65..0000000000
--- a/contracts/examples/adder/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/examples/adder/interactor/.gitignore b/contracts/examples/adder/interactor/.gitignore
new file mode 100644
index 0000000000..88af50ac47
--- /dev/null
+++ b/contracts/examples/adder/interactor/.gitignore
@@ -0,0 +1,5 @@
+# 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
diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interactor/Cargo.toml
similarity index 54%
rename from contracts/examples/adder/interact/Cargo.toml
rename to contracts/examples/adder/interactor/Cargo.toml
index e862b03ba6..30db735223 100644
--- a/contracts/examples/adder/interact/Cargo.toml
+++ b/contracts/examples/adder/interactor/Cargo.toml
@@ -1,22 +1,29 @@
 [package]
-name = "basic-interact"
+name = "basic-interactor"
 version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+authors = ["MultiversX <contact@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [[bin]]
-name = "basic-interact"
-path = "src/basic_interact.rs"
+name = "basic-interactor"
+path = "src/basic_interactor_main.rs"
 
-[dependencies]
-clap = { version = "4.4.7", features = ["derive"] }
-serde = { version = "1.0", features = ["derive"] }
-toml = "0.8.6"
+[lib]
+path = "src/basic_interactor.rs"
 
 [dependencies.adder]
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/snippets"
+
+[dependencies]
+clap = { version = "4.4.7", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.8.6"
+tokio = { version = "1.24" }
+
+[features]
+chain-simulator-tests = []
diff --git a/contracts/examples/adder/interactor/config.toml b/contracts/examples/adder/interactor/config.toml
new file mode 100644
index 0000000000..97acd5a5c6
--- /dev/null
+++ b/contracts/examples/adder/interactor/config.toml
@@ -0,0 +1,7 @@
+
+# chain_type = 'simulator'
+# gateway_uri = 'http://localhost:8085'
+
+chain_type = 'real'
+gateway_uri = 'https://devnet-gateway.multiversx.com'
+
diff --git a/contracts/examples/adder/interactor/src/basic_interactor.rs b/contracts/examples/adder/interactor/src/basic_interactor.rs
new file mode 100644
index 0000000000..63d71de11a
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interactor.rs
@@ -0,0 +1,137 @@
+mod basic_interactor_cli;
+mod basic_interactor_config;
+mod basic_interactor_state;
+
+use adder::adder_proxy;
+pub use basic_interactor_config::Config;
+use basic_interactor_state::State;
+use clap::Parser;
+
+use multiversx_sc_snippets::imports::*;
+
+const ADDER_CODE_PATH: MxscPath = MxscPath::new("../output/adder.mxsc.json");
+
+pub async fn adder_cli() {
+    env_logger::init();
+
+    let config = Config::load_config();
+
+    let mut basic_interact = AdderInteract::new(config).await;
+
+    let cli = basic_interactor_cli::InteractCli::parse();
+    match &cli.command {
+        Some(basic_interactor_cli::InteractCliCommand::Deploy) => {
+            basic_interact.deploy().await;
+        },
+        Some(basic_interactor_cli::InteractCliCommand::Upgrade(args)) => {
+            let owner_address = basic_interact.adder_owner_address.clone();
+            basic_interact
+                .upgrade(args.value, &owner_address, None)
+                .await
+        },
+        Some(basic_interactor_cli::InteractCliCommand::Add(args)) => {
+            basic_interact.add(args.value).await;
+        },
+        Some(basic_interactor_cli::InteractCliCommand::Sum) => {
+            let sum = basic_interact.get_sum().await;
+            println!("sum: {sum}");
+        },
+        None => {},
+    }
+}
+
+pub struct AdderInteract {
+    pub interactor: Interactor,
+    pub adder_owner_address: Bech32Address,
+    pub wallet_address: Bech32Address,
+    pub state: State,
+}
+
+impl AdderInteract {
+    pub async fn new(config: Config) -> Self {
+        let mut interactor = Interactor::new(config.gateway_uri())
+            .await
+            .use_chain_simulator(config.use_chain_simulator());
+        interactor.set_current_dir_from_workspace("contracts/examples/adder/interactor");
+
+        let adder_owner_address = interactor.register_wallet(test_wallets::heidi()).await;
+        let wallet_address = interactor.register_wallet(test_wallets::ivan()).await;
+
+        interactor.generate_blocks_until_epoch(1).await.unwrap();
+
+        AdderInteract {
+            interactor,
+            adder_owner_address: adder_owner_address.into(),
+            wallet_address: wallet_address.into(),
+            state: State::load_state(),
+        }
+    }
+
+    pub async fn deploy(&mut self) {
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.adder_owner_address.clone())
+            .gas(6_000_000)
+            .typed(adder_proxy::AdderProxy)
+            .init(0u64)
+            .code(ADDER_CODE_PATH)
+            .returns(ReturnsNewBech32Address)
+            .run()
+            .await;
+
+        println!("new address: {new_address}");
+        self.state.set_adder_address(new_address);
+    }
+
+    pub async fn upgrade(&mut self, new_value: u32, sender: &Bech32Address, err: Option<&str>) {
+        let response = self
+            .interactor
+            .tx()
+            .from(sender)
+            .to(self.state.current_adder_address())
+            .gas(6_000_000)
+            .typed(adder_proxy::AdderProxy)
+            .upgrade(new_value)
+            .code(ADDER_CODE_PATH)
+            .code_metadata(CodeMetadata::UPGRADEABLE)
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => {
+                println!("Contract successfully upgraded.");
+            },
+            Err(tx_err) => {
+                println!("Contract failed upgrade with error: {}", tx_err.message);
+                assert_eq!(tx_err.message, err.unwrap_or_default());
+            },
+        }
+    }
+
+    pub async fn add(&mut self, value: u32) {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.current_adder_address())
+            .gas(6_000_000u64)
+            .typed(adder_proxy::AdderProxy)
+            .add(value)
+            .run()
+            .await;
+
+        println!("Successfully performed add");
+    }
+
+    pub async fn get_sum(&mut self) -> RustBigUint {
+        self.interactor
+            .query()
+            .to(self.state.current_adder_address())
+            .typed(adder_proxy::AdderProxy)
+            .sum()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+}
diff --git a/contracts/examples/adder/interact/src/basic_interact_cli.rs b/contracts/examples/adder/interactor/src/basic_interactor_cli.rs
similarity index 79%
rename from contracts/examples/adder/interact/src/basic_interact_cli.rs
rename to contracts/examples/adder/interactor/src/basic_interactor_cli.rs
index 6766981802..3a4a98e502 100644
--- a/contracts/examples/adder/interact/src/basic_interact_cli.rs
+++ b/contracts/examples/adder/interactor/src/basic_interactor_cli.rs
@@ -12,18 +12,14 @@ pub struct InteractCli {
 /// 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),
+    #[command(name = "sum", about = "Print sum")]
+    Sum,
+    #[command(name = "add", about = "Add value")]
+    Add(AddArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -31,10 +27,6 @@ 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)]
diff --git a/contracts/examples/adder/interactor/src/basic_interactor_config.rs b/contracts/examples/adder/interactor/src/basic_interactor_config.rs
new file mode 100644
index 0000000000..bd19da629d
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interactor_config.rs
@@ -0,0 +1,49 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
+/// Adder Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    pub gateway_uri: String,
+    pub chain_type: ChainType,
+}
+
+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()
+    }
+
+    pub fn chain_simulator_config() -> Self {
+        Config {
+            gateway_uri: "http://localhost:8085".to_owned(),
+            chain_type: ChainType::Simulator,
+        }
+    }
+
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
+    }
+}
diff --git a/contracts/examples/adder/interactor/src/basic_interactor_main.rs b/contracts/examples/adder/interactor/src/basic_interactor_main.rs
new file mode 100644
index 0000000000..72c8291332
--- /dev/null
+++ b/contracts/examples/adder/interactor/src/basic_interactor_main.rs
@@ -0,0 +1,6 @@
+extern crate basic_interactor;
+
+#[tokio::main]
+pub async fn main() {
+    basic_interactor::adder_cli().await;
+}
diff --git a/contracts/examples/adder/interact/src/basic_interact_state.rs b/contracts/examples/adder/interactor/src/basic_interactor_state.rs
similarity index 97%
rename from contracts/examples/adder/interact/src/basic_interact_state.rs
rename to contracts/examples/adder/interactor/src/basic_interactor_state.rs
index 41453e36fd..bcab774134 100644
--- a/contracts/examples/adder/interact/src/basic_interact_state.rs
+++ b/contracts/examples/adder/interactor/src/basic_interactor_state.rs
@@ -8,7 +8,7 @@ use std::{
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-/// Multisig Interact state
+/// Adder Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
     adder_address: Option<Bech32Address>,
diff --git a/contracts/examples/adder/interactor/tests/basic_interactor_cs_test.rs b/contracts/examples/adder/interactor/tests/basic_interactor_cs_test.rs
new file mode 100644
index 0000000000..1f07ee4c87
--- /dev/null
+++ b/contracts/examples/adder/interactor/tests/basic_interactor_cs_test.rs
@@ -0,0 +1,35 @@
+use basic_interactor::{AdderInteract, Config};
+
+#[tokio::test]
+#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
+async fn simulator_upgrade_test() {
+    let mut basic_interact = AdderInteract::new(Config::chain_simulator_config()).await;
+
+    basic_interact.deploy().await;
+    basic_interact.add(1u32).await;
+
+    // Sum will be 1
+    let sum = basic_interact.get_sum().await;
+    assert_eq!(sum, 1u32.into());
+
+    basic_interact
+        .upgrade(7u32, &basic_interact.adder_owner_address.clone(), None)
+        .await;
+
+    // Sum will be the updated value of 7
+    let sum = basic_interact.get_sum().await;
+    assert_eq!(sum, 7u32.into());
+
+    // Upgrade fails
+    basic_interact
+        .upgrade(
+            10u32,
+            &basic_interact.wallet_address.clone(),
+            Some("upgrade is allowed only for owner"),
+        )
+        .await;
+
+    // Sum will remain 7
+    let sum = basic_interact.get_sum().await;
+    assert_eq!(sum, 7u32.into());
+}
diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml
index b847ab37dc..24e88b2311 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/adder/mxsc-template.toml b/contracts/examples/adder/mxsc-template.toml
index 490557cc50..f6a6bb7815 100644
--- a/contracts/examples/adder/mxsc-template.toml
+++ b/contracts/examples/adder/mxsc-template.toml
@@ -16,9 +16,10 @@ files_include = [
     "README.md",
     "sc-config.toml",
     "multiversx.json",
-    "interact/Cargo.toml",
-    "interact/config.toml",
-    "interact/.gitignore",
-    "interact/src",
+    "interactor/Cargo.toml",
+    "interactor/config.toml",
+    "interactor/.gitignore",
+    "interactor/src",
+    "interactor/tests",
 ]
 has_interactor = true
diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs
index 9f155c4e3a..fe28fa8e4b 100644
--- a/contracts/examples/adder/tests/adder_blackbox_test.rs
+++ b/contracts/examples/adder/tests/adder_blackbox_test.rs
@@ -9,6 +9,7 @@ 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 f9ee7a3a1c..6c123e4da5 100644
--- a/contracts/examples/adder/tests/adder_scenario_rs_test.rs
+++ b/contracts/examples/adder/tests/adder_scenario_rs_test.rs
@@ -3,6 +3,7 @@ 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 9e7abe4a51..f582b26b81 100644
--- a/contracts/examples/adder/tests/adder_whitebox_test.rs
+++ b/contracts/examples/adder/tests/adder_whitebox_test.rs
@@ -1,49 +1,51 @@
 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.set_current_dir_from_workspace("contracts/examples/adder");
+    blockchain.register_contract(CODE_PATH, 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.account(OWNER).nonce(1);
+
+    let new_address = world
+        .tx()
+        .from(OWNER)
+        .raw_deploy()
+        .code(CODE_PATH)
+        .new_address(ADDER_ADDRESS)
+        .returns(ReturnsNewBech32Address)
+        .whitebox(adder::contract_obj, |sc| {
+            sc.init(BigUint::from(3u64));
+        });
+
+    assert_eq!(new_address, ADDER_ADDRESS.to_address().into());
 
     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"),
-                ),
-        );
+        .tx()
+        .from(OWNER)
+        .to(ADDER_ADDRESS)
+        .whitebox(adder::contract_obj, |sc| {
+            sc.add(BigUint::from(5u64));
+        });
+
+    let _raw_response = world
+        .query()
+        .to(ADDER_ADDRESS)
+        .returns(ReturnsRawResult)
+        .whitebox(adder::contract_obj, |sc| {
+            let sum = sc.sum().get();
+            assert_eq!(sum, BigUint::from(8u64));
+        });
 }
diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock
index c044098158..4f993f79ea 100755
--- a/contracts/examples/adder/wasm/Cargo.lock
+++ b/contracts/examples/adder/wasm/Cargo.lock
@@ -19,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml
index 5ee83722de..7d1f358b83 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.54.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 983e393373..bd5067fa5a 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 a0de3197f2..abd12aced4 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 81a143734b..20cc3e77bc 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
@@ -2,6 +2,7 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/examples/bonding-curve-contract");
     blockchain.register_contract(
         "mxsc:output/bonding-curve-contract.mxsc.json",
         bonding_curve_contract::ContractBuilder,
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
index 72019eb4d6..17079cb44b 100644
--- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
+++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml
index 341cb263d2..c8b1a0ad3d 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml
index 30c5dd163e..9245f979ff 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml
index 7e379211bd..ebb1bce610 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock
index 65d730f928..cfab94c784 100644
--- a/contracts/examples/check-pause/wasm/Cargo.lock
+++ b/contracts/examples/check-pause/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml
index 796acc533b..a0858d0ce0 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml
index 3b873fb7b5..0ea82a5d97 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 53c8fc854c..71d4f41eb2 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
index 1dea493562..d47e256f08 100644
--- a/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
+++ b/contracts/examples/crowdfunding-esdt/src/crowdfunding_esdt.rs
@@ -55,6 +55,7 @@ pub trait Crowdfunding {
     }
 
     #[view(getCurrentFunds)]
+    #[title("currentFunds")]
     fn get_current_funds(&self) -> BigUint {
         let token = self.cf_token_identifier().get();
 
@@ -106,18 +107,22 @@ pub trait Crowdfunding {
     // storage
 
     #[view(getTarget)]
+    #[title("target")]
     #[storage_mapper("target")]
     fn target(&self) -> SingleValueMapper<BigUint>;
 
     #[view(getDeadline)]
+    #[title("deadline")]
     #[storage_mapper("deadline")]
     fn deadline(&self) -> SingleValueMapper<u64>;
 
     #[view(getDeposit)]
+    #[title("deposit")]
     #[storage_mapper("deposit")]
     fn deposit(&self, donor: &ManagedAddress) -> SingleValueMapper<BigUint>;
 
     #[view(getCrowdfundingTokenIdentifier)]
+    #[title("tokenIdentifier")]
     #[storage_mapper("tokenIdentifier")]
     fn cf_token_identifier(&self) -> SingleValueMapper<EgldOrEsdtTokenIdentifier>;
 }
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 d00e263607..052964adcd 100644
--- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
+++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs
@@ -13,6 +13,7 @@ const CROWDFUNDING_ADDRESS: TestSCAddress = TestSCAddress::new("crowdfunding-esd
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/examples/crowdfunding-esdt");
     blockchain.register_contract(CODE_PATH, crowdfunding_esdt::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 64a88906b2..6fcde9a71c 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
@@ -3,6 +3,7 @@ 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",
         crowdfunding_esdt::ContractBuilder,
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
index e9b1cc12e6..e5e8ec324d 100644
--- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
+++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml
index d1a35db239..894fdf9af5 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml
index 428963a491..d171564522 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml
index b07f462d78..9de4249d3e 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 134133a68b..d9d846b6a8 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
@@ -3,6 +3,7 @@ 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",
         crypto_bubbles::ContractBuilder,
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
index e8d054972a..350a7656e6 100755
--- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock
+++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml
index d94fe29e5d..fdf9b80eee 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.54.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 7fb6db9cc4..c18416ea12 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.54.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 4223338861..4ad217b878 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.54.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 a245b2db45..92c17cc505 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 816c4b0017..8aec2c2349 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 e7fce12ce1..84af643926 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
@@ -3,6 +3,7 @@ use multiversx_sc_scenario::*;
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/examples/crypto-kitties/kitty-auction");
     blockchain.register_contract(
         "mxsc:../kitty-ownership/output/kitty-ownership.mxsc.json",
         kitty_ownership::ContractBuilder,
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
index d94014f05b..88f0c2210d 100755
--- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -82,12 +82,21 @@ dependencies = [
  "random",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -96,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -115,7 +124,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -126,7 +135,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -160,9 +169,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 +201,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -203,9 +212,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml
index d9190f9070..ad8ecb4b16 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.54.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 11026a4a53..2c778818f5 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 2c2522d4d8..3079b3e430 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 08672d2f0c..bdaed552c7 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
@@ -2,6 +2,8 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain
+        .set_current_dir_from_workspace("contracts/examples/crypto-kitties/kitty-genetic-alg");
     blockchain.register_contract(
         "mxsc:output/kitty-genetic-alg.mxsc.json",
         kitty_genetic_alg::ContractBuilder,
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..3fa6ff49fd 100755
--- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -63,12 +63,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -96,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -107,7 +116,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -141,9 +150,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 +182,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -184,9 +193,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..096d0e5322 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.54.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 21d0dd821c..da7993cdc6 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 6d520d49fd..18b4e56e39 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 238a3f8fce..65837675b1 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
@@ -3,6 +3,7 @@ use multiversx_sc_scenario::*;
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/examples/crypto-kitties/kitty-ownership");
     blockchain.register_contract(
         "mxsc:../kitty-genetic-alg/output/kitty-genetic-alg.mxsc.json",
         kitty_genetic_alg::ContractBuilder,
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
index 95f512b3ba..d1d28ac83c 100755
--- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
+++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -73,12 +73,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -96,7 +105,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -106,7 +115,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -117,7 +126,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -151,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",
 ]
@@ -183,9 +192,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -194,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml
index cc5ccbff7f..8a8e9d6a4a 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml
index 0c92cf2ecb..eda1e9682f 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml
index fc8143293e..2447653553 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock
index 2f7faf40a1..8859f8f723 100755
--- a/contracts/examples/crypto-zombies/wasm/Cargo.lock
+++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml
index 2d7958f446..a1a5589db2 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml
index 4c62a66396..49d30ccbe2 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml
index 4b0f9128c5..b535ba7455 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 b210c4952a..7efe28271d 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
@@ -3,6 +3,7 @@ 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",
         digital_cash::ContractBuilder,
diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock
index 8f41169038..8211d7d54b 100644
--- a/contracts/examples/digital-cash/wasm/Cargo.lock
+++ b/contracts/examples/digital-cash/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml
index e368089244..1e8f50f24b 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml
index cd673f0026..017050f45f 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies]
diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml
index 8c1f6f6727..2dcac830c9 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/empty/tests/empty_scenario_rs_test.rs b/contracts/examples/empty/tests/empty_scenario_rs_test.rs
index 7f84325dbe..5845b0d771 100644
--- a/contracts/examples/empty/tests/empty_scenario_rs_test.rs
+++ b/contracts/examples/empty/tests/empty_scenario_rs_test.rs
@@ -3,6 +3,7 @@ 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/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock
index 7cd912320b..6bb28193fa 100755
--- a/contracts/examples/empty/wasm/Cargo.lock
+++ b/contracts/examples/empty/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml
index 634af62941..f6a5ee6ee0 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.54.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 ae690d99ef..f6a098db90 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 42c1c9316e..1e03e0402c 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 48bc41cff0..71a74e4e87 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
@@ -3,6 +3,7 @@ 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",
         esdt_transfer_with_fee::ContractBuilder,
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
index dc97b10736..0349df2aa0 100644
--- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
+++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml
index 4a6acde6f2..c0db664037 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml
index 5f513f24bf..6787661abd 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml
index 396aeccadf..b8f5c26e2c 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
index 679c1a2d92..5588f11668 100644
--- a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
+++ b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs
@@ -3,6 +3,7 @@ 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",
         factorial::ContractBuilder,
diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock
index fd2f46732e..27da239c5c 100755
--- a/contracts/examples/factorial/wasm/Cargo.lock
+++ b/contracts/examples/factorial/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml
index 30f15689b4..c8f924d2fd 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml
index 200b624a33..39f41765ff 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml
index e8c3c6ade9..9c79187c9c 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock
index 95c1776157..10a8239e4c 100644
--- a/contracts/examples/fractional-nfts/wasm/Cargo.lock
+++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml
index 7e767d0182..b64b9aedb0 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml
index 448dd11f8f..edb3d02f24 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml
index 4c5428a1b5..dc9974c180 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs b/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs
index 4d6cf07266..248324e7a3 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
@@ -3,6 +3,7 @@ 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",
         lottery_esdt::ContractBuilder,
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock
index 99996e1c51..9723b67e53 100755
--- a/contracts/examples/lottery-esdt/wasm/Cargo.lock
+++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml
index 4e433cdaec..c34677725c 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml
index f6aa80b3ae..33282e8c11 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 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.54.1"
 path = "../../core/wegld-swap"
 
 [dev-dependencies]
diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml
index acc0bf34ae..6548015f01 100644
--- a/contracts/examples/multisig/interact/Cargo.toml
+++ b/contracts/examples/multisig/interact/Cargo.toml
@@ -13,22 +13,23 @@ path = "src/multisig_interact.rs"
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.8.6"
+tokio = { version = "1.24" }
 
 [dependencies.multisig]
 path = ".."
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../contracts/modules"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/snippets"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../../../../framework/scenario"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../../../../framework/base"
diff --git a/contracts/examples/multisig/interact/config.toml b/contracts/examples/multisig/interact/config.toml
index 029fab5ac7..148ebb5803 100644
--- a/contracts/examples/multisig/interact/config.toml
+++ b/contracts/examples/multisig/interact/config.toml
@@ -1,3 +1,4 @@
-gateway = 'https://devnet-gateway.multiversx.com'
+chain_type = 'real'
+gateway_uri = 'https://devnet-gateway.multiversx.com'
 quorum = 2
 wegld_address = "erd1qqqqqqqqqqqqqpgqqkwzsxkjc83vlfex9dmznwm7tjvxlqqkpauqx0n782"
diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs
index 497b6636dd..ab66377b24 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact.rs
@@ -19,7 +19,7 @@ async fn main() {
     env_logger::init();
 
     let mut multisig_interact = MultisigInteract::init().await;
-    multisig_interact.register_wallets();
+    multisig_interact.register_wallets().await;
 
     let cli = multisig_interact_cli::InteractCli::parse();
     match &cli.command {
@@ -86,11 +86,13 @@ struct MultisigInteract {
 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_uri())
             .await
+            .use_chain_simulator(config.use_chain_simulator())
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
-        let wallet_address = interactor.register_wallet(test_wallets::mike());
+        interactor.set_current_dir_from_workspace("contracts/examples/multisig/interact");
+        let wallet_address = interactor.register_wallet(test_wallets::mike()).await;
         let multisig_code = BytesValue::interpret_from(
             "mxsc:../output/multisig.mxsc.json",
             &InterpreterContext::default(),
@@ -106,13 +108,13 @@ impl MultisigInteract {
         }
     }
 
-    fn register_wallets(&mut self) {
+    async fn register_wallets(&mut self) {
         let carol = test_wallets::carol();
         let dan = test_wallets::dan();
         let eve = test_wallets::eve();
 
         for wallet in &[carol, dan, eve] {
-            self.interactor.register_wallet(*wallet);
+            self.interactor.register_wallet(*wallet).await;
         }
     }
 
@@ -145,7 +147,6 @@ impl MultisigInteract {
             .code(&self.multisig_code)
             .gas(NumExpr("100,000,000"))
             .returns(ReturnsNewBech32Address)
-            .prepare_async()
             .run()
             .await;
 
@@ -190,9 +191,9 @@ impl MultisigInteract {
 
         MultiValueVec::from([
             self.wallet_address.to_address(),
-            carol.address().to_bytes().into(),
-            dan.address().to_bytes().into(),
-            eve.address().to_bytes().into(),
+            carol.to_address(),
+            dan.to_address(),
+            eve.to_address(),
         ])
     }
 
@@ -202,7 +203,6 @@ impl MultisigInteract {
             .from(&self.wallet_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()
             .await;
     }
@@ -220,7 +220,6 @@ impl MultisigInteract {
             .gas(gas_expr)
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
-            .prepare_async()
             .run()
             .await;
 
@@ -249,13 +248,14 @@ impl MultisigInteract {
                     .gas(gas_expr)
                     .typed(multisig_proxy::MultisigProxy)
                     .perform_action_endpoint(action_id)
+                    .returns(PassValue(action_id))
                     .returns(ReturnsResult)
             });
         }
 
-        let deployed_addresses = buffer.run().await;
+        let result = buffer.run().await;
 
-        for (action_id, address) in deployed_addresses.iter().enumerate() {
+        for (action_id, address) in result {
             println!("successfully performed action `{action_id}`");
             if address.is_some() {
                 println!(
@@ -273,7 +273,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .quorum_reached(action_id)
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await
     }
@@ -285,7 +284,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .signed(signer, action_id)
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await
     }
@@ -340,7 +338,6 @@ impl MultisigInteract {
             .gas(NumExpr("30,000,000"))
             .typed(multisig_proxy::MultisigProxy)
             .dns_register(dns_address, name)
-            .prepare_async()
             .run()
             .await;
 
@@ -355,7 +352,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .quorum()
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
@@ -370,7 +366,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .num_board_members()
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_config.rs b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
index 4aa9903cc0..c11c2c447f 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_config.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_config.rs
@@ -5,10 +5,18 @@ use std::io::Read;
 /// Config file
 const CONFIG_FILE: &str = "config.toml";
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
 /// Multisig Interact configuration
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    pub gateway: String,
+    pub gateway_uri: String,
+    pub chain_type: ChainType,
     pub quorum: usize,
     pub wegld_address: Bech32Address,
 }
@@ -21,4 +29,17 @@ impl Config {
         file.read_to_string(&mut content).unwrap();
         toml::from_str(&content).unwrap()
     }
+
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
+    }
 }
diff --git a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
index 2efda8e4d6..e46411e776 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_nfts.rs
@@ -50,7 +50,6 @@ impl MultisigInteract {
                     .argument(&0u32),
             )
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
@@ -75,7 +74,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .returns(ReturnsNewTokenIdentifier)
-            .prepare_async()
             .run()
             .await;
         self.collection_token_identifier = new_token_id.to_string();
@@ -102,7 +100,6 @@ impl MultisigInteract {
                     .argument(&COLLECTION_TICKER),
             )
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
@@ -127,7 +124,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .perform_action_endpoint(action_id)
             .returns(ReturnsNewTokenIdentifier)
-            .prepare_async()
             .run()
             .await;
         self.collection_token_identifier = new_token_id;
@@ -156,7 +152,6 @@ impl MultisigInteract {
                     .argument(&"ESDTRoleNFTCreate"),
             )
             .returns(ReturnsResult)
-            .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 7774bc02d4..2ed1a93b30 100644
--- a/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
+++ b/contracts/examples/multisig/interact/src/multisig_interact_wegld.rs
@@ -56,7 +56,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(&self.config.wegld_address, WRAP_AMOUNT, function_call)
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
@@ -72,7 +71,6 @@ impl MultisigInteract {
             .typed(wegld_proxy::EgldEsdtSwapProxy)
             .wrapped_egld_token_id()
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
@@ -104,7 +102,6 @@ impl MultisigInteract {
             .typed(multisig_proxy::MultisigProxy)
             .propose_async_call(normalized_to, 0u64, normalized_data)
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml
index 0f38bf905b..70a9ff1220 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
index e8067bb73a..7a2cff5996 100644
--- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs
+++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs
@@ -19,6 +19,7 @@ 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);
     blockchain
diff --git a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
index 67baad4ca2..8a606bffd8 100644
--- a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
+++ b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs
@@ -4,6 +4,7 @@ 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 904a03c7e0..69877fe787 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;
@@ -52,6 +52,7 @@ 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
 }
@@ -59,40 +60,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 +108,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 +175,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 +480,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 +488,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 +537,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 +593,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 +684,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>(
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
index fe4cb87bcd..92186b0bf0 100644
--- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml
index c6edfe4418..3893f09bc6 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
index 509b478684..f704df39cb 100644
--- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
+++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml
index a62263192b..77851b8d34 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock
index ea949b64f6..0204985170 100755
--- a/contracts/examples/multisig/wasm/Cargo.lock
+++ b/contracts/examples/multisig/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml
index ecaaf8c44f..f721dc0b61 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml
index 5eec7fa050..ef76ee1515 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml
index 9afe18081b..b332cf73b4 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-minter/src/nft_module.rs b/contracts/examples/nft-minter/src/nft_module.rs
index da97c0d171..12f2c3b868 100644
--- a/contracts/examples/nft-minter/src/nft_module.rs
+++ b/contracts/examples/nft-minter/src/nft_module.rs
@@ -49,8 +49,8 @@ pub trait NftModule {
         self.send()
             .esdt_system_sc_proxy()
             .set_special_roles(
-                &self.blockchain().get_sc_address(),
-                &self.nft_token_id().get(),
+                self.blockchain().get_sc_address(),
+                self.nft_token_id().get(),
                 [EsdtLocalRole::NftCreate][..].iter().cloned(),
             )
             .async_call_and_exit()
@@ -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/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs b/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs
index 1e8c9a3f43..65b2f6f28f 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
@@ -3,6 +3,7 @@ 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",
         nft_minter::ContractBuilder,
diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock
index 616b5aed2e..b46be44a8c 100644
--- a/contracts/examples/nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/nft-minter/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml
index c32dac7eeb..97dae9ddc3 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.54.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 13ad075a6e..2d657d8236 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 fe604f7747..69405af90a 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
index e876048d71..1dea0f48ee 100755
--- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
+++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml
index a220344bba..70ba8624f6 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml
index 2b205ad97e..115f5e596f 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml
index 592e8effc1..93d4cb9a0a 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 c36191ef22..d83b734f13 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
@@ -3,6 +3,7 @@ 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",
         nft_subscription::ContractBuilder,
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock
index e9f75e7859..a33d5ebbc8 100644
--- a/contracts/examples/nft-subscription/wasm/Cargo.lock
+++ b/contracts/examples/nft-subscription/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml
index 310c1bdaa0..edd2cf9736 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.54.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 d6d16fbf04..a5a379282d 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 0b5af8112f..a5bc6e5536 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock
index b8dc4385d2..703c9ed8e4 100644
--- a/contracts/examples/order-book/factory/wasm/Cargo.lock
+++ b/contracts/examples/order-book/factory/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml
index bf4fd9c0d7..62e5c3f134 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.54.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 9342a1c1dd..2ea1801667 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 85d9ddda80..70babcce04 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 cc5df5d805..4356a0e81b 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
@@ -3,6 +3,7 @@ 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",
         order_book_pair::ContractBuilder,
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock
index c1a86a1be9..5a3a6d8a49 100644
--- a/contracts/examples/order-book/pair/wasm/Cargo.lock
+++ b/contracts/examples/order-book/pair/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml
index d4bb4cf0bb..40121d1423 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.54.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 2e3375af52..d86137bb5e 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/ping-pong-egld/dapp/Cargo.toml b/contracts/examples/ping-pong-egld/dapp/Cargo.toml
new file mode 100644
index 0000000000..08df48d231
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "ping-pong-dapp"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+console_log = "0.2"
+log = "0.4"
+serde = "1.0.210"
+serde_json = "1.0"
+wasm-bindgen-futures = "0.4"
+yew = { version = "0.20.0", features = ["csr"] }
+yew_icons = { version = "0.7.3", features = ["BootstrapHeartFill"] }
+yew-router = { version = "0.17.0" }
+
+[dependencies.multiversx-sc-snippets]
+path = "../../../../framework/snippets"
+default-features = false
+features = ["dapp"]
diff --git a/contracts/examples/ping-pong-egld/dapp/index.html b/contracts/examples/ping-pong-egld/dapp/index.html
new file mode 100644
index 0000000000..162a2a7a50
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <link data-trunk rel="css" href="src/styles.css" />
+</head>
+
+<body>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/contracts/examples/ping-pong-egld/dapp/ping-pong-egld.wasm b/contracts/examples/ping-pong-egld/dapp/ping-pong-egld.wasm
new file mode 100644
index 0000000000..7426d32c86
Binary files /dev/null and b/contracts/examples/ping-pong-egld/dapp/ping-pong-egld.wasm differ
diff --git a/contracts/examples/ping-pong-egld/dapp/readme.md b/contracts/examples/ping-pong-egld/dapp/readme.md
new file mode 100644
index 0000000000..032b2c3d29
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/readme.md
@@ -0,0 +1,9 @@
+# Ping pong dapp example
+
+## Prerequisites
+- trunk
+
+```bash
+cargo install trunk
+```
+Run this example locally with `trunk serve --open`.
\ No newline at end of file
diff --git a/contracts/examples/ping-pong-egld/dapp/src/components/button.rs b/contracts/examples/ping-pong-egld/dapp/src/components/button.rs
new file mode 100644
index 0000000000..cdb898bd59
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/components/button.rs
@@ -0,0 +1,18 @@
+use yew::prelude::*;
+
+#[derive(Properties, PartialEq)]
+pub struct ButtonProps {
+    pub name: String,
+    pub class_name: String,
+    pub button_type: String,
+    pub on_click: Callback<MouseEvent>,
+}
+
+#[function_component(Button)]
+pub fn button(props: &ButtonProps) -> Html {
+    html! {
+        <button class={props.class_name.clone()} type={props.button_type.clone()} onclick={props.on_click.clone()}>
+            { &props.name }
+        </button>
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/components/footer.rs b/contracts/examples/ping-pong-egld/dapp/src/components/footer.rs
new file mode 100644
index 0000000000..e5d7066c55
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/components/footer.rs
@@ -0,0 +1,15 @@
+use yew::prelude::*;
+use yew_icons::{Icon, IconId};
+
+#[function_component(Footer)]
+pub fn footer() -> Html {
+    html! {
+        <footer class = "footer">
+            <p>
+                { "Made with " }
+                <Icon class="icon" icon_id={IconId::BootstrapHeartFill}/>
+                { " by the MultiversX team" }
+            </p>
+        </footer>
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/components/mod.rs b/contracts/examples/ping-pong-egld/dapp/src/components/mod.rs
new file mode 100644
index 0000000000..f55f57e4d0
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/components/mod.rs
@@ -0,0 +1,7 @@
+pub mod button;
+pub mod footer;
+pub mod network_status;
+
+pub use button::Button;
+pub use footer::Footer;
+pub use network_status::NetworkStatusComponent;
diff --git a/contracts/examples/ping-pong-egld/dapp/src/components/network_status.rs b/contracts/examples/ping-pong-egld/dapp/src/components/network_status.rs
new file mode 100644
index 0000000000..74f085f23c
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/components/network_status.rs
@@ -0,0 +1,17 @@
+use yew::prelude::*;
+
+use crate::context::ConfigContext;
+
+#[function_component(NetworkStatusComponent)]
+pub fn network_status() -> Html {
+    let context = use_context::<ConfigContext>().unwrap();
+    let response = format!("{:?}", &context.network_status);
+
+    html! {
+        <div class = "network-status-container">
+            <p>
+               {&response}
+            </p>
+        </div>
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/context.rs b/contracts/examples/ping-pong-egld/dapp/src/context.rs
new file mode 100644
index 0000000000..78f71590d8
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/context.rs
@@ -0,0 +1,66 @@
+use crate::requests::query;
+
+use html::ChildrenProps;
+use multiversx_sc_snippets::sdk::data::network_status::NetworkStatus;
+use yew::prelude::*;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct ConfigContext {
+    pub network_status: NetworkStatus,
+    pub set_network_status: Callback<NetworkStatus>,
+}
+
+pub async fn refresh_context() -> NetworkStatus {
+    log::info!("refreshing context");
+    query::get_network_status().await.unwrap_or_default()
+}
+
+impl Default for ConfigContext {
+    fn default() -> Self {
+        ConfigContext {
+            network_status: NetworkStatus::default(),
+            set_network_status: Callback::noop(),
+        }
+    }
+}
+
+#[function_component(ConfigProvider)]
+pub fn config_provider(props: &ChildrenProps) -> Html {
+    let network_status = use_state(NetworkStatus::default);
+
+    // Clone the state here for use in the callback
+    let set_network_status = {
+        let network_status = network_status.clone();
+        Callback::from(move |new_status: NetworkStatus| {
+            network_status.set(new_status);
+        })
+    };
+
+    // Clone the callback for async usage in the effect
+    let set_network_status_async = set_network_status.clone();
+
+    // refresh context on component mount
+    use_effect_with_deps(
+        move |_| {
+            wasm_bindgen_futures::spawn_local(async move {
+                let new_status = refresh_context().await;
+
+                // Emit the new status inside the async block
+                set_network_status_async.emit(new_status);
+            });
+            || () // no cleanup fn
+        },
+        (), // empty dependency array, run once on mount
+    );
+
+    let context = ConfigContext {
+        network_status: (*network_status).clone(),
+        set_network_status,
+    };
+
+    html! {
+        <ContextProvider<ConfigContext> context={context}>
+            { for props.children.iter() }
+        </ContextProvider<ConfigContext>>
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/interactor.rs b/contracts/examples/ping-pong-egld/dapp/src/interactor.rs
new file mode 100644
index 0000000000..843540649e
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/interactor.rs
@@ -0,0 +1,58 @@
+use multiversx_sc_snippets::imports::*;
+use serde::{Deserialize, Serialize};
+
+const GATEWAY: &str = multiversx_sc_snippets::sdk::gateway::DEVNET_GATEWAY;
+const CONTRACT_ADDRESS: &str = "erd1qqqqqqqqqqqqqpgq6tqvj5f59xrgxwrtwy30elgpu7l4zrv6d8ssnjdwxq";
+const PING_PONG_CODE: &[u8] = include_bytes!("../ping-pong-egld.wasm");
+
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct Config {
+    gateway: String,
+    contract_address: String,
+}
+
+impl Config {
+    // Deserializes state from file
+    pub fn new() -> Self {
+        Config {
+            gateway: GATEWAY.to_string(),
+            contract_address: CONTRACT_ADDRESS.to_string(),
+        }
+    }
+
+    /// Sets the contract address
+    #[allow(unused)]
+    pub fn set_address(&mut self, address: Bech32Address) {
+        self.contract_address = address.to_string()
+    }
+
+    /// Returns the contract address
+    pub fn current_address(&self) -> &String {
+        &self.contract_address
+    }
+}
+
+pub struct ContractInteract {
+    pub interactor: DappInteractor,
+    pub wallet_address: Address,
+    pub contract_code: BytesValue,
+    pub config: Config,
+}
+
+impl ContractInteract {
+    pub async fn new() -> Self {
+        let config = Config::new();
+        let mut interactor = DappInteractor::new(&config.gateway).await;
+        interactor.set_current_dir_from_workspace("contracts/examples/ping-pong-egld/dapp");
+        let wallet_address = interactor.register_wallet(test_wallets::mike()).await;
+
+        let contract_code = BytesValue::from(PING_PONG_CODE);
+
+        ContractInteract {
+            interactor,
+            wallet_address,
+            contract_code,
+            config,
+        }
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/main.rs b/contracts/examples/ping-pong-egld/dapp/src/main.rs
new file mode 100644
index 0000000000..bb2b4170dc
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/main.rs
@@ -0,0 +1,33 @@
+mod components;
+mod context;
+mod interactor;
+mod pages;
+mod requests;
+mod routes;
+
+use components::Footer;
+use context::ConfigProvider;
+use log::Level;
+use routes::{switch, Route};
+use yew::prelude::*;
+use yew_router::{BrowserRouter, Switch};
+
+#[function_component(App)]
+fn app() -> Html {
+    html! {
+        <BrowserRouter>
+            <ConfigProvider>
+                <Switch<Route> render={switch} />
+                <Footer />
+            </ConfigProvider>
+        </BrowserRouter>
+    }
+}
+
+fn main() {
+    // initialize the logger
+    console_log::init_with_level(Level::Debug).expect("Failed to initialize logger");
+
+    // render the app
+    yew::Renderer::<App>::new().render();
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/pages/home.rs b/contracts/examples/ping-pong-egld/dapp/src/pages/home.rs
new file mode 100644
index 0000000000..bc9cf26f40
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/pages/home.rs
@@ -0,0 +1,115 @@
+use crate::{
+    components::{Button, NetworkStatusComponent},
+    requests::transaction,
+};
+use yew::prelude::*;
+
+#[function_component(HomePage)]
+pub fn home_page() -> Html {
+    let show_status = use_state(|| false);
+    let ping_result = use_state(String::new);
+    let new_sc_address = use_state(String::new);
+
+    let show_network_status = {
+        let show_status = show_status.clone();
+
+        Callback::from(move |_| {
+            show_status.set(true);
+        })
+    };
+
+    let deploy_sc = {
+        let new_sc_address = new_sc_address.clone();
+
+        Callback::from(move |_| {
+            let new_sc_address = new_sc_address.clone();
+
+            log::info!("SC setup request triggered");
+
+            wasm_bindgen_futures::spawn_local(async move {
+                match transaction::deploy_sc().await {
+                    Ok(result) => {
+                        new_sc_address.set(format!(
+                            "New deployed address: {}",
+                            result.to_bech32_string()
+                        ));
+                    },
+                    Err(err) => {
+                        log::error!("SC Setup failed: {:?}", err);
+                        new_sc_address.set("SC Setup failed!".to_string());
+                    },
+                }
+            });
+        })
+    };
+
+    let ping = {
+        let ping_result = ping_result.clone();
+
+        Callback::from(move |_| {
+            let ping_result = ping_result.clone();
+
+            log::info!("Ping request triggered");
+
+            wasm_bindgen_futures::spawn_local(async move {
+                match transaction::ping().await {
+                    Ok(result) => {
+                        ping_result.set(result);
+                    },
+                    Err(err) => {
+                        log::error!("Ping failed: {:?}", err);
+                        ping_result.set("Ping failed!".to_string());
+                    },
+                }
+            });
+        })
+    };
+
+    html! {
+        <>
+        <div class = "btns">
+        <Button name="Network Status" class_name="query-btn" button_type = "button" on_click={show_network_status.clone()} />
+        <Button name="Deploy SC" class_name="deploy-btn" button_type = "button" on_click={deploy_sc.clone()} />
+        <Button name="Ping" class_name="transaction-btn" button_type = "button" on_click={ping.clone()} />
+        </div>
+        {
+            if *show_status {
+                html! {
+                    <NetworkStatusComponent />
+                }
+            }
+            else {
+                html! {}
+            }
+        }
+        {
+            if !new_sc_address.is_empty() {
+                html! {
+                    <p>
+                    {
+                        (*new_sc_address).clone()
+                    }
+                    </p>
+                }
+            }
+            else {
+                html! {}
+            }
+        }
+        {
+            if !ping_result.is_empty() {
+                html! {
+                    <p>
+                    {
+                        (*ping_result).clone()
+                    }
+                    </p>
+                }
+            }
+            else {
+                html! {}
+            }
+        }
+        </>
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/pages/mod.rs b/contracts/examples/ping-pong-egld/dapp/src/pages/mod.rs
new file mode 100644
index 0000000000..0193241d0e
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/pages/mod.rs
@@ -0,0 +1,3 @@
+pub mod home;
+
+pub use home::*;
diff --git a/contracts/examples/ping-pong-egld/dapp/src/requests/mod.rs b/contracts/examples/ping-pong-egld/dapp/src/requests/mod.rs
new file mode 100644
index 0000000000..27f8d7c408
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/requests/mod.rs
@@ -0,0 +1,3 @@
+mod proxy;
+pub mod query;
+pub mod transaction;
diff --git a/contracts/examples/ping-pong-egld/dapp/src/requests/proxy.rs b/contracts/examples/ping-pong-egld/dapp/src/requests/proxy.rs
new file mode 100644
index 0000000000..d1d356170f
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/requests/proxy.rs
@@ -0,0 +1,264 @@
+// 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 multiversx_sc_snippets::multiversx_sc;
+
+pub struct PingPongProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PingPongProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PingPongProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PingPongProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PingPongProxyMethods<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> PingPongProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Necessary configuration when deploying: 
+    /// `ping_amount` - the exact EGLD amount that needs to be sent when `ping`-ing. 
+    /// `duration_in_seconds` - how much time (in seconds) until contract expires. 
+    /// `opt_activation_timestamp` - optionally specify the contract to only actvivate at a later date. 
+    /// `max_funds` - optional funding cap, no more funds than this can be added to the contract. 
+    pub fn init<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<Option<u64>>,
+        Arg3: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        ping_amount: Arg0,
+        duration_in_seconds: Arg1,
+        opt_activation_timestamp: Arg2,
+        max_funds: Arg3,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&ping_amount)
+            .argument(&duration_in_seconds)
+            .argument(&opt_activation_timestamp)
+            .argument(&max_funds)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PingPongProxyMethods<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>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<Option<u64>>,
+        Arg3: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        ping_amount: Arg0,
+        duration_in_seconds: Arg1,
+        opt_activation_timestamp: Arg2,
+        max_funds: Arg3,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .argument(&ping_amount)
+            .argument(&duration_in_seconds)
+            .argument(&opt_activation_timestamp)
+            .argument(&max_funds)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PingPongProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// User sends some EGLD to be locked in the contract for a period of time. 
+    /// Optional `_data` argument is ignored. 
+    pub fn ping<
+        Arg0: ProxyArg<IgnoreValue>,
+    >(
+        self,
+        _data: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("ping")
+            .argument(&_data)
+            .original_result()
+    }
+
+    /// User can take back funds from the contract. 
+    /// Can only be called after expiration. 
+    pub fn pong(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pong")
+            .original_result()
+    }
+
+    /// Send back funds to all users who pinged. 
+    /// Returns 
+    /// - `completed` if everything finished 
+    /// - `interrupted` if run out of gas midway. 
+    /// Can only be called after expiration. 
+    pub fn pong_all(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OperationCompletionStatus> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pongAll")
+            .original_result()
+    }
+
+    /// Lists the addresses of all users that have `ping`-ed, 
+    /// in the order they have `ping`-ed 
+    pub fn get_user_addresses(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getUserAddresses")
+            .original_result()
+    }
+
+    /// Returns the current contract state as a struct 
+    /// for faster fetching from external parties 
+    pub fn get_contract_state(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ContractState<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getContractState")
+            .original_result()
+    }
+
+    pub fn ping_amount(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getPingAmount")
+            .original_result()
+    }
+
+    pub fn deadline(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getDeadline")
+            .original_result()
+    }
+
+    /// Block timestamp of the block where the contract got activated. 
+    /// If not specified in the constructor it is the the deploy block timestamp. 
+    pub fn activation_timestamp(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActivationTimestamp")
+            .original_result()
+    }
+
+    /// Optional funding cap. 
+    pub fn max_funds(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Option<BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getMaxFunds")
+            .original_result()
+    }
+
+    /// State of user funds. 
+    /// 0 - user unknown, never `ping`-ed 
+    /// 1 - `ping`-ed 
+    /// 2 - `pong`-ed 
+    pub fn user_status<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        user_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, UserStatus> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getUserStatus")
+            .argument(&user_id)
+            .original_result()
+    }
+
+    /// Part of the `pongAll` status, the last user to be processed. 
+    /// 0 if never called `pongAll` or `pongAll` completed.. 
+    pub fn pong_all_last_user(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pongAllLastUser")
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, Default)]
+pub struct ContractState<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub ping_amount: BigUint<Api>,
+    pub deadline: u64,
+    pub activation_timestamp: u64,
+    pub max_funds: Option<BigUint<Api>>,
+    pub pong_all_last_user: usize,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)]
+pub enum UserStatus {
+    New,
+    Registered,
+    Withdrawn,
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/requests/query.rs b/contracts/examples/ping-pong-egld/dapp/src/requests/query.rs
new file mode 100644
index 0000000000..43bf114684
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/requests/query.rs
@@ -0,0 +1,21 @@
+use crate::interactor::ContractInteract;
+use multiversx_sc_snippets::sdk::{
+    data::network_status::NetworkStatus, gateway::GatewayAsyncService,
+    gateway::NetworkStatusRequest,
+};
+
+pub async fn get_network_status() -> Result<NetworkStatus, String> {
+    let contract_interact = ContractInteract::new().await;
+    let shard = 1u32;
+
+    let response = contract_interact
+        .interactor
+        .proxy
+        .request(NetworkStatusRequest::new(shard))
+        .await;
+
+    match response {
+        Ok(value) => Ok(value),
+        Err(err) => Err(err.to_string()),
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/requests/transaction.rs b/contracts/examples/ping-pong-egld/dapp/src/requests/transaction.rs
new file mode 100644
index 0000000000..941ad53ee8
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/requests/transaction.rs
@@ -0,0 +1,60 @@
+use crate::interactor::ContractInteract;
+use multiversx_sc_snippets::imports::*;
+
+use super::proxy;
+
+pub async fn deploy_sc() -> Result<Bech32Address, String> {
+    let mut contract_interact = ContractInteract::new().await;
+    let ping_amount = 1u64;
+    let duration_in_seconds = 5u64;
+    let opt_activation_timestamp = 2u64;
+    let max_funds = 100_000u64;
+
+    let (new_address, status, message) = contract_interact
+        .interactor
+        .tx()
+        .from(&contract_interact.wallet_address)
+        .gas(30_000_000u64)
+        .typed(proxy::PingPongProxy)
+        .init(
+            BigUint::from(ping_amount),
+            duration_in_seconds,
+            Option::Some(opt_activation_timestamp),
+            OptionalValue::Some(BigUint::from(max_funds)),
+        )
+        .code(&contract_interact.contract_code)
+        .returns(ReturnsNewBech32Address)
+        .returns(ReturnsStatus)
+        .returns(ReturnsMessage)
+        .run()
+        .await;
+
+    match status {
+        0u64 => Ok(new_address),
+        _ => Err(message),
+    }
+}
+
+pub async fn ping() -> Result<String, String> {
+    let mut contract_interact = ContractInteract::new().await;
+
+    let amount = 1u64;
+
+    let wallet_address = contract_interact.wallet_address.clone();
+    let current_address = contract_interact.config.current_address().clone();
+    let _data = IgnoreValue;
+
+    contract_interact
+        .interactor
+        .tx()
+        .from(wallet_address)
+        .to(Bech32Address::from_bech32_string(current_address))
+        .gas(30_000_000u64)
+        .typed(proxy::PingPongProxy)
+        .ping(_data)
+        .egld(BigUint::from(amount))
+        .run()
+        .await;
+
+    Ok("Ping successful!".to_string())
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/routes.rs b/contracts/examples/ping-pong-egld/dapp/src/routes.rs
new file mode 100644
index 0000000000..3eecf5d5dc
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/routes.rs
@@ -0,0 +1,16 @@
+use yew::prelude::*;
+use yew_router::prelude::*;
+
+use crate::pages::HomePage;
+
+#[derive(Clone, Routable, PartialEq)]
+pub enum Route {
+    #[at("/")]
+    Home,
+}
+
+pub fn switch(route: Route) -> Html {
+    match route {
+        Route::Home => html! { <HomePage /> },
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/dapp/src/styles.css b/contracts/examples/ping-pong-egld/dapp/src/styles.css
new file mode 100644
index 0000000000..e72fafe0e0
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/src/styles.css
@@ -0,0 +1,29 @@
+* {
+  font-family: monospace;
+}
+
+.footer {
+  background-color: #333;
+  color: white;
+  text-align: center;
+  padding: 20px 0;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  font-size: 14px;
+}
+
+.network-status-container {
+  font-size: 14px;
+}
+
+.btns {
+  display: flex;
+  flex-direction: row;
+  padding: 20px 0;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  gap: 5px;
+}
\ No newline at end of file
diff --git a/contracts/examples/ping-pong-egld/dapp/trunk.toml b/contracts/examples/ping-pong-egld/dapp/trunk.toml
new file mode 100644
index 0000000000..4104a6c09b
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/dapp/trunk.toml
@@ -0,0 +1,7 @@
+[serve]
+# The address to serve on LAN.
+address = "127.0.0.1"
+# The address to serve on WAN.
+# address = "0.0.0.0"
+# The port to serve on.
+port = 8006
diff --git a/contracts/examples/adder/interact/.gitignore b/contracts/examples/ping-pong-egld/interactor/.gitignore
similarity index 93%
rename from contracts/examples/adder/interact/.gitignore
rename to contracts/examples/ping-pong-egld/interactor/.gitignore
index b2630809de..ac5c74ec15 100644
--- a/contracts/examples/adder/interact/.gitignore
+++ b/contracts/examples/ping-pong-egld/interactor/.gitignore
@@ -1,6 +1,6 @@
 # Pem files are used for interactions, but shouldn't be committed
 *.pem
-!adder-owner.pem
+*.json
 
 # Temporary storage of deployed contract address, so we can preserve the context between executions.
 state.toml
diff --git a/contracts/examples/ping-pong-egld/interactor/Cargo.toml b/contracts/examples/ping-pong-egld/interactor/Cargo.toml
new file mode 100644
index 0000000000..5144d4dd82
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "ping-pong-egld-interact"
+version = "0.0.0"
+authors = ["MultiversX <contact@multiversx.com>"]
+edition = "2021"
+publish = false
+
+[[bin]]
+name = "ping-pong-egld-interact"
+path = "src/interact_main.rs"
+
+[lib]
+path = "src/interact.rs"
+
+[dependencies]
+clap = { version = "4.4.7", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
+toml = "0.8.6"
+tokio = { version = "1.24" }
+
+[dependencies.ping-pong-egld]
+path = ".."
+
+[dependencies.multiversx-sc-snippets]
+version = "0.54.1"
+path = "../../../../framework/snippets"
+
+[features]
+chain-simulator-tests = []
diff --git a/contracts/examples/ping-pong-egld/interactor/config.toml b/contracts/examples/ping-pong-egld/interactor/config.toml
new file mode 100644
index 0000000000..aca748706a
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/config.toml
@@ -0,0 +1,5 @@
+chain_type = 'simulator'
+gateway_uri = 'http://localhost:8085'
+
+# chain_type = 'real'
+# gateway_uri = 'https://devnet-gateway.multiversx.com'
diff --git a/contracts/examples/ping-pong-egld/interactor/src/interact.rs b/contracts/examples/ping-pong-egld/interactor/src/interact.rs
new file mode 100644
index 0000000000..3ebee775b1
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/src/interact.rs
@@ -0,0 +1,374 @@
+mod interact_cli;
+mod interact_config;
+mod interact_state;
+
+use crate::interact_state::State;
+use clap::Parser;
+pub use interact_config::Config;
+use ping_pong_egld::proxy_ping_pong_egld::{self, ContractState, UserStatus};
+
+use multiversx_sc_snippets::imports::*;
+
+const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
+
+const PING_PONG_CODE: MxscPath = MxscPath::new("../output/ping-pong-egld.mxsc.json");
+
+pub async fn ping_pong_egld_cli() {
+    env_logger::init();
+
+    let config = Config::load_config();
+
+    let mut interact = PingPongEgldInteract::init(config).await;
+
+    let cli = interact_cli::InteractCli::parse();
+    match &cli.command {
+        Some(interact_cli::InteractCliCommand::Deploy(args)) => {
+            interact
+                .deploy(
+                    args.ping_amount.clone(),
+                    args.duration_in_seconds,
+                    args.opt_activation_timestamp,
+                    OptionalValue::from(args.max_funds.clone()),
+                )
+                .await;
+        },
+        Some(interact_cli::InteractCliCommand::Upgrade(args)) => {
+            interact
+                .upgrade(
+                    args.ping_amount.clone(),
+                    args.duration_in_seconds,
+                    args.opt_activation_timestamp,
+                    OptionalValue::from(args.max_funds.clone()),
+                )
+                .await
+        },
+        Some(interact_cli::InteractCliCommand::Ping(args)) => {
+            let sender = interact.ping_pong_owner_address.clone();
+            interact
+                .ping(args.cost.unwrap_or_default(), None, &sender)
+                .await
+        },
+        Some(interact_cli::InteractCliCommand::Pong) => {
+            let sender = interact.ping_pong_owner_address.clone();
+            interact.pong(None, &sender).await;
+        },
+        Some(interact_cli::InteractCliCommand::PongAll) => {
+            let sender = interact.ping_pong_owner_address.clone();
+            interact.pong_all(None, &sender).await;
+        },
+        Some(interact_cli::InteractCliCommand::GetUserAddresses) => {
+            let user_addresses = interact.get_user_addresses().await;
+            println!("User addresses: ");
+            for address in user_addresses {
+                print!("{address} ");
+            }
+        },
+        Some(interact_cli::InteractCliCommand::GetContractState) => {
+            let contract_state = interact.get_contract_state().await;
+            println!("Contract state: ping_amount -> {:#?} | deadline -> {:#?} | activation_timestamp -> {:#?} | max_funds -> {:#?} | pong_all_last_user -> {:#?}", 
+            contract_state.ping_amount,
+            contract_state.deadline,
+            contract_state.activation_timestamp,
+            contract_state.max_funds,
+            contract_state.pong_all_last_user);
+        },
+        Some(interact_cli::InteractCliCommand::GetPingAmount) => {
+            let ping_amount = interact.get_ping_amount().await;
+            println!("Ping amount: {}", ping_amount);
+        },
+        Some(interact_cli::InteractCliCommand::GetDeadline) => {
+            let deadline = interact.get_deadline().await;
+            println!("Deadline: {}", deadline);
+        },
+        Some(interact_cli::InteractCliCommand::GetActivationTimestamp) => {
+            let activation_timestamp = interact.get_activation_timestamp().await;
+            println!("Activation timestamp: {}", activation_timestamp);
+        },
+        Some(interact_cli::InteractCliCommand::GetMaxFunds) => {
+            let max_funds = interact.get_max_funds().await;
+            match max_funds {
+                Some(funds) => println!("Max funds: {}", funds),
+                None => println!("Max funds: none"),
+            }
+        },
+        Some(interact_cli::InteractCliCommand::GetUserStatus(args)) => {
+            let user_status = interact.get_user_status(args.id).await;
+            match user_status {
+                UserStatus::New => println!("User status: unknown"),
+                UserStatus::Registered => println!("User status: `ping`-ed"),
+                UserStatus::Withdrawn => println!("User status: `pong`-ed"),
+            }
+        },
+        Some(interact_cli::InteractCliCommand::PongAllLastUser) => {
+            let pong_all_last_user = interact.pong_all_last_user().await;
+            println!("Pong all last user: {pong_all_last_user}");
+        },
+        None => {},
+    }
+}
+
+pub struct PingPongEgldInteract {
+    pub interactor: Interactor,
+    pub ping_pong_owner_address: Bech32Address,
+    pub wallet_address: Bech32Address,
+    pub state: State,
+}
+
+impl PingPongEgldInteract {
+    pub async fn init(config: Config) -> Self {
+        let mut interactor = Interactor::new(config.gateway_uri())
+            .await
+            .use_chain_simulator(config.use_chain_simulator())
+            .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
+            .await;
+
+        interactor.set_current_dir_from_workspace("contracts/examples/ping-pong-egld/interactor");
+        let ping_pong_owner_address = interactor.register_wallet(test_wallets::eve()).await;
+        let wallet_address = interactor.register_wallet(test_wallets::mallory()).await;
+
+        // generate blocks until ESDTSystemSCAddress is enabled
+        interactor.generate_blocks_until_epoch(1).await.unwrap();
+
+        Self {
+            interactor,
+            ping_pong_owner_address: ping_pong_owner_address.into(),
+            wallet_address: wallet_address.into(),
+            state: State::load_state(),
+        }
+    }
+
+    pub async fn set_state(&mut self) {
+        println!("wallet address: {}", self.wallet_address);
+        self.interactor
+            .retrieve_account(&self.ping_pong_owner_address)
+            .await;
+        self.interactor.retrieve_account(&self.wallet_address).await;
+    }
+
+    pub async fn deploy(
+        &mut self,
+        ping_amount: RustBigUint,
+        duration_in_seconds: u64,
+        opt_activation_timestamp: Option<u64>,
+        max_funds: OptionalValue<RustBigUint>,
+    ) -> (u64, String) {
+        self.set_state().await;
+
+        let (new_address, status, message) = self
+            .interactor
+            .tx()
+            .from(&self.ping_pong_owner_address)
+            .gas(30_000_000u64)
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .init(
+                ping_amount,
+                duration_in_seconds,
+                opt_activation_timestamp,
+                max_funds,
+            )
+            .code(PING_PONG_CODE)
+            .returns(ReturnsNewBech32Address)
+            .returns(ReturnsStatus)
+            .returns(ReturnsMessage)
+            .run()
+            .await;
+
+        println!("new address: {new_address}");
+        self.state.set_ping_pong_egld_address(new_address);
+
+        (status, message)
+    }
+
+    pub async fn upgrade(
+        &mut self,
+        ping_amount: RustBigUint,
+        duration_in_seconds: u64,
+        opt_activation_timestamp: Option<u64>,
+        max_funds: OptionalValue<RustBigUint>,
+    ) {
+        let response = self
+            .interactor
+            .tx()
+            .to(self.state.current_ping_pong_egld_address())
+            .from(&self.wallet_address)
+            .gas(30_000_000u64)
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .upgrade(
+                ping_amount,
+                duration_in_seconds,
+                opt_activation_timestamp,
+                max_funds,
+            )
+            .code(PING_PONG_CODE)
+            .returns(ReturnsNewAddress)
+            .run()
+            .await;
+
+        println!("Result: {response:?}");
+    }
+
+    pub async fn ping(&mut self, egld_amount: u64, message: Option<&str>, sender: &Bech32Address) {
+        let _data: IgnoreValue = IgnoreValue;
+
+        let response = self
+            .interactor
+            .tx()
+            .from(sender)
+            .to(self.state.current_ping_pong_egld_address())
+            .gas(30_000_000u64)
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .ping(_data)
+            .egld(egld_amount)
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => println!("Ping successful!"),
+            Err(err) => {
+                println!("Ping failed with message: {}", err.message);
+                assert_eq!(message.unwrap_or_default(), err.message);
+            },
+        }
+    }
+
+    pub async fn pong(&mut self, message: Option<&str>, sender: &Bech32Address) {
+        let response = self
+            .interactor
+            .tx()
+            .from(sender)
+            .to(self.state.current_ping_pong_egld_address())
+            .gas(30_000_000u64)
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .pong()
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => println!("Pong successful!"),
+            Err(err) => {
+                println!("Pong failed with message: {}", err.message);
+                assert_eq!(message.unwrap_or_default(), err.message);
+            },
+        }
+    }
+
+    pub async fn pong_all(&mut self, message: Option<String>, sender: &Bech32Address) {
+        let response = self
+            .interactor
+            .tx()
+            .from(sender)
+            .to(self.state.current_ping_pong_egld_address())
+            .gas(30_000_000u64)
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .pong_all()
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => println!("Pong All successful!"),
+            Err(err) => {
+                println!("Pong All failed with message: {}", err.message);
+                assert_eq!(message.unwrap_or_default(), err.message);
+            },
+        }
+    }
+
+    pub async fn get_user_addresses(&mut self) -> Vec<String> {
+        let response = self
+            .interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .get_user_addresses()
+            .returns(ReturnsResult)
+            .run()
+            .await;
+
+        let mut response_vec: Vec<String> = Vec::new();
+        for r in response.to_vec().into_vec() {
+            response_vec.push(r.as_managed_buffer().to_string());
+        }
+
+        response_vec
+    }
+
+    pub async fn get_contract_state(&mut self) -> ContractState<StaticApi> {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .get_contract_state()
+            .returns(ReturnsResult)
+            .run()
+            .await
+    }
+
+    pub async fn get_ping_amount(&mut self) -> RustBigUint {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .ping_amount()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn get_deadline(&mut self) -> u64 {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .deadline()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn get_activation_timestamp(&mut self) -> u64 {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .activation_timestamp()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn get_max_funds(&mut self) -> Option<RustBigUint> {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .max_funds()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn get_user_status(&mut self, user_id: usize) -> UserStatus {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .user_status(user_id)
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn pong_all_last_user(&mut self) -> usize {
+        self.interactor
+            .query()
+            .to(self.state.current_ping_pong_egld_address())
+            .typed(proxy_ping_pong_egld::PingPongProxy)
+            .pong_all_last_user()
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/interactor/src/interact_cli.rs b/contracts/examples/ping-pong-egld/interactor/src/interact_cli.rs
new file mode 100644
index 0000000000..700f6949f5
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/src/interact_cli.rs
@@ -0,0 +1,81 @@
+use clap::{Args, Parser, Subcommand};
+use multiversx_sc_snippets::imports::RustBigUint;
+
+/// Ping Pong Interact CLI
+#[derive(Default, PartialEq, Eq, Debug, Parser)]
+#[command(version, about)]
+#[command(propagate_version = true)]
+pub struct InteractCli {
+    #[command(subcommand)]
+    pub command: Option<InteractCliCommand>,
+}
+
+/// Ping Pong Interact CLI Commands
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum InteractCliCommand {
+    #[command(name = "deploy", about = "Deploy contract.")]
+    Deploy(DeployArgs),
+    #[command(name = "upgrade", about = "Upgrade contract.")]
+    Upgrade(DeployArgs),
+    #[command(
+        name = "ping",
+        about = "User sends some EGLD to be locked in the contract for a period of time."
+    )]
+    Ping(PingArgs),
+    #[command(name = "pong", about = "User can take back funds from the contract.")]
+    Pong,
+    #[command(name = "pong-all", about = "Send back funds to all users who pinged.")]
+    PongAll,
+    #[command(
+        name = "user-addresses",
+        about = "Lists the addresses of all users that have `ping`-ed in the order they have `ping`-ed."
+    )]
+    GetUserAddresses,
+    #[command(name = "contract-state", about = "Returns the current contract state.")]
+    GetContractState,
+    #[command(name = "ping-amount", about = "Returns the ping amount.")]
+    GetPingAmount,
+    #[command(name = "deadline", about = "Return deadline.")]
+    GetDeadline,
+    #[command(
+        name = "activation-timestamp",
+        about = "Block timestamp of the block where the contract got activated. If not specified in the constructor it is the the deploy block timestamp."
+    )]
+    GetActivationTimestamp,
+    #[command(name = "max-funds", about = "Optional funding cap.")]
+    GetMaxFunds,
+    #[command(name = "user-status", about = "State of user funds.")]
+    GetUserStatus(UserStatusArgs),
+    #[command(
+        name = "pong-all-last-user",
+        about = "`pongAll` status, the last user to be processed. 0 if never called `pongAll` or `pongAll` completed."
+    )]
+    PongAllLastUser,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct DeployArgs {
+    #[arg(short = 'p', long = "ping-amount")]
+    pub ping_amount: RustBigUint,
+
+    #[arg(short = 'd', long = "duration-in-seconds")]
+    pub duration_in_seconds: u64,
+
+    #[arg(short = 'a', long = "activation-timestamp")]
+    pub opt_activation_timestamp: Option<u64>,
+
+    #[arg(short = 'm', long = "max-funds")]
+    pub max_funds: Option<RustBigUint>,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct PingArgs {
+    #[arg(short = 'c', long = "cost", default_value = "50000000000000000")]
+    pub cost: Option<u64>,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct UserStatusArgs {
+    #[arg(short = 'i')]
+    pub id: usize,
+}
diff --git a/contracts/examples/ping-pong-egld/interactor/src/interact_config.rs b/contracts/examples/ping-pong-egld/interactor/src/interact_config.rs
new file mode 100644
index 0000000000..013e16714f
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/src/interact_config.rs
@@ -0,0 +1,49 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
+/// Ping Pong Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    pub gateway_uri: String,
+    pub chain_type: ChainType,
+}
+
+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()
+    }
+
+    pub fn chain_simulator_config() -> Self {
+        Config {
+            gateway_uri: "http://localhost:8085".to_owned(),
+            chain_type: ChainType::Simulator,
+        }
+    }
+
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
+    }
+}
diff --git a/contracts/examples/ping-pong-egld/interactor/src/interact_main.rs b/contracts/examples/ping-pong-egld/interactor/src/interact_main.rs
new file mode 100644
index 0000000000..1e090c46a4
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/src/interact_main.rs
@@ -0,0 +1,6 @@
+extern crate ping_pong_egld_interact;
+
+#[tokio::main]
+pub async fn main() {
+    ping_pong_egld_interact::ping_pong_egld_cli().await;
+}
diff --git a/contracts/examples/ping-pong-egld/interactor/src/interact_state.rs b/contracts/examples/ping-pong-egld/interactor/src/interact_state.rs
new file mode 100644
index 0000000000..38fb3d320c
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/src/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 {
+    ping_pong_egld_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 ping pong address
+    pub fn set_ping_pong_egld_address(&mut self, address: Bech32Address) {
+        self.ping_pong_egld_address = Some(address);
+    }
+
+    /// Returns the ping pong contract
+    pub fn current_ping_pong_egld_address(&self) -> &Bech32Address {
+        self.ping_pong_egld_address
+            .as_ref()
+            .expect("no known ping pong 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/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs b/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs
new file mode 100644
index 0000000000..f25bcfde12
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/interactor/tests/interact_cs_test.rs
@@ -0,0 +1,138 @@
+use multiversx_sc_snippets::imports::RustBigUint;
+use ping_pong_egld_interact::{Config, PingPongEgldInteract};
+
+#[tokio::test]
+#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
+async fn test_ping_pong_egld() {
+    let mut interact = PingPongEgldInteract::init(Config::chain_simulator_config()).await;
+    let wallet_address = interact.wallet_address.clone();
+    let ping_pong_owner_address = interact.ping_pong_owner_address.clone();
+
+    let ping_amount = 1u64;
+
+    // test_ping_unmatched_amount
+    let duration_in_seconds = 5u64;
+    let opt_activation_timestamp = 2u64;
+    let max_funds = 100_000u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            Some(opt_activation_timestamp),
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact
+        .ping(
+            0u64,
+            Some("the payment must match the fixed sum"),
+            &wallet_address,
+        )
+        .await;
+
+    // test_ping_inactive_contracts
+    let duration_in_seconds = 5u64;
+    let opt_activation_timestamp = 2_000_000_000u64;
+    let max_funds = 100_000u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            Some(opt_activation_timestamp),
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact
+        .ping(1u64, Some("smart contract not active yet"), &wallet_address)
+        .await;
+
+    // test_ping_passed_deadline
+    let duration_in_seconds = 5u64;
+    let opt_activation_timestamp = 2u64;
+    let max_funds = 100_000u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            Some(opt_activation_timestamp),
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact
+        .ping(1u64, Some("deadline has passed"), &wallet_address)
+        .await;
+
+    // test_ping_max_funds
+    let ping_amount = 10u64;
+    let duration_in_seconds = 30000u64;
+    let max_funds = 10u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            None,
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact
+        .ping(10u64, Some("smart contract full"), &wallet_address)
+        .await;
+
+    // test ping
+    let ping_amount = 1u64;
+    let duration_in_seconds = 20u64;
+    let max_funds = 100_000u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            None,
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact.ping(1u64, None, &wallet_address).await;
+    interact
+        .ping(1u64, Some("can only ping once"), &wallet_address)
+        .await;
+
+    assert_eq!(interact.get_ping_amount().await, RustBigUint::from(1u64));
+
+    interact
+        .pong(Some("can't withdraw before deadline"), &wallet_address)
+        .await;
+
+    interact.pong(None, &wallet_address).await;
+
+    // test_pong_all
+    let ping_amount = 1u64;
+    let duration_in_seconds = 18u64;
+    let max_funds = 100_000u64;
+
+    interact
+        .deploy(
+            ping_amount.into(),
+            duration_in_seconds,
+            None,
+            multiversx_sc_snippets::imports::OptionalValue::Some(max_funds.into()),
+        )
+        .await;
+
+    interact.ping(1u64, None, &ping_pong_owner_address).await;
+
+    interact.ping(1u64, None, &wallet_address).await;
+
+    interact.pong_all(None, &ping_pong_owner_address).await;
+    interact
+        .pong(Some("already withdrawn"), &wallet_address)
+        .await;
+}
diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml
index 67146b70af..e9f510b457 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/ping-pong-egld/sc-config.toml b/contracts/examples/ping-pong-egld/sc-config.toml
new file mode 100644
index 0000000000..2a4a6ee147
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/sc-config.toml
@@ -0,0 +1,2 @@
+[[proxy]]
+path = "src/ping_pong_egld_proxy.rs"
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 9253cff4f8..baf1753018 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": "3,500,000",
+                "gasLimit": "4,500,000",
                 "gasPrice": "0"
             },
             "expect": {
diff --git a/contracts/examples/ping-pong-egld/src/ping_pong.rs b/contracts/examples/ping-pong-egld/src/ping_pong.rs
index 683c2a2ed5..abecb0dbcc 100644
--- a/contracts/examples/ping-pong-egld/src/ping_pong.rs
+++ b/contracts/examples/ping-pong-egld/src/ping_pong.rs
@@ -2,9 +2,10 @@
 
 use multiversx_sc::imports::*;
 
-mod user_status;
+pub mod proxy_ping_pong_egld;
+mod types;
 
-use user_status::UserStatus;
+use types::{ContractState, UserStatus};
 
 /// Derived empirically.
 const PONG_ALL_LOW_GAS_LIMIT: u64 = 3_000_000;
@@ -25,9 +26,9 @@ const PONG_ALL_LOW_GAS_LIMIT: u64 = 3_000_000;
 #[multiversx_sc::contract]
 pub trait PingPong {
     /// Necessary configuration when deploying:
-    /// `ping_amount` - the exact EGLD amounf that needs to be sent when `ping`-ing.
+    /// `ping_amount` - the exact EGLD amount that needs to be sent when `ping`-ing.
     /// `duration_in_seconds` - how much time (in seconds) until contract expires.
-    /// `opt_activation_timestamp` - optionally specify the contract to only actvivate at a later date.
+    /// `opt_activation_timestamp` - optionally specify the contract to only activate at a later date.
     /// `max_funds` - optional funding cap, no more funds than this can be added to the contract.
     #[allow_multiple_var_args]
     #[init]
@@ -48,7 +49,20 @@ pub trait PingPong {
     }
 
     #[upgrade]
-    fn upgrade(&self) {}
+    fn upgrade(
+        &self,
+        ping_amount: &BigUint,
+        duration_in_seconds: u64,
+        opt_activation_timestamp: Option<u64>,
+        max_funds: OptionalValue<BigUint>,
+    ) {
+        self.init(
+            ping_amount,
+            duration_in_seconds,
+            opt_activation_timestamp,
+            max_funds,
+        )
+    }
 
     /// User sends some EGLD to be locked in the contract for a period of time.
     /// Optional `_data` argument is ignored.
@@ -98,6 +112,8 @@ pub trait PingPong {
                 sc_panic!("already withdrawn")
             },
         }
+
+        self.ping_event(&caller, &payment);
     }
 
     fn pong_by_user_id(&self, user_id: usize) -> Result<(), &'static str> {
@@ -108,7 +124,8 @@ pub trait PingPong {
                 self.user_status(user_id).set(UserStatus::Withdrawn);
                 if let Some(user_address) = self.user_mapper().get_user_address(user_id) {
                     let amount = self.ping_amount().get();
-                    self.tx().to(user_address).egld(amount).transfer();
+                    self.tx().to(&user_address).egld(&amount).transfer();
+                    self.pong_event(&user_address, &amount);
                     Result::Ok(())
                 } else {
                     Result::Err("unknown user")
@@ -142,24 +159,27 @@ pub trait PingPong {
     /// Can only be called after expiration.
     #[endpoint(pongAll)]
     fn pong_all(&self) -> OperationCompletionStatus {
+        let now = self.blockchain().get_block_timestamp();
         require!(
-            self.blockchain().get_block_timestamp() >= self.deadline().get(),
+            now >= self.deadline().get(),
             "can't withdraw before deadline"
         );
 
         let num_users = self.user_mapper().get_user_count();
         let mut pong_all_last_user = self.pong_all_last_user().get();
+        let mut status = OperationCompletionStatus::InterruptedBeforeOutOfGas;
         loop {
             if pong_all_last_user >= num_users {
                 // clear field and reset to 0
                 pong_all_last_user = 0;
                 self.pong_all_last_user().set(pong_all_last_user);
-                return OperationCompletionStatus::Completed;
+                status = OperationCompletionStatus::Completed;
+                break;
             }
 
             if self.blockchain().get_gas_left() < PONG_ALL_LOW_GAS_LIMIT {
                 self.pong_all_last_user().set(pong_all_last_user);
-                return OperationCompletionStatus::InterruptedBeforeOutOfGas;
+                break;
             }
 
             pong_all_last_user += 1;
@@ -167,6 +187,10 @@ pub trait PingPong {
             // in case of error just ignore the error and skip
             let _ = self.pong_by_user_id(pong_all_last_user);
         }
+
+        self.pong_all_event(now, &status, pong_all_last_user);
+
+        status
     }
 
     /// Lists the addresses of all users that have `ping`-ed,
@@ -176,6 +200,19 @@ pub trait PingPong {
         self.user_mapper().get_all_addresses().into()
     }
 
+    /// Returns the current contract state as a struct
+    /// for faster fetching from external parties
+    #[view(getContractState)]
+    fn get_contract_state(&self) -> ContractState<Self::Api> {
+        ContractState {
+            ping_amount: self.ping_amount().get(),
+            deadline: self.deadline().get(),
+            activation_timestamp: self.activation_timestamp().get(),
+            max_funds: self.max_funds().get(),
+            pong_all_last_user: self.pong_all_last_user().get(),
+        }
+    }
+
     // storage
 
     #[view(getPingAmount)]
@@ -209,8 +246,27 @@ pub trait PingPong {
     fn user_status(&self, user_id: usize) -> SingleValueMapper<UserStatus>;
 
     /// Part of the `pongAll` status, the last user to be processed.
-    /// 0 if never called `pongAll` or `pongAll` completed..
+    /// 0 if never called `pongAll` or `pongAll` completed.
     #[view(pongAllLastUser)]
     #[storage_mapper("pongAllLastUser")]
     fn pong_all_last_user(&self) -> SingleValueMapper<usize>;
+
+    // events
+
+    /// Signals a successful ping by user with amount
+    #[event]
+    fn ping_event(&self, #[indexed] caller: &ManagedAddress, pinged_amount: &BigUint);
+
+    /// Signals a successful pong by user with amount
+    #[event]
+    fn pong_event(&self, #[indexed] caller: &ManagedAddress, ponged_amount: &BigUint);
+
+    /// Signals the beginning of the pong_all operation, status and last user
+    #[event]
+    fn pong_all_event(
+        &self,
+        #[indexed] timestamp: u64,
+        #[indexed] status: &OperationCompletionStatus,
+        #[indexed] pong_all_last_user: usize,
+    );
 }
diff --git a/contracts/examples/ping-pong-egld/src/proxy_ping_pong_egld.rs b/contracts/examples/ping-pong-egld/src/proxy_ping_pong_egld.rs
new file mode 100644
index 0000000000..ad8944411b
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/src/proxy_ping_pong_egld.rs
@@ -0,0 +1,263 @@
+// 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 PingPongProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for PingPongProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = PingPongProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        PingPongProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct PingPongProxyMethods<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> PingPongProxyMethods<Env, From, (), Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Necessary configuration when deploying: 
+    /// `ping_amount` - the exact EGLD amount that needs to be sent when `ping`-ing. 
+    /// `duration_in_seconds` - how much time (in seconds) until contract expires. 
+    /// `opt_activation_timestamp` - optionally specify the contract to only activate at a later date. 
+    /// `max_funds` - optional funding cap, no more funds than this can be added to the contract. 
+    pub fn init<
+        Arg0: ProxyArg<BigUint<Env::Api>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<Option<u64>>,
+        Arg3: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        ping_amount: Arg0,
+        duration_in_seconds: Arg1,
+        opt_activation_timestamp: Arg2,
+        max_funds: Arg3,
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_deploy()
+            .argument(&ping_amount)
+            .argument(&duration_in_seconds)
+            .argument(&opt_activation_timestamp)
+            .argument(&max_funds)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PingPongProxyMethods<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>>,
+        Arg1: ProxyArg<u64>,
+        Arg2: ProxyArg<Option<u64>>,
+        Arg3: ProxyArg<OptionalValue<BigUint<Env::Api>>>,
+    >(
+        self,
+        ping_amount: Arg0,
+        duration_in_seconds: Arg1,
+        opt_activation_timestamp: Arg2,
+        max_funds: Arg3,
+    ) -> TxTypedUpgrade<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_upgrade()
+            .argument(&ping_amount)
+            .argument(&duration_in_seconds)
+            .argument(&opt_activation_timestamp)
+            .argument(&max_funds)
+            .original_result()
+    }
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> PingPongProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// User sends some EGLD to be locked in the contract for a period of time. 
+    /// Optional `_data` argument is ignored. 
+    pub fn ping<
+        Arg0: ProxyArg<IgnoreValue>,
+    >(
+        self,
+        _data: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("ping")
+            .argument(&_data)
+            .original_result()
+    }
+
+    /// User can take back funds from the contract. 
+    /// Can only be called after expiration. 
+    pub fn pong(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pong")
+            .original_result()
+    }
+
+    /// Send back funds to all users who pinged. 
+    /// Returns 
+    /// - `completed` if everything finished 
+    /// - `interrupted` if run out of gas midway. 
+    /// Can only be called after expiration. 
+    pub fn pong_all(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, OperationCompletionStatus> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pongAll")
+            .original_result()
+    }
+
+    /// Lists the addresses of all users that have `ping`-ed, 
+    /// in the order they have `ping`-ed 
+    pub fn get_user_addresses(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, MultiValueEncoded<Env::Api, ManagedAddress<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getUserAddresses")
+            .original_result()
+    }
+
+    /// Returns the current contract state as a struct 
+    /// for faster fetching from external parties 
+    pub fn get_contract_state(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ContractState<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getContractState")
+            .original_result()
+    }
+
+    pub fn ping_amount(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getPingAmount")
+            .original_result()
+    }
+
+    pub fn deadline(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getDeadline")
+            .original_result()
+    }
+
+    /// Block timestamp of the block where the contract got activated. 
+    /// If not specified in the constructor it is the the deploy block timestamp. 
+    pub fn activation_timestamp(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, u64> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getActivationTimestamp")
+            .original_result()
+    }
+
+    /// Optional funding cap. 
+    pub fn max_funds(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, Option<BigUint<Env::Api>>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getMaxFunds")
+            .original_result()
+    }
+
+    /// State of user funds. 
+    /// 0 - user unknown, never `ping`-ed 
+    /// 1 - `ping`-ed 
+    /// 2 - `pong`-ed 
+    pub fn user_status<
+        Arg0: ProxyArg<usize>,
+    >(
+        self,
+        user_id: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, UserStatus> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getUserStatus")
+            .argument(&user_id)
+            .original_result()
+    }
+
+    /// Part of the `pongAll` status, the last user to be processed. 
+    /// 0 if never called `pongAll` or `pongAll` completed. 
+    pub fn pong_all_last_user(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, usize> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("pongAllLastUser")
+            .original_result()
+    }
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, Default)]
+pub struct ContractState<Api>
+where
+    Api: ManagedTypeApi,
+{
+    pub ping_amount: BigUint<Api>,
+    pub deadline: u64,
+    pub activation_timestamp: u64,
+    pub max_funds: Option<BigUint<Api>>,
+    pub pong_all_last_user: usize,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)]
+pub enum UserStatus {
+    New,
+    Registered,
+    Withdrawn,
+}
diff --git a/contracts/examples/ping-pong-egld/src/types.rs b/contracts/examples/ping-pong-egld/src/types.rs
new file mode 100644
index 0000000000..e83cc714d3
--- /dev/null
+++ b/contracts/examples/ping-pong-egld/src/types.rs
@@ -0,0 +1,20 @@
+use multiversx_sc::derive_imports::*;
+use multiversx_sc::imports::*;
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, PartialEq, Eq, Clone, Copy)]
+pub enum UserStatus {
+    New,
+    Registered,
+    Withdrawn,
+}
+
+#[type_abi]
+#[derive(TopEncode, TopDecode, Default)]
+pub struct ContractState<M: ManagedTypeApi> {
+    pub ping_amount: BigUint<M>,
+    pub deadline: u64,
+    pub activation_timestamp: u64,
+    pub max_funds: Option<BigUint<M>>,
+    pub pong_all_last_user: usize,
+}
diff --git a/contracts/examples/ping-pong-egld/src/user_status.rs b/contracts/examples/ping-pong-egld/src/user_status.rs
deleted file mode 100644
index 291981b0d7..0000000000
--- a/contracts/examples/ping-pong-egld/src/user_status.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use multiversx_sc::derive_imports::*;
-
-#[derive(TopEncode, TopDecode, TypeAbi, PartialEq, Eq, Clone, Copy)]
-pub enum UserStatus {
-    New,
-    Registered,
-    Withdrawn,
-}
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 55a8e591eb..adc8c72823 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
@@ -3,6 +3,7 @@ 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",
         ping_pong_egld::ContractBuilder,
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
index 085e3662e3..39f7b830d9 100755
--- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock
+++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml
index 83687c3d59..8490af4956 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/ping-pong-egld/wasm/src/lib.rs b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
index 35bade6af2..ece506bfb5 100644
--- a/contracts/examples/ping-pong-egld/wasm/src/lib.rs
+++ b/contracts/examples/ping-pong-egld/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           10
+// Endpoints:                           11
 // Async Callback (empty):               1
-// Total number of exported functions:  13
+// Total number of exported functions:  14
 
 #![no_std]
 
@@ -24,6 +24,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         pong => pong
         pongAll => pong_all
         getUserAddresses => get_user_addresses
+        getContractState => get_contract_state
         getPingAmount => ping_amount
         getDeadline => deadline
         getActivationTimestamp => activation_timestamp
diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml
index 246ee5b4a7..6b31c0b665 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 9bca86a46c..36cadd068a 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 08a9f92276..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
@@ -2,6 +2,7 @@ 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/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock
index d33e8125d2..9dd2b78d63 100644
--- a/contracts/examples/proxy-pause/wasm/Cargo.lock
+++ b/contracts/examples/proxy-pause/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml
index 8c994c7c14..f46b6f1349 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml
index fddde77717..a524d3e407 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml
index b1e22b9dfb..2d28b1a2b4 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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..634b565e19 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");
@@ -21,6 +21,7 @@ const NFT_TOKEN_ID: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456")
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/examples/rewards-distribution");
     blockchain.register_contract(
         REWARDS_DISTRIBUTION_PATH,
         rewards_distribution::ContractBuilder,
@@ -31,7 +32,6 @@ fn world() -> ScenarioWorld {
 
 struct RewardsDistributionTestState {
     world: ScenarioWorld,
-    rewards_distribution_whitebox: WhiteboxContract<ContractObj<DebugApi>>,
 }
 
 impl RewardsDistributionTestState {
@@ -40,15 +40,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 +102,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 +134,7 @@ fn test_compute_brackets() {
                 assert_eq!(computed.end_index, expected_end_index);
                 assert_eq!(computed.nft_reward_percent, expected_reward_percent);
             }
-        },
-    );
+        });
 }
 
 #[test]
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock
index 990bc12932..6b475e4806 100644
--- a/contracts/examples/rewards-distribution/wasm/Cargo.lock
+++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -164,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml
index 2b3fac1179..5ed1862f41 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.54.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 53876394da..35a4ec76df 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.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 5a8074c0db..585935d7b9 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
index 3c8deb8654..3782f6ea34 100644
--- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock
+++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -164,9 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml
index 340ba97094..e21f5645c9 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml
index c1ba1df21b..b5c7705084 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml
index 84ac14c44e..8e26ae4672 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 eefa11be57..472b62b21b 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
@@ -3,6 +3,7 @@ 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",
         token_release::ContractBuilder,
diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock
index cd23f828b3..1c39137e80 100644
--- a/contracts/examples/token-release/wasm/Cargo.lock
+++ b/contracts/examples/token-release/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +150,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml
index 7319a42fd4..abe534438c 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.54.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 027dfac08b..bd54e4f448 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.54.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.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 6ae05ee649..7aca01a3f4 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.54.1"
         }
     },
     "docs": [
@@ -110,6 +110,7 @@
         },
         {
             "name": "multi_result_3",
+            "title": "result-3",
             "mutability": "mutable",
             "inputs": [],
             "outputs": [
@@ -389,6 +390,21 @@
                 }
             ]
         },
+        {
+            "name": "takes_object_with_managed_buffer_read_to_end",
+            "mutability": "readonly",
+            "inputs": [
+                {
+                    "name": "arg",
+                    "type": "AbiWithManagedBufferReadToEnd"
+                }
+            ],
+            "outputs": [
+                {
+                    "type": "bytes"
+                }
+            ]
+        },
         {
             "name": "payable_egld",
             "mutability": "mutable",
@@ -608,6 +624,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 42a3f8ce11..75c6fd957f 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.54.1"
         }
     },
     "docs": [
@@ -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/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml
index c3c57257c9..269859fb94 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/abi-tester/src/abi_proxy.rs b/contracts/feature-tests/abi-tester/src/abi_proxy.rs
index 77604821e3..c13a4a4e2d 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, ManagedBuffer<Env::Api>> {
+        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..9405fa28a0 100644
--- a/contracts/feature-tests/abi-tester/src/abi_tester.rs
+++ b/contracts/feature-tests/abi-tester/src/abi_tester.rs
@@ -58,6 +58,7 @@ pub trait AbiTester {
     fn take_managed_type(&self, _arg: AbiManagedType<Self::Api>) {}
 
     #[endpoint]
+    #[title("result-3")]
     #[output_name("multi-result-1")]
     #[output_name("multi-result-2")]
     #[output_name("multi-result-3")]
@@ -172,6 +173,14 @@ pub trait AbiTester {
         OperationCompletionStatus::Completed
     }
 
+    #[view]
+    fn takes_object_with_managed_buffer_read_to_end(
+        &self,
+        arg: AbiWithManagedBufferReadToEnd<Self::Api>,
+    ) -> ManagedBuffer {
+        arg.flush.into_managed_buffer()
+    }
+
     #[endpoint]
     #[payable("EGLD")]
     fn payable_egld(&self) {}
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 d4114d316a..0f11fba427 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,7 +12,8 @@ use multiversx_sc_scenario::ScenarioWorld;
 
 #[test]
 fn abi_tester_abi_generated_ok() {
-    let blockchain = ScenarioWorld::new();
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/abi-tester");
 
     // generate ABI
     let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
@@ -70,7 +71,8 @@ fn abi_tester_esdt_attr_abi_generated_ok() {
 
 #[test]
 fn check_multi_contract_config() {
-    let blockchain = ScenarioWorld::new();
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/abi-tester");
 
     let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
         abi_tester::AbiProvider,
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..ac2f5d3c05 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,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..0bd4b79a48 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
index 4a3e94486a..db93a4024b 100755
--- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock
@@ -19,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml
index d971ff25af..d1e9b3773e 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml
index 2fb244e98a..e9591b8ce5 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.54.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 37bd572058..ebfb16b355 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 3d3c798e44..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
@@ -2,6 +2,7 @@ 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/alloc-features/wasm-alloc-mem-fail/Cargo.lock b/contracts/feature-tests/alloc-features/wasm-alloc-mem-fail/Cargo.lock
index 2104e47dde..b80c031bae 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,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..8448b502f8 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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..a5682de458 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,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..0a9a5b8bca 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
index d9238591c2..90ddaf8bd3 100644
--- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock
@@ -19,15 +19,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml
index 76acffc2a6..721bbc9597 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.54.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 04715b2402..f7d5acdb63 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.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 6dc1db1562..94414df807 100644
--- a/contracts/feature-tests/basic-features/interact/Cargo.toml
+++ b/contracts/feature-tests/basic-features/interact/Cargo.toml
@@ -1,22 +1,29 @@
 [package]
 name = "basic-features-interact"
 version = "0.0.0"
-authors = ["Ovidiu Stinga <ovidiu.stinga@multiversx.com>"]
+authors = ["MultiversX <contact@multiversx.com>"]
 edition = "2021"
 publish = false
 
 [[bin]]
 name = "basic-features-interact"
+path = "src/bf_interact_main.rs"
+
+[lib]
 path = "src/bf_interact.rs"
 
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.24" }
 toml = "0.8.6"
 
 [dependencies.basic-features]
 path = ".."
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/snippets"
+
+[features]
+chain-simulator-tests = []
diff --git a/contracts/feature-tests/basic-features/interact/config.toml b/contracts/feature-tests/basic-features/interact/config.toml
index 61ac8dbf87..f41675eb42 100644
--- a/contracts/feature-tests/basic-features/interact/config.toml
+++ b/contracts/feature-tests/basic-features/interact/config.toml
@@ -1 +1,5 @@
-gateway = 'https://devnet-gateway.multiversx.com'
+chain_type = 'real'
+gateway_uri = 'https://devnet-gateway.multiversx.com'
+
+# chain_type = 'simulator'
+# gateway_uri = 'http://localhost:8085'
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 e8f269cb71..665fa24fc8 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs
@@ -3,7 +3,7 @@ mod bf_interact_config;
 mod bf_interact_state;
 
 use basic_features::basic_features_proxy;
-use bf_interact_config::Config;
+pub use bf_interact_config::Config;
 use bf_interact_state::State;
 use clap::Parser;
 
@@ -11,62 +11,81 @@ use multiversx_sc_snippets::imports::*;
 
 const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
 
-#[tokio::main]
-async fn main() {
+const CODE_EXPR_STORAGE_BYTES: MxscPath =
+    MxscPath::new("../output/basic-features-storage-bytes.mxsc.json");
+
+const CODE_EXPR: MxscPath = MxscPath::new("../output/basic-features.mxsc.json");
+const CODE_CRYPTO_EXPR: MxscPath = MxscPath::new("../output/basic-features-crypto.mxsc.json");
+
+pub async fn basic_features_cli() {
     env_logger::init();
 
-    let mut bf_interact = BasicFeaturesInteract::init().await;
+    let config = Config::load_config();
+
+    let mut bf_interact = BasicFeaturesInteract::init(config).await;
 
     let cli = bf_interact_cli::InteractCli::parse();
     match &cli.command {
         Some(bf_interact_cli::InteractCliCommand::Deploy) => {
             bf_interact.deploy().await;
         },
+        Some(bf_interact_cli::InteractCliCommand::DeployStorageBytes) => {
+            bf_interact.deploy_storage_bytes().await;
+        },
+        Some(bf_interact_cli::InteractCliCommand::DeployCrypto) => {
+            bf_interact.deploy_crypto().await;
+        },
         Some(bf_interact_cli::InteractCliCommand::LargeStorage(args)) => {
             bf_interact.large_storage(args.size_kb).await;
         },
+        Some(bf_interact_cli::InteractCliCommand::ReturnsEGLDDecimals(args)) => {
+            bf_interact.returns_egld_decimal(args.egld).await;
+        },
+        Some(bf_interact_cli::InteractCliCommand::EchoManagedOption(args)) => {
+            let mo = match args.managed_option {
+                Some(value) => ManagedOption::some(BigUint::from(value)),
+                None => ManagedOption::none(),
+            };
+            bf_interact.echo_managed_option(mo).await;
+        },
         None => {},
     }
 }
 
-#[allow(unused)]
-struct BasicFeaturesInteract {
-    interactor: Interactor,
-    wallet_address: Bech32Address,
-    code_expr: BytesValue,
-    state: State,
-    large_storage_payload: Vec<u8>,
+pub struct BasicFeaturesInteract {
+    pub interactor: Interactor,
+    pub wallet_address: Bech32Address,
+    pub state: State,
+    pub large_storage_payload: Vec<u8>,
 }
 
 impl BasicFeaturesInteract {
-    async fn init() -> Self {
-        let config = Config::load_config();
-        let mut interactor = Interactor::new(config.gateway())
+    pub async fn init(config: Config) -> Self {
+        let mut interactor = Interactor::new(config.gateway_uri())
             .await
+            .use_chain_simulator(config.use_chain_simulator())
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
-        let wallet_address = interactor.register_wallet(test_wallets::mike());
-        let code_expr = BytesValue::interpret_from(
-            "mxsc:../output/basic-features-storage-bytes.mxsc.json",
-            &InterpreterContext::default(),
-        );
+        interactor
+            .set_current_dir_from_workspace("contracts/feature-tests/basic-features/interact");
+        let wallet_address = interactor.register_wallet(test_wallets::mike()).await;
+
+        interactor.generate_blocks_until_epoch(1).await.unwrap();
 
         Self {
             interactor,
             wallet_address: wallet_address.into(),
-            code_expr,
             state: State::load_state(),
             large_storage_payload: Vec::new(),
         }
     }
 
-    async fn large_storage(&mut self, size_kb: usize) {
+    pub async fn large_storage(&mut self, size_kb: usize) {
         let large_data = std::fs::read_to_string("pi.txt").unwrap().into_bytes();
         let payload = &large_data[0..size_kb * 1024];
         println!("payload size: {}", payload.len());
-        self.set_large_storage(payload).await;
         self.large_storage_payload = payload.to_vec();
-        self.print_length().await;
+        self.set_large_storage(payload).await;
     }
 
     async fn set_state(&mut self) {
@@ -74,59 +93,217 @@ impl BasicFeaturesInteract {
         self.interactor.retrieve_account(&self.wallet_address).await;
     }
 
-    async fn deploy(&mut self) {
+    pub async fn deploy(&mut self) {
         self.set_state().await;
 
         let new_address = self
             .interactor
             .tx()
             .from(&self.wallet_address)
+            .gas(400_000_000)
             .typed(basic_features_proxy::BasicFeaturesProxy)
             .init()
-            .code(&self.code_expr)
-            .gas(NumExpr("4,000,000"))
+            .code(CODE_EXPR)
             .returns(ReturnsNewBech32Address)
-            .prepare_async()
             .run()
             .await;
 
-        println!("new address: {new_address}");
+        println!("new address for basic-features: {new_address}");
 
         self.state.set_bf_address(new_address);
     }
 
-    async fn set_large_storage(&mut self, value: &[u8]) {
+    pub async fn deploy_storage_bytes(&mut self) {
+        self.set_state().await;
+
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .gas(4_000_000)
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .init()
+            .code(CODE_EXPR_STORAGE_BYTES)
+            .returns(ReturnsNewBech32Address)
+            .run()
+            .await;
+
+        println!("new address for basic-features-storage-bytes: {new_address}");
+
+        self.state.set_bf_address_storage_bytes(new_address);
+    }
+
+    pub async fn deploy_crypto(&mut self) {
+        self.set_state().await;
+
+        let new_address = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .gas(40_000_000)
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .init()
+            .code(CODE_CRYPTO_EXPR)
+            .returns(ReturnsNewBech32Address)
+            .run()
+            .await;
+
+        println!("new address for basic-features-cyrpto: {new_address}");
+
+        self.state.set_bf_address_crypto(new_address);
+    }
+
+    pub async fn set_large_storage(&mut self, value: &[u8]) {
         self.interactor
             .tx()
             .from(&self.wallet_address)
-            .to(self.state.bf_contract())
-            .gas(NumExpr("600,000,000"))
+            .to(self.state.bf_storage_bytes_contract())
+            .gas(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) {
+    pub async fn get_large_storage(&mut self) -> Vec<u8> {
         let data_raw = self
             .interactor
             .query()
-            .to(self.state.bf_contract())
+            .to(self.state.bf_storage_bytes_contract())
             .typed(basic_features_proxy::BasicFeaturesProxy)
             .load_bytes()
             .returns(ReturnsResult)
-            .prepare_async()
             .run()
             .await;
 
-        let data = data_raw.to_vec();
+        data_raw.to_vec()
+    }
+
+    pub async fn returns_egld_decimal(
+        &mut self,
+        egld: u64,
+    ) -> ManagedDecimal<StaticApi, ConstDecimals<18>> {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_contract())
+            .gas(10_000_000)
+            .typed(basic_features_proxy::BasicFeaturesProxy)
+            .returns_egld_decimal()
+            .egld(egld)
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn echo_managed_option(
+        &mut self,
+        mo: ManagedOption<StaticApi, BigUint<StaticApi>>,
+    ) -> Option<RustBigUint> {
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_contract())
+            .gas(10_000_000)
+            .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+            .echo_managed_option(mo)
+            .returns(ReturnsResultUnmanaged)
+            .run()
+            .await
+    }
+
+    pub async fn verify_secp256r1_signature(
+        &mut self,
+        key: &ManagedBuffer<StaticApi>,
+        message: &ManagedBuffer<StaticApi>,
+        signature: &ManagedBuffer<StaticApi>,
+        err_msg: Option<&str>,
+    ) {
+        let response = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_crypto_contract())
+            .gas(10_000_000)
+            .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+            .verify_secp256r1_signature(key, message, signature)
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => println!("Message verified successfully for secp256r1 signature."),
+            Err(err) => {
+                println!(
+                    "Verify secp256r1 signature failed with message: {}",
+                    err.message
+                );
+                assert_eq!(err_msg.unwrap_or_default(), err.message);
+            },
+        }
+    }
+
+    pub async fn verify_bls_signature_share(
+        &mut self,
+        key: &ManagedBuffer<StaticApi>,
+        message: &ManagedBuffer<StaticApi>,
+        signature: &ManagedBuffer<StaticApi>,
+        err_msg: Option<&str>,
+    ) {
+        let response = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_crypto_contract())
+            .gas(10_000_000)
+            .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+            .verify_bls_signature_share(key, message, signature)
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
+
+        match response {
+            Ok(_) => println!("Message verified successfully for BLS signature share."),
+            Err(err) => {
+                println!(
+                    "Verify BLS signature share signature failed with message: {}",
+                    err.message
+                );
+                assert_eq!(err_msg.unwrap_or_default(), err.message);
+            },
+        }
+    }
+
+    pub async fn verify_bls_aggregated_signature(
+        &mut self,
+        key: ManagedVec<StaticApi, ManagedBuffer<StaticApi>>,
+        message: &ManagedBuffer<StaticApi>,
+        signature: &ManagedBuffer<StaticApi>,
+        err_msg: Option<&str>,
+    ) {
+        let response = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(self.state.bf_crypto_contract())
+            .gas(10_000_000)
+            .typed(basic_features::basic_features_proxy::BasicFeaturesProxy)
+            .verify_bls_aggregated_signature(key, message, signature)
+            .returns(ReturnsHandledOrError::new())
+            .run()
+            .await;
 
-        println!("retrieved data length: {}", data.len());
-        if data != self.large_storage_payload {
-            println!("WARNING! Payload mismatch!");
+        match response {
+            Ok(_) => println!("Message verified successfully for BLS aggregated signature share."),
+            Err(err) => {
+                println!(
+                    "Verify BLS aggregated signature failed with message: {}",
+                    err.message
+                );
+                assert_eq!(err_msg.unwrap_or_default(), err.message);
+            },
         }
     }
 }
diff --git a/contracts/feature-tests/basic-features/interact/src/bf_interact_cli.rs b/contracts/feature-tests/basic-features/interact/src/bf_interact_cli.rs
index 1ee730d691..6b76b2a37c 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact_cli.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact_cli.rs
@@ -1,6 +1,6 @@
 use clap::{Args, Parser, Subcommand};
 
-/// Adder Interact CLI
+/// Basic Features Interact CLI
 #[derive(Default, PartialEq, Eq, Debug, Parser)]
 #[command(version, about)]
 #[command(propagate_version = true)]
@@ -9,13 +9,33 @@ pub struct InteractCli {
     pub command: Option<InteractCliCommand>,
 }
 
-/// Adder Interact CLI Commands
+/// Basic Features Interact CLI Commands
 #[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
 pub enum InteractCliCommand {
-    #[command(name = "deploy", about = "Experiment with large storage")]
+    #[command(name = "deploy", about = "Deploys basic-features contract")]
     Deploy,
-    #[command(name = "large-storage", about = "Experiment with large storage")]
+    #[command(
+        name = "deploy-storage-bytes",
+        about = "Deploys storage-bytes contract variant"
+    )]
+    DeployStorageBytes,
+    #[command(name = "deploy-crypto", about = "Deploys crypto contract variant")]
+    DeployCrypto,
+    #[command(
+        name = "large-storage",
+        about = "Experiment with large storage on storage-bytes contract variant"
+    )]
     LargeStorage(LargeStorageArgs),
+    #[command(
+        name = "egld-decimals",
+        about = "Experiment with returns_egld_decimals on basic-features contract"
+    )]
+    ReturnsEGLDDecimals(ReturnsEGLDDecimalsArgs),
+    #[command(
+        name = "echo-mo",
+        about = "Experiment with echo_managed_option on basic-features contract"
+    )]
+    EchoManagedOption(EchoManagedOptionArgs),
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -24,3 +44,17 @@ pub struct LargeStorageArgs {
     #[arg(long = "kb")]
     pub size_kb: usize,
 }
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct ReturnsEGLDDecimalsArgs {
+    /// The amount of EGLD
+    #[arg(short = 'e')]
+    pub egld: u64,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct EchoManagedOptionArgs {
+    /// The value of ManagedOption
+    #[arg(short = 'm')]
+    pub managed_option: Option<u64>,
+}
diff --git a/contracts/feature-tests/basic-features/interact/src/bf_interact_config.rs b/contracts/feature-tests/basic-features/interact/src/bf_interact_config.rs
index e17d0cbe65..bd19da629d 100644
--- a/contracts/feature-tests/basic-features/interact/src/bf_interact_config.rs
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact_config.rs
@@ -4,10 +4,18 @@ use std::io::Read;
 /// Config file
 const CONFIG_FILE: &str = "config.toml";
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
 /// Adder Interact configuration
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    gateway: String,
+    pub gateway_uri: String,
+    pub chain_type: ChainType,
 }
 
 impl Config {
@@ -19,8 +27,23 @@ impl Config {
         toml::from_str(&content).unwrap()
     }
 
-    // Returns the gateway
-    pub fn gateway(&self) -> &str {
-        &self.gateway
+    pub fn chain_simulator_config() -> Self {
+        Config {
+            gateway_uri: "http://localhost:8085".to_owned(),
+            chain_type: ChainType::Simulator,
+        }
+    }
+
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
     }
 }
diff --git a/contracts/feature-tests/basic-features/interact/src/bf_interact_main.rs b/contracts/feature-tests/basic-features/interact/src/bf_interact_main.rs
new file mode 100644
index 0000000000..5029ec28a7
--- /dev/null
+++ b/contracts/feature-tests/basic-features/interact/src/bf_interact_main.rs
@@ -0,0 +1,6 @@
+extern crate basic_features_interact;
+
+#[tokio::main]
+pub async fn main() {
+    basic_features_interact::basic_features_cli().await;
+}
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 9df12fa02b..b8c50a8f53 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
@@ -8,10 +8,12 @@ use std::{
 /// State file
 const STATE_FILE: &str = "state.toml";
 
-/// Multisig Interact state
+/// Basic Features Interact state
 #[derive(Debug, Default, Serialize, Deserialize)]
 pub struct State {
+    bf_address_storage_bytes: Option<Bech32Address>,
     bf_address: Option<Bech32Address>,
+    bf_address_crypto: Option<Bech32Address>,
 }
 
 impl State {
@@ -27,12 +29,36 @@ impl State {
         }
     }
 
-    /// Sets the contract address
+    /// Sets the contract address for basic-features-storage-bytes
+    pub fn set_bf_address_storage_bytes(&mut self, address: Bech32Address) {
+        self.bf_address_storage_bytes = Some(address);
+    }
+
+    /// Sets the contract address for basic-features-crypto
+    pub fn set_bf_address_crypto(&mut self, address: Bech32Address) {
+        self.bf_address_crypto = Some(address);
+    }
+
+    /// Sets the contract address for basic-features
     pub fn set_bf_address(&mut self, address: Bech32Address) {
         self.bf_address = Some(address);
     }
 
-    /// Returns the contract
+    /// Returns basic-features-storage-bytes contract
+    pub fn bf_storage_bytes_contract(&self) -> &Bech32Address {
+        self.bf_address_storage_bytes
+            .as_ref()
+            .expect("basic-features-storage-bytes contract not yet deployed")
+    }
+
+    /// Returns basic-features-storage-bytes contract
+    pub fn bf_crypto_contract(&self) -> &Bech32Address {
+        self.bf_address_crypto
+            .as_ref()
+            .expect("basic-features-crypto contract not yet deployed")
+    }
+
+    /// Returns basic-features contract
     pub fn bf_contract(&self) -> &Bech32Address {
         self.bf_address
             .as_ref()
diff --git a/contracts/feature-tests/basic-features/interact/tests/bf_interact_cs_test.rs b/contracts/feature-tests/basic-features/interact/tests/bf_interact_cs_test.rs
new file mode 100644
index 0000000000..57702b5160
--- /dev/null
+++ b/contracts/feature-tests/basic-features/interact/tests/bf_interact_cs_test.rs
@@ -0,0 +1,193 @@
+use basic_features_interact::{BasicFeaturesInteract, Config};
+use multiversx_sc_snippets::imports::{
+    BigUint, ConstDecimals, ManagedBuffer, ManagedDecimal, ManagedOption, ManagedVec, RustBigUint,
+    StaticApi,
+};
+
+#[tokio::test]
+#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
+async fn simulator_basic_features_test() {
+    let mut bf_interact = BasicFeaturesInteract::init(Config::chain_simulator_config()).await;
+
+    bf_interact.deploy_storage_bytes().await;
+    bf_interact.large_storage(15).await;
+
+    let data = bf_interact.get_large_storage().await.to_vec();
+    assert_eq!(bf_interact.large_storage_payload, data);
+
+    bf_interact.deploy().await;
+
+    let expected_return_egld_decimal =
+        ManagedDecimal::<StaticApi, ConstDecimals<18>>::const_decimals_from_raw(BigUint::from(
+            5u64,
+        ));
+    let return_egld_decimal = bf_interact.returns_egld_decimal(5).await;
+    assert_eq!(expected_return_egld_decimal, return_egld_decimal);
+
+    let expected_type_managed_option = ManagedOption::some(BigUint::from(8u16));
+    let type_managed_option = bf_interact
+        .echo_managed_option(expected_type_managed_option)
+        .await;
+    assert_eq!(Some(RustBigUint::from(8u16)), type_managed_option);
+}
+
+#[tokio::test]
+#[ignore = "signature verification is currently unavailable"]
+async fn simulator_crypto_test() {
+    let mut bf_interact = BasicFeaturesInteract::init(Config::chain_simulator_config()).await;
+
+    bf_interact.deploy_crypto().await;
+
+    verify_secp256r1_signature(&mut bf_interact).await;
+    verify_bls_signature(&mut bf_interact).await;
+    verify_bls_aggregated_signature(&mut bf_interact).await;
+}
+
+async fn verify_secp256r1_signature(interact: &mut BasicFeaturesInteract) {
+    let private_key_bytes = vec![
+        2, 230, 136, 67, 101, 214, 86, 54, 35, 88, 245, 173, 229, 104, 249, 247, 109, 218, 249,
+        227, 194, 239, 119, 60, 216, 3, 73, 239, 101, 21, 29, 52, 144,
+    ];
+    let private_key: ManagedBuffer<StaticApi> = ManagedBuffer::from(private_key_bytes);
+
+    let mut message_bytes = vec![
+        251, 147, 239, 126, 223, 35, 81, 254, 30, 151, 35, 164, 29, 15, 101, 26, 54, 140, 55, 49,
+        179, 45, 58, 84, 91, 235, 25, 6, 138, 32, 231, 241, 113, 180, 40, 135, 112, 10, 164, 143,
+        26, 237, 140, 207, 194, 3, 162, 251, 137, 86, 65, 46, 178, 171, 112, 59, 180, 55, 241, 45,
+        123, 56, 3, 8, 54, 223, 74, 165, 196, 1, 59, 26, 218, 215, 177, 178, 234, 18, 97, 42, 157,
+        72, 114, 32, 3, 101, 157, 201, 147, 80, 79, 67, 114, 124, 166, 251, 230, 194, 61, 121,
+    ];
+    let mut message: ManagedBuffer<StaticApi> = ManagedBuffer::from(message_bytes.clone());
+
+    let signature_bytes = vec![
+        83, 96, 73, 13, 12, 227, 27, 74, 135, 228, 150, 120, 31, 36, 229, 204, 150, 30, 3, 120,
+        163, 123, 228, 179, 194, 142, 241, 116, 29, 170, 98, 200, 73, 194, 70, 6, 212, 20, 158, 57,
+        5, 7, 113, 197, 110, 9, 228, 185, 193, 25, 46, 54, 246, 145, 20, 112, 197, 92, 80, 175,
+        193, 162, 255, 248,
+    ];
+    let signature: ManagedBuffer<StaticApi> = ManagedBuffer::from(signature_bytes);
+
+    interact
+        .verify_secp256r1_signature(&private_key, &message, &signature, None)
+        .await;
+
+    message_bytes[0] += 1;
+    message = ManagedBuffer::from(message_bytes.clone());
+    interact
+        .verify_secp256r1_signature(
+            &private_key,
+            &message,
+            &signature,
+            Some("signature verification failed"),
+        )
+        .await;
+}
+
+async fn verify_bls_signature(interact: &mut BasicFeaturesInteract) {
+    let private_key_bytes = vec![
+        62, 136, 106, 76, 110, 16, 154, 21, 31, 65, 5, 174, 230, 90, 81, 146, 209, 80, 239, 31,
+        166, 141, 60, 215, 105, 100, 160, 176, 134, 0, 109, 190, 67, 36, 201, 137, 222, 176, 228,
+        65, 108, 109, 103, 6, 219, 27, 25, 16, 235, 39, 50, 240, 136, 66, 251, 72, 134, 6, 123,
+        158, 209, 145, 16, 154, 194, 24, 141, 118, 0, 45, 46, 17, 218, 128, 163, 240, 234, 137,
+        254, 230, 181, 156, 131, 76, 196, 120, 166, 189, 73, 203, 138, 25, 59, 26, 187, 22,
+    ];
+    let private_key: ManagedBuffer<StaticApi> = ManagedBuffer::from(private_key_bytes);
+
+    let mut message_bytes = vec![
+        233, 107, 208, 243, 107, 112, 197, 204, 192, 196, 57, 99, 67, 189, 125, 130, 85, 184, 165,
+        38, 197, 95, 161, 226, 24, 81, 31, 175, 230, 83, 155, 142,
+    ];
+    let mut message: ManagedBuffer<StaticApi> = ManagedBuffer::from(message_bytes.clone());
+
+    let signature_bytes = vec![
+        4, 114, 93, 177, 149, 227, 122, 162, 55, 205, 187, 218, 118, 39, 13, 74, 34, 155, 110, 122,
+        54, 81, 16, 77, 197, 140, 67, 73, 192, 56, 142, 133, 70, 151, 111, 229, 74, 4, 36, 5, 48,
+        185, 144, 100, 228, 52, 201, 15,
+    ];
+    let signature: ManagedBuffer<StaticApi> = ManagedBuffer::from(signature_bytes);
+
+    interact
+        .verify_bls_signature_share(&private_key, &message, &signature, None)
+        .await;
+
+    message_bytes[0] += 1;
+    message = ManagedBuffer::from(message_bytes.clone());
+    interact
+        .verify_bls_signature_share(
+            &private_key,
+            &message,
+            &signature,
+            Some("signature is invalid"),
+        )
+        .await;
+}
+
+async fn verify_bls_aggregated_signature(interact: &mut BasicFeaturesInteract) {
+    let private_key_0_bytes = vec![
+        151, 35, 187, 5, 78, 140, 121, 239, 24, 220, 36, 211, 41, 248, 76, 126, 109, 189, 67, 238,
+        26, 16, 100, 241, 247, 236, 175, 152, 190, 86, 149, 177, 166, 44, 120, 181, 48, 207, 236,
+        182, 147, 4, 240, 124, 239, 183, 107, 2, 205, 174, 214, 60, 178, 246, 34, 20, 151, 17, 116,
+        246, 3, 112, 66, 18, 214, 144, 245, 239, 118, 241, 113, 142, 193, 233, 32, 176, 10, 192,
+        121, 41, 73, 217, 247, 55, 27, 188, 92, 158, 5, 79, 4, 7, 117, 238, 157, 6,
+    ];
+    let private_key_1_bytes = vec![
+        100, 2, 223, 146, 202, 215, 201, 240, 251, 6, 56, 31, 102, 148, 2, 102, 25, 60, 134, 91,
+        166, 233, 15, 8, 173, 188, 204, 80, 73, 19, 212, 184, 0, 91, 116, 179, 33, 14, 56, 186,
+        100, 79, 65, 184, 224, 175, 21, 25, 201, 1, 55, 145, 170, 167, 152, 221, 25, 83, 110, 61,
+        222, 241, 249, 196, 154, 131, 186, 176, 82, 21, 3, 249, 174, 223, 16, 92, 243, 42, 244, 33,
+        207, 65, 247, 126, 167, 210, 109, 180, 101, 10, 135, 173, 1, 120, 243, 135,
+    ];
+    let private_key_2_bytes = vec![
+        167, 189, 112, 217, 238, 180, 236, 11, 175, 248, 112, 51, 92, 109, 165, 146, 203, 119, 170,
+        30, 253, 74, 11, 20, 14, 95, 38, 58, 123, 163, 70, 71, 74, 162, 181, 219, 44, 64, 123, 71,
+        53, 79, 235, 252, 139, 193, 171, 24, 21, 124, 232, 217, 165, 90, 173, 243, 126, 28, 74,
+        228, 196, 215, 177, 174, 142, 4, 152, 197, 32, 174, 189, 46, 250, 195, 44, 168, 34, 103,
+        194, 79, 243, 19, 32, 6, 209, 74, 229, 20, 40, 37, 18, 147, 91, 248, 26, 6,
+    ];
+    let private_key_3_bytes = vec![
+        64, 142, 232, 235, 197, 38, 149, 153, 201, 236, 175, 204, 230, 215, 135, 111, 95, 199, 187,
+        227, 232, 108, 240, 191, 161, 29, 52, 223, 145, 198, 116, 81, 223, 114, 117, 174, 142, 57,
+        157, 52, 221, 66, 215, 23, 47, 184, 244, 22, 5, 225, 104, 128, 73, 126, 18, 56, 226, 224,
+        208, 133, 92, 51, 31, 91, 66, 52, 121, 132, 182, 218, 54, 200, 129, 159, 19, 254, 199, 166,
+        163, 160, 182, 165, 90, 91, 38, 159, 25, 184, 5, 134, 56, 31, 206, 223, 242, 151,
+    ];
+    let private_key_4_bytes = vec![
+        225, 63, 17, 70, 29, 14, 17, 247, 141, 237, 214, 202, 191, 180, 17, 69, 22, 51, 143, 3,
+        126, 28, 248, 18, 27, 200, 66, 231, 77, 67, 74, 27, 114, 136, 85, 161, 82, 103, 245, 219,
+        171, 126, 49, 161, 233, 3, 238, 9, 89, 86, 120, 23, 171, 116, 63, 91, 172, 87, 183, 130,
+        225, 132, 201, 138, 85, 77, 9, 38, 89, 251, 114, 54, 191, 31, 81, 19, 164, 36, 170, 66, 98,
+        86, 8, 206, 86, 70, 202, 224, 103, 225, 167, 101, 118, 231, 42, 1,
+    ];
+    let private_key: ManagedVec<StaticApi, ManagedBuffer<StaticApi>> = ManagedVec::from(vec![
+        ManagedBuffer::from(private_key_0_bytes),
+        ManagedBuffer::from(private_key_1_bytes),
+        ManagedBuffer::from(private_key_2_bytes),
+        ManagedBuffer::from(private_key_3_bytes),
+        ManagedBuffer::from(private_key_4_bytes),
+    ]);
+
+    let mut message_bytes = vec![109, 101, 115, 115, 97, 103, 101, 48];
+    let mut message: ManagedBuffer<StaticApi> = ManagedBuffer::from(message_bytes.clone());
+
+    let signature_bytes = vec![
+        129, 198, 17, 200, 234, 139, 166, 197, 249, 2, 7, 249, 0, 46, 67, 110, 156, 185, 126, 146,
+        116, 130, 250, 117, 91, 70, 116, 157, 207, 141, 53, 28, 41, 117, 110, 52, 65, 126, 2, 70,
+        135, 98, 156, 28, 240, 180, 236, 153,
+    ];
+    let signature: ManagedBuffer<StaticApi> = ManagedBuffer::from(signature_bytes);
+
+    interact
+        .verify_bls_aggregated_signature(private_key.clone(), &message, &signature, None)
+        .await;
+
+    message_bytes[0] += 1;
+    message = ManagedBuffer::from(message_bytes.clone());
+    interact
+        .verify_bls_aggregated_signature(
+            private_key,
+            &message,
+            &signature,
+            Some("aggregate signature is invalid"),
+        )
+        .await;
+}
diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml
index 9c5d8b6082..ee9dd86216 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/basic-features/sc-config.toml b/contracts/feature-tests/basic-features/sc-config.toml
index 82698d1dab..7037c5ed39 100644
--- a/contracts/feature-tests/basic-features/sc-config.toml
+++ b/contracts/feature-tests/basic-features/sc-config.toml
@@ -1,6 +1,8 @@
 [settings]
 main = "basic-features"
 
+[contracts.basic-features]
+
 [contracts.basic-features.profile]
 overflow-checks = true # needed for overflow tests
 
@@ -9,7 +11,21 @@ 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"]
+add-labels = ["crypto-ei-1.4"]
+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",
+]
+add-labels = ["crypto-ei-1.4"]
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..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": "*"
+            }
         }
     ]
 }
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..546c0d4c9f
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_aggregated_signature.scen.json
@@ -0,0 +1,80 @@
+{
+    "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": "bls multi - ok",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    [
+                        "nested:0x95f1d96b582f35294eb7dd4589b158e108e1d94cd0dd71ef16140e9b37126ec52dac6f57397f1e041acd7bb77df1d214f9f894e3b7fbf7abeaabc9fab8ff5c2ef05f9841322f301fdb900ac59479c334ac76a2d4ff992cd49bc9b530c25ee293",
+                        "nested:0x97aa2862418eb4ea74fddcb511eef9b771e07ff901e7e6abb35847a4bb81e58f189fc9bce4186c6129014fb43002300e959702ef4b9d0c32ebe4d795457095d65b5414efb36edbb8dc66d84a445a92472d4a31cedd4700d5ebb885eb11d3430b",
+                        "nested:0x37b73265936a2aaafe652a4dd451a1851c2dbbb32208604787479b31033e2a354615562ea2a5488f9134843362477a139050a0e798dd5ce0f01b35b8d473454ae99633aadde9237f84c87eb366144cca4de3d2cc6acc35e522a3294bf1186800",
+                        "nested:0xf46c10d114dcd3019dd4bcd4152fda678c56144eb177c67a6411213b86e206e4e56a9aad1eab0313b13031fda046d715ec4a02612b083dfae0d82a23b643e1a89756c0df3d65c27e87a9c1289628d1a8404f0668a3d87c7451ba1c78fc452693",
+                        "nested:0xaa0a97917df9240c537c89e873d7baa5ce1796e8fedfb23cf682b80fa19b8baae35af3754f9b8149985cb2a1fbda0f02c2942d2c99d9af556c9a5e90b8170e6a96379a45dd69351abfb814a16b5665abb7ddb8b096ee9f273de81845cda9728a"
+                    ],
+                    "str:message0",
+                    "0xae12858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "bls multi - fail",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_aggregated_signature",
+                "arguments": [
+                    [
+                        "nested:0x95f1d96b582f35294eb7dd4589b158e108e1d94cd0dd71ef16140e9b37126ec52dac6f57397f1e041acd7bb77df1d214f9f894e3b7fbf7abeaabc9fab8ff5c2ef05f9841322f301fdb900ac59479c334ac76a2d4ff992cd49bc9b530c25ee293",
+                        "nested:0x97aa2862418eb4ea74fddcb511eef9b771e07ff901e7e6abb35847a4bb81e58f189fc9bce4186c6129014fb43002300e959702ef4b9d0c32ebe4d795457095d65b5414efb36edbb8dc66d84a445a92472d4a31cedd4700d5ebb885eb11d3430b",
+                        "nested:0x37b73265936a2aaafe652a4dd451a1851c2dbbb32208604787479b31033e2a354615562ea2a5488f9134843362477a139050a0e798dd5ce0f01b35b8d473454ae99633aadde9237f84c87eb366144cca4de3d2cc6acc35e522a3294bf1186800",
+                        "nested:0xf46c10d114dcd3019dd4bcd4152fda678c56144eb177c67a6411213b86e206e4e56a9aad1eab0313b13031fda046d715ec4a02612b083dfae0d82a23b643e1a89756c0df3d65c27e87a9c1289628d1a8404f0668a3d87c7451ba1c78fc452693",
+                        "nested:0xaa0a97917df9240c537c89e873d7baa5ce1796e8fedfb23cf682b80fa19b8baae35af3754f9b8149985cb2a1fbda0f02c2942d2c99d9af556c9a5e90b8170e6a96379a45dd69351abfb814a16b5665abb7ddb8b096ee9f273de81845cda9728a"
+                    ],
+                    "str:message0",
+                    "0x0012858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "10",
+                "message": "str:err blsSignatureDeserialize 0012858363e8caa5b398d3febdd7bc01bc2fae1fef8f486ff4d84a5f3342f2d38085904eb10b73c0879a45d23585ce8f",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
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..fa7c21611b
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls_share.scen.json
@@ -0,0 +1,68 @@
+{
+    "name": "crypto",
+    "comment": "does not currently work with scenarios-rs, because 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": "verify_bls_signature_share - Ok",
+            "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": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "verify_bls_signature_share - Fail",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_bls_signature_share",
+                "arguments": [
+                    "0x3e886a4c6e109a151f4105aee65a5192d150ef1fa68d3cd76964a0b086006dbe4324c989deb0e4416c6d6706db1b1910eb2732f08842fb4886067b9ed191109ac2188d76002d2e11da80a3f0ea89fee6b59c834cc478a6bd49cb8a193b1abb16",
+                    "0xe96bd0f36b70c5ccc0c4396343bd7d8255b8a526c55fa1e218511fafe6539b8e",
+                    "0xff725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "10",
+                "message": "str:err blsSignatureDeserialize ff725db195e37aa237cdbbda76270d4a229b6e7a3651104dc58c4349c0388e8546976fe54a04240530b99064e434c90f",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
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..1c35b46271
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256r1.scen.json
@@ -0,0 +1,67 @@
+{
+    "name": "crypto",
+    "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": "secp256r1 - ok",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_secp256r1_signature",
+                "arguments": [
+                    "0x02bc52274edebbef8878eacc4d1e0ed4fb213e5b0737389701ae8d59c403325720",
+                    "0xbf9facf48b2219db73b50c7ff59ceef2ada56632c71afc555d6bb4072d7634d1d9353acd53517ffb9a06935a89a6454fcaa40c69becf9f8029a271fd252ea55307d00d6e97a30719d48d6b7f993af24e9c54381cba02a113238eaee9d741cababeb21aaf",
+                    "0xc7877497444274267a4ea6f42deefde23a12e44f1ec1b437018e5c0e2834ce376dec1b81ebeacf5fbc6882e69af7cafad47bbb96cfb09e8d77d12afff7543052"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "secp256r1 - fail",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features-crypto",
+                "function": "verify_secp256r1_signature",
+                "arguments": [
+                    "0x02bc52274edebbef8878eacc4d1e0ed4fb213e5b0737389701ae8d59c403325720",
+                    "0xbf9facf48b2219db73b50c7ff59ceef2ada56632c71afc555d6bb4072d7634d1d9353acd53517ffb9a06935a89a6454fcaa40c69becf9f8029a271fd252ea55307d00d6e97a30719d48d6b7f993af24e9c54381cba02a113238eaee9d741cababeb21aaf",
+                    "0x00877497444274267a4ea6f42deefde23a12e44f1ec1b437018e5c0e2834ce376dec1b81ebeacf5fbc6882e69af7cafad47bbb96cfb09e8d77d12afff7543052"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "10",
+                "message": "str:signature verification failed",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted.scen.json
new file mode 100644
index 0000000000..6373e3060b
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted.scen.json
@@ -0,0 +1,52 @@
+{
+    "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": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "echo_varags_vec_with_counted",
+                "arguments": [
+                    "str:alice",
+                    "2",
+                    "101",
+                    "102",
+                    "str:bob",
+                    "0"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "str:alice",
+                    "2",
+                    "101",
+                    "102",
+                    "str:bob",
+                    "0"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
diff --git a/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted_pairs.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted_pairs.scen.json
new file mode 100644
index 0000000000..d391d0e264
--- /dev/null
+++ b/contracts/feature-tests/basic-features/scenarios/echo_varags_vec_with_counted_pairs.scen.json
@@ -0,0 +1,68 @@
+{
+    "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": "1",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "echo_varags_vec_with_counted_pairs",
+                "arguments": [
+                    "str:alice",
+                    "1",
+                    "100",
+                    "address:a100",
+                    "str:bob",
+                    "0",
+                    "str:charlie",
+                    "3",
+                    "300",
+                    "address:a300",
+                    "301",
+                    "address:a301",
+                    "302",
+                    "address:a302"
+                ],
+                "gasLimit": "50,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "str:alice",
+                    "1",
+                    "100",
+                    "address:a100",
+                    "str:bob",
+                    "0",
+                    "str:charlie",
+                    "3",
+                    "300",
+                    "address:a300",
+                    "301",
+                    "address:a301",
+                    "302",
+                    "address:a302"
+                ],
+                "status": "",
+                "logs": "*",
+                "gas": "*",
+                "refund": "*"
+            }
+        }
+    ]
+}
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..479b8931c3 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": [
+                    "biguint:4|u32:2",
+                    "biguint:5|u32:2"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "biguint:9|u32:2"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "7",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction_var",
+                "arguments": [
+                    "biguint:9|u32:2",
+                    "biguint:4|u32:2"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "biguint:5|u32:2"
+                ]
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "8",
+            "tx": {
+                "from": "address:an_account",
+                "to": "sc:basic-features",
+                "function": "managed_decimal_subtraction_var",
+                "arguments": [
+                    "biguint:2|u32:2",
+                    "biguint:8|u32:2"
+                ],
+                "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": [
+                    "biguint:11|u32:2",
+                    "biguint:11|u32:2"
+                ],
+                "gasLimit": "1,000,000,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [
+                    "true"
+                ],
+                "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 da54f8ccec..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
@@ -24,7 +24,7 @@
                 "arguments": [
                     "23,000000000"
                 ],
-                "gasLimit": "9,000,000",
+                "gasLimit": "25,000,000",
                 "gasPrice": "0"
             },
             "expect": {
@@ -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/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
+}
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..ca53fd6e08 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,77 @@ where
     To: TxTo<Env>,
     Gas: TxGas<Env>,
 {
+    pub fn verify_secp256r1_signature<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        key: Arg0,
+        message: Arg1,
+        signature: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("verify_secp256r1_signature")
+            .argument(&key)
+            .argument(&message)
+            .argument(&signature)
+            .original_result()
+    }
+
+    pub fn verify_bls_signature_share<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        key: Arg0,
+        message: Arg1,
+        signature: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("verify_bls_signature_share")
+            .argument(&key)
+            .argument(&message)
+            .argument(&signature)
+            .original_result()
+    }
+
+    pub fn verify_bls_aggregated_signature<
+        Arg0: ProxyArg<ManagedVec<Env::Api, ManagedBuffer<Env::Api>>>,
+        Arg1: ProxyArg<ManagedBuffer<Env::Api>>,
+        Arg2: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        key: Arg0,
+        message: Arg1,
+        signature: Arg2,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("verify_bls_aggregated_signature")
+            .argument(&key)
+            .argument(&message)
+            .argument(&signature)
+            .original_result()
+    }
+
+    /// 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/crypto_features.rs b/contracts/feature-tests/basic-features/src/crypto_features.rs
index 56c543163c..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)
     }
 
@@ -64,4 +64,39 @@ pub trait CryptoFeatures {
     fn compute_secp256k1_der_signature(&self, r: ManagedBuffer, s: ManagedBuffer) -> ManagedBuffer {
         self.crypto().encode_secp256k1_der_signature(&r, &s)
     }
+
+    #[endpoint]
+    #[label("crypto-ei-1.4")]
+    fn verify_secp256r1_signature(
+        &self,
+        key: ManagedBuffer,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) {
+        self.crypto().verify_secp256r1(&key, &message, &signature)
+    }
+
+    #[endpoint]
+    #[label("crypto-ei-1.4")]
+    fn verify_bls_signature_share(
+        &self,
+        key: ManagedBuffer,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) {
+        self.crypto()
+            .verify_bls_signature_share(&key, &message, &signature)
+    }
+
+    #[endpoint]
+    #[label("crypto-ei-1.4")]
+    fn verify_bls_aggregated_signature(
+        &self,
+        key: ManagedVec<ManagedBuffer>,
+        message: ManagedBuffer,
+        signature: ManagedBuffer,
+    ) {
+        self.crypto()
+            .verify_bls_aggregated_signature(&key, &message, &signature)
+    }
 }
diff --git a/contracts/feature-tests/basic-features/src/echo_managed.rs b/contracts/feature-tests/basic-features/src/echo_managed.rs
index 62ee33a7a7..8073cab4f1 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> {
@@ -94,4 +100,27 @@ pub trait EchoManagedTypes {
         }
         result
     }
+
+    #[endpoint]
+    fn echo_varags_vec_with_counted(
+        &self,
+        m: MultiValueEncoded<MultiValue2<ManagedBuffer, MultiValueManagedVecCounted<usize>>>,
+    ) -> MultiValueEncoded<MultiValue2<ManagedBuffer, MultiValueManagedVecCounted<usize>>> {
+        m
+    }
+
+    #[endpoint]
+    fn echo_varags_vec_with_counted_pairs(
+        &self,
+        m: MultiValueEncoded<
+            MultiValue2<
+                ManagedBuffer,
+                MultiValueEncodedCounted<MultiValue2<usize, ManagedAddress>>,
+            >,
+        >,
+    ) -> MultiValueEncoded<
+        MultiValue2<ManagedBuffer, MultiValueEncodedCounted<MultiValue2<usize, ManagedAddress>>>,
+    > {
+        m
+    }
 }
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/src/managed_vec_features.rs b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
index 6f42d104be..3b0f9e505d 100644
--- a/contracts/feature-tests/basic-features/src/managed_vec_features.rs
+++ b/contracts/feature-tests/basic-features/src/managed_vec_features.rs
@@ -39,7 +39,7 @@ pub trait ManagedVecFeatures {
         &self,
         mv: ManagedVec<BigUint>,
         index: usize,
-        item: &BigUint,
+        item: BigUint,
     ) -> ManagedVec<BigUint> {
         let mut result = mv;
         if result.set(index, item).is_ok() {
diff --git a/contracts/feature-tests/basic-features/src/storage_direct_load.rs b/contracts/feature-tests/basic-features/src/storage_direct_load.rs
index efdd51a20f..7d19f83eb5 100644
--- a/contracts/feature-tests/basic-features/src/storage_direct_load.rs
+++ b/contracts/feature-tests/basic-features/src/storage_direct_load.rs
@@ -1,7 +1,5 @@
 multiversx_sc::imports!();
 
-use multiversx_sc::api::{use_raw_handle, HandleTypeInfo};
-
 use crate::types::*;
 
 /// Storage tests: direct load.
@@ -78,16 +76,15 @@ pub trait StorageLoadFeatures {
     #[endpoint]
     fn load_from_address_raw(&self, address: ManagedAddress, key: ManagedBuffer) -> ManagedBuffer {
         // TODO: maybe wrap this kind of functionality in a StorageRawWrapper
-        use multiversx_sc::api::{
-            StaticVarApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
-        };
-        let value_handle: <<Self as ContractBase>::Api as HandleTypeInfo>::ManagedBufferHandle =
-            use_raw_handle(Self::Api::static_var_api_impl().next_handle());
-        Self::Api::storage_read_api_impl().storage_load_from_address(
-            address.get_handle(),
-            key.get_handle(),
-            value_handle.clone(),
-        );
-        ManagedBuffer::from_handle(value_handle)
+        use multiversx_sc::api::{StorageReadApi, StorageReadApiImpl};
+        unsafe {
+            let value = ManagedBuffer::new_uninit();
+            Self::Api::storage_read_api_impl().storage_load_from_address(
+                address.get_handle(),
+                key.get_handle(),
+                value.get_handle(),
+            );
+            value
+        }
     }
 }
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/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 3f9589e01f..bc3a5f7b17 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
@@ -28,6 +28,7 @@ impl BasicFeaturesState {
 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, basic_features::ContractBuilder);
     blockchain
 }
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 d2cc2d269b..7c7a0f2388 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
@@ -3,6 +3,7 @@ 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,
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..3c7e462b58 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,6 +2,7 @@ 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,
@@ -13,3 +14,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/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..ed95928aa5
--- /dev/null
+++ b/contracts/feature-tests/basic-features/tests/basic_features_managed_option_test.rs
@@ -0,0 +1,42 @@
+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.set_current_dir_from_workspace("contracts/feature-tests/basic-features");
+    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/tests/basic_features_managed_vec_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_managed_vec_test.rs
index fccc91e431..68965c5b60 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
@@ -44,5 +44,5 @@ fn test_managed_vec_set() {
     mv2.push(BigUint::from(1u32));
     mv2.push(BigUint::from(5u32));
     mv2.push(BigUint::from(3u32));
-    assert_eq!(bf.managed_vec_set(mv1, 1, &BigUint::from(5u64)), mv2);
+    assert_eq!(bf.managed_vec_set(mv1, 1, BigUint::from(5u64)), mv2);
 }
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..02032a2126 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,18 @@ fn crypto_verify_bls_go() {
     world().run("scenarios/crypto_verify_bls.scen.json");
 }
 
+#[test]
+#[ignore = "requires EI 1.4 in mx-scenario-go"]
+fn crypto_verify_bls_aggregated_signature_go() {
+    world().run("scenarios/crypto_verify_bls_aggregated_signature.scen.json");
+}
+
+#[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]
 fn crypto_verify_ed_25519_go() {
     world().run("scenarios/crypto_verify_ed25519.scen.json");
@@ -94,6 +106,12 @@ fn crypto_verify_secp_256_k_1_go() {
     world().run("scenarios/crypto_verify_secp256k1.scen.json");
 }
 
+#[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");
+}
+
 #[test]
 fn echo_array_u_8_go() {
     world().run("scenarios/echo_array_u8.scen.json");
@@ -174,6 +192,16 @@ fn echo_usize_go() {
     world().run("scenarios/echo_usize.scen.json");
 }
 
+#[test]
+fn echo_varags_vec_with_counted_go() {
+    world().run("scenarios/echo_varags_vec_with_counted.scen.json");
+}
+
+#[test]
+fn echo_varags_vec_with_counted_pairs_go() {
+    world().run("scenarios/echo_varags_vec_with_counted_pairs.scen.json");
+}
+
 #[test]
 fn echo_varargs_managed_eager_go() {
     world().run("scenarios/echo_varargs_managed_eager.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..a4efa924ab 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,6 +2,7 @@ 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",
@@ -11,6 +12,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 +103,18 @@ fn crypto_verify_bls_rs() {
     world().run("scenarios/crypto_verify_bls.scen.json");
 }
 
+#[test]
+#[ignore]
+fn crypto_verify_bls_aggregated_signature_rs() {
+    world().run("scenarios/crypto_verify_bls_aggregated_signature.scen.json");
+}
+
+#[test]
+#[ignore]
+fn crypto_verify_bls_share_rs() {
+    world().run("scenarios/crypto_verify_bls_share.scen.json");
+}
+
 #[test]
 fn crypto_verify_ed_25519_rs() {
     world().run("scenarios/crypto_verify_ed25519.scen.json");
@@ -109,6 +126,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");
@@ -189,6 +212,16 @@ fn echo_usize_rs() {
     world().run("scenarios/echo_usize.scen.json");
 }
 
+#[test]
+fn echo_varags_vec_with_counted_rs() {
+    world().run("scenarios/echo_varags_vec_with_counted.scen.json");
+}
+
+#[test]
+fn echo_varags_vec_with_counted_pairs_rs() {
+    world().run("scenarios/echo_varags_vec_with_counted_pairs.scen.json");
+}
+
 #[test]
 fn echo_varargs_managed_eager_rs() {
     world().run("scenarios/echo_varargs_managed_eager.scen.json");
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..a9b2c5f108
--- /dev/null
+++ b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.lock
@@ -0,0 +1,195 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[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-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
+[[package]]
+name = "multiversx-sc"
+version = "0.54.1"
+dependencies = [
+ "bitflags",
+ "hex-literal",
+ "multiversx-chain-core",
+ "multiversx-sc-codec",
+ "multiversx-sc-derive",
+ "num-traits",
+ "unwrap-infallible",
+]
+
+[[package]]
+name = "multiversx-sc-codec"
+version = "0.21.0"
+dependencies = [
+ "arrayvec",
+ "multiversx-sc-codec-derive",
+ "unwrap-infallible",
+]
+
+[[package]]
+name = "multiversx-sc-codec-derive"
+version = "0.21.0"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-derive"
+version = "0.54.1"
+dependencies = [
+ "hex",
+ "proc-macro2",
+ "quote",
+ "radix_trie",
+ "syn",
+]
+
+[[package]]
+name = "multiversx-sc-modules"
+version = "0.54.1"
+dependencies = [
+ "multiversx-sc",
+]
+
+[[package]]
+name = "multiversx-sc-wasm-adapter"
+version = "0.54.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.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.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+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.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[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-crypto/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-crypto/Cargo.toml
new file mode 100644
index 0000000000..e281730e60
--- /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.54.1"
+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! {}
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..23484e3053 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "basic-features"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..1db1058fc4 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock
index 8b9658c1b8..f70cebe7c7 100755
--- a/contracts/feature-tests/basic-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "basic-features"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,14 +107,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml
index 6dd1bf05c6..9bc6ba009a 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs
index 887b75bcd5..5759d60830 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:                          411
 // Async Callback:                       1
-// Total number of exported functions: 405
+// Total number of exported functions: 413
 
 #![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
@@ -178,6 +179,8 @@ multiversx_sc_wasm_adapter::endpoints! {
         echo_managed_async_result_empty => echo_managed_async_result_empty
         echo_varags_managed_eager => echo_varags_managed_eager
         echo_varags_managed_sum => echo_varags_managed_sum
+        echo_varags_vec_with_counted => echo_varags_vec_with_counted
+        echo_varags_vec_with_counted_pairs => echo_varags_vec_with_counted_pairs
         compute_get_values => compute_get_values
         compute_create_ec => compute_create_ec
         compute_get_ec_length => compute_get_ec_length
@@ -421,6 +424,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/contracts/feature-tests/big-float-features/Cargo.toml b/contracts/feature-tests/big-float-features/Cargo.toml
index 00a7a2c024..54165259ee 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 d674c3c06f..d8041b6de3 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 34bed93c83..f724acef4f 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
@@ -3,6 +3,7 @@ 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",
         big_float_features::ContractBuilder,
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
index 6f51586dd7..d61963c753 100644
--- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "big-float-features"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml
index 8ffb40d870..8fa9ea3131 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml
index cf54680441..92c25a01c8 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 8197eaf6da..e9191adbd0 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 da228a5cdc..4c7f0b22b9 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 a2279cf230..b69b9f6121 100644
--- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..b92f91fdf6 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.54.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 fd0984c4e9..814a34cf99 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 2bccace19f..d69de5442c 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.54.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 705aaa8741..5291914658 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.54.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../../../framework/meta-lib"
 default-features = 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 e1d31441ff..0f1dc83c60 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..86ee2b7fa7 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.54.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 cde9d812c6..2723ba6ea4 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.54.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 02c4e2ba98..ba86be4bfe 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.54.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../../../framework/meta-lib"
 default-features = 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 a8c1ad081e..1c4aed1667 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..d8057084e0 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.54.1"
 path = "../../../../../../framework/wasm-adapter"
 
 [workspace]
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 74d345daf7..935d192c92 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
@@ -2,6 +2,8 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain
+        .set_current_dir_from_workspace("contracts/feature-tests/composability/esdt-contract-pair");
     blockchain.register_contract(
         "mxsc:first-contract/output/first-contract.mxsc.json",
         first_contract::ContractBuilder,
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..0415e64f61 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 f051a74c0d..63bf4f82ac 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.54.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 eed44cf899..07591b6303 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.54.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../../../framework/meta-lib"
 default-features = 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 85f858f40f..fffcf2d5fe 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..214f44784a 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.54.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 1a0ab6e062..a5264145d7 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.54.1"
 path = "../../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 d08583a589..be815bb008 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.54.1"
 path = "../../../../../../framework/base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../../../framework/meta-lib"
 default-features = 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 282d1eff69..abcf21e072 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..81b3e9976d 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.54.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 de02f008fd..c5dbebe85e 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 0331d157c9..42ae706912 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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-legacy/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
index 3bf098bca1..a49d79755c 100644
--- a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -54,12 +54,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -68,7 +77,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -77,7 +86,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -87,7 +96,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -98,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -132,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",
 ]
@@ -157,9 +166,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-legacy/wasm/Cargo.toml
index 8d927291bb..7eadcb0fe3 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.54.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 3c88f7daab..a98e21507a 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.54.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/wasm-adapter"
 optional = true
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 015a37c837..8c6bcc2f6d 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 f165aec8b9..15e510f1ec 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..4b0a670305 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
index 159fb90778..fd378ffc3a 100644
--- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml
index b2f289a628..84de251c0c 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.54.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 8b34b15bea..273623d283 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 e2687540d1..5268b2a010 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 d07f3bf3ba..330b63ba34 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..7be4f7beaa 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
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..2580c42be3 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..8adf156457 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
index ddc103714b..d02ebaad78 100755
--- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml
index ab8a1eca27..b3c8c3f0ef 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.54.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 1930eb86ee..3cd8e2e7f6 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 0d47b8c79e..70f3a3fcee 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
index 156241596d..d8ef19f3a4 100644
--- a/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/forwarder_proxy.rs
@@ -120,6 +120,42 @@ where
             .original_result()
     }
 
+    pub fn forward_sync_accept_funds_rh_egld<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, BigUint<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_rh_egld")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds_rh_single_esdt<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, EsdtTokenPayment<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_rh_single_esdt")
+            .argument(&to)
+            .original_result()
+    }
+
+    pub fn forward_sync_accept_funds_rh_multi_esdt<
+        Arg0: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        to: Arg0,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>> {
+        self.wrapped_tx
+            .raw_call("forward_sync_accept_funds_rh_multi_esdt")
+            .argument(&to)
+            .original_result()
+    }
+
     pub fn forward_sync_accept_funds_with_fees<
         Arg0: ProxyArg<ManagedAddress<Env::Api>>,
         Arg1: ProxyArg<BigUint<Env::Api>>,
diff --git a/contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs b/contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs
index 13fbcd40db..bb3d86a5d7 100644
--- a/contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs
+++ b/contracts/feature-tests/composability/forwarder/src/fwd_call_sync.rs
@@ -79,6 +79,67 @@ pub trait ForwarderSyncCallModule {
         self.accept_funds_sync_result_event(&egld_value, &esdt_transfers_multi);
     }
 
+    #[endpoint]
+    #[payable("EGLD")]
+    fn forward_sync_accept_funds_rh_egld(&self, to: ManagedAddress) -> BigUint {
+        let payment = self.call_value().egld_value();
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        self.tx()
+            .to(&to)
+            .gas(half_gas)
+            .typed(vault_proxy::VaultProxy)
+            .retrieve_funds_egld_or_single_esdt()
+            .egld(payment)
+            .returns(ReturnsBackTransfersEGLD)
+            .sync_call()
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_sync_accept_funds_rh_single_esdt(
+        &self,
+        to: ManagedAddress,
+    ) -> EsdtTokenPayment<Self::Api> {
+        let payment = self.call_value().single_esdt();
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        let result = self
+            .tx()
+            .to(&to)
+            .gas(half_gas)
+            .typed(vault_proxy::VaultProxy)
+            .retrieve_funds_egld_or_single_esdt()
+            .single_esdt(
+                &payment.token_identifier,
+                payment.token_nonce,
+                &payment.amount,
+            )
+            .returns(ReturnsBackTransfersSingleESDT)
+            .sync_call();
+
+        result
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn forward_sync_accept_funds_rh_multi_esdt(
+        &self,
+        to: ManagedAddress,
+    ) -> ManagedVec<Self::Api, EsdtTokenPayment<Self::Api>> {
+        let payment = self.call_value().all_esdt_transfers().clone_value();
+        let half_gas = self.blockchain().get_gas_left() / 2;
+
+        self.tx()
+            .to(&to)
+            .gas(half_gas)
+            .typed(vault_proxy::VaultProxy)
+            .retrieve_funds_multi_esdt()
+            .multi_esdt(payment)
+            .returns(ReturnsBackTransfersMultiESDT)
+            .sync_call()
+    }
+
     #[payable("*")]
     #[endpoint]
     fn forward_sync_accept_funds_with_fees(&self, to: ManagedAddress, percentage_fees: BigUint) {
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/forwarder/src/vault_proxy.rs b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
index 7f653bfa45..9636e1e5d1 100644
--- a/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/forwarder/src/vault_proxy.rs
@@ -170,6 +170,22 @@ where
             .original_result()
     }
 
+    pub fn retrieve_funds_egld_or_single_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_egld_or_single_esdt")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_multi_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_multi_esdt")
+            .original_result()
+    }
+
     pub fn retrieve_multi_funds_async<
         Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
@@ -191,6 +207,14 @@ where
             .original_result()
     }
 
+    pub fn explicit_panic(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("explicit_panic")
+            .original_result()
+    }
+
     pub fn get_owner_address(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
index 67933f7341..7bc49ab5a0 100755
--- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml
index ecb44f6b93..f2498d628c 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
index fd2567f244..74d50dd752 100644
--- a/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/forwarder/wasm/src/lib.rs
@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           66
+// Endpoints:                           69
 // Async Callback:                       1
-// Total number of exported functions:  68
+// Total number of exported functions:  71
 
 #![no_std]
 
@@ -22,6 +22,9 @@ multiversx_sc_wasm_adapter::endpoints! {
         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_rh_egld => forward_sync_accept_funds_rh_egld
+        forward_sync_accept_funds_rh_single_esdt => forward_sync_accept_funds_rh_single_esdt
+        forward_sync_accept_funds_rh_multi_esdt => forward_sync_accept_funds_rh_multi_esdt
         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
diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml
index df0d2772c4..128251aaea 100644
--- a/contracts/feature-tests/composability/interact/Cargo.toml
+++ b/contracts/feature-tests/composability/interact/Cargo.toml
@@ -12,12 +12,13 @@ path = "src/comp_interact_main.rs"
 [dependencies]
 clap = { version = "4.4.7", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
+tokio = { version = "1.24" }
 toml = "0.8.6"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-snippets]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/snippets"
diff --git a/contracts/feature-tests/composability/interact/config.toml b/contracts/feature-tests/composability/interact/config.toml
index accfdf2fa5..992112c225 100644
--- a/contracts/feature-tests/composability/interact/config.toml
+++ b/contracts/feature-tests/composability/interact/config.toml
@@ -1,6 +1,7 @@
-gateway = 'https://testnet-gateway.multiversx.com'
-call_type = "LegacyAsync" # Sync / LegacyAsync / TransferExecute
+chain_type = 'real'
+gateway_uri = 'https://testnet-gateway.multiversx.com'
+call_type = "LegacyAsync"                              # Sync / LegacyAsync / TransferExecute
 # token_id = "CMPT-4e9332"
 token_id = "EGLD"
-token_nonce = 0 # is 0 if fungible
-amount = '50000000000000000'
\ No newline at end of file
+token_nonce = 0              # is 0 if fungible
+amount = '50000000000000000'
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 0cb35bdbec..0bd8797f05 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
@@ -124,7 +124,6 @@ impl ComposabilityInteract {
             .to(&root_addr)
             .typed(forwarder_queue_proxy::ForwarderQueueProxy)
             .forward_queued_calls()
-            .prepare_async()
             .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 d09c2323f7..6bb265245b 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_config.rs
@@ -8,10 +8,18 @@ use crate::forwarder_queue_proxy::QueuedCallType;
 /// Config file
 const CONFIG_FILE: &str = "config.toml";
 
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
 /// Multisig Interact configuration
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    gateway: String,
+    gateway_uri: String,
+    chain_type: ChainType,
     call_type: String,
     token_id: String,
     token_nonce: u64,
@@ -27,9 +35,17 @@ impl Config {
         toml::from_str(&content).unwrap()
     }
 
-    // Returns the gateway
-    pub fn gateway(&self) -> &str {
-        &self.gateway
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
     }
 
     pub fn call_type(&self) -> QueuedCallType {
@@ -49,10 +65,7 @@ impl Config {
     }
 
     pub fn token_amount(&self) -> BigUint {
-        match BigUint::from_str(&self.amount) {
-            Ok(amount) => amount,
-            Err(_) => BigUint::default(),
-        }
+        BigUint::from_str(&self.amount).unwrap_or_default()
     }
 
     pub fn token_nonce(&self) -> u64 {
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 1c2457494b..8e480b76c1 100644
--- a/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
+++ b/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs
@@ -16,11 +16,13 @@ pub struct ComposabilityInteract {
 impl ComposabilityInteract {
     pub async fn init() -> Self {
         let config = Config::load_config();
-        let mut interactor = Interactor::new(config.gateway())
+        let mut interactor = Interactor::new(config.gateway_uri())
             .await
+            .use_chain_simulator(config.use_chain_simulator())
             .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH)
             .await;
-        let wallet_address = interactor.register_wallet(test_wallets::judy());
+        interactor.set_current_dir_from_workspace("contracts/feature-tests/composability/interact");
+        let wallet_address = interactor.register_wallet(test_wallets::judy()).await;
         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/vault_proxy.rs b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
index 7f653bfa45..9636e1e5d1 100644
--- a/contracts/feature-tests/composability/interact/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/interact/src/vault_proxy.rs
@@ -170,6 +170,22 @@ where
             .original_result()
     }
 
+    pub fn retrieve_funds_egld_or_single_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_egld_or_single_esdt")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_multi_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_multi_esdt")
+            .original_result()
+    }
+
     pub fn retrieve_multi_funds_async<
         Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
@@ -191,6 +207,14 @@ where
             .original_result()
     }
 
+    pub fn explicit_panic(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("explicit_panic")
+            .original_result()
+    }
+
     pub fn get_owner_address(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
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..bf500f99bb 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 21bf169d03..8214b23a3b 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock
index 2c0fd72625..e584f0c813 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..ce79a71d44 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.54.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 4e862160d3..c8bb988115 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.54.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 ab4f449253..89eadfbe13 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 7f653bfa45..9636e1e5d1 100644
--- a/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/promises-features/src/vault_proxy.rs
@@ -170,6 +170,22 @@ where
             .original_result()
     }
 
+    pub fn retrieve_funds_egld_or_single_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_egld_or_single_esdt")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_multi_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_multi_esdt")
+            .original_result()
+    }
+
     pub fn retrieve_multi_funds_async<
         Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
@@ -191,6 +207,14 @@ where
             .original_result()
     }
 
+    pub fn explicit_panic(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("explicit_panic")
+            .original_result()
+    }
+
     pub fn get_owner_address(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
index 65b8badeb6..c1e293b808 100644
--- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml
index 95a2739d3e..8a8b474cee 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.54.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 60990553f4..5a96f1938e 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.54.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 1424708155..11bb91027d 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 80ec4f9ee4..9e0820c874 100755
--- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -132,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",
 ]
@@ -157,9 +166,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..6f2a7b77b2 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.54.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 a0fa15bb39..ad3d725380 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.54.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 e70b819767..43daa438d4 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 56e1500a4e..e5efa1957a 100755
--- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..ce048f54d7 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.54.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 9c1f720a02..e0fddfe420 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 6a526b4065..f70c293bbd 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 7f653bfa45..9636e1e5d1 100644
--- a/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
+++ b/contracts/feature-tests/composability/recursive-caller/src/vault_proxy.rs
@@ -170,6 +170,22 @@ where
             .original_result()
     }
 
+    pub fn retrieve_funds_egld_or_single_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_egld_or_single_esdt")
+            .original_result()
+    }
+
+    pub fn retrieve_funds_multi_esdt(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("retrieve_funds_multi_esdt")
+            .original_result()
+    }
+
     pub fn retrieve_multi_funds_async<
         Arg0: ProxyArg<MultiValueEncoded<Env::Api, MultiValue3<TokenIdentifier<Env::Api>, u64, BigUint<Env::Api>>>>,
     >(
@@ -191,6 +207,14 @@ where
             .original_result()
     }
 
+    pub fn explicit_panic(
+        self,
+    ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
+        self.wrapped_tx
+            .raw_call("explicit_panic")
+            .original_result()
+    }
+
     pub fn get_owner_address(
         self,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedAddress<Env::Api>> {
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
index 2e8687c2e2..0752d092ef 100755
--- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +166,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -168,9 +177,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml
index fea5980e94..b4eaad210a 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/scenarios/promises_multi_transfer_err.scen.json b/contracts/feature-tests/composability/scenarios/promises_multi_transfer_err.scen.json
new file mode 100644
index 0000000000..a57daf45ea
--- /dev/null
+++ b/contracts/feature-tests/composability/scenarios/promises_multi_transfer_err.scen.json
@@ -0,0 +1,184 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:a_user": {
+                    "nonce": "0",
+                    "balance": "2000"
+                },
+                "sc:promises": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "esdt": {
+                        "str:FWD-TOKEN": "1000",
+                        "str:NFT-123456": {
+                            "instances": [
+                                {
+                                    "nonce": "1",
+                                    "balance": "1"
+                                }
+                            ]
+                        },
+                        "str:SFT-456789": {
+                            "instances": [
+                                {
+                                    "nonce": "3",
+                                    "balance": "10"
+                                }
+                            ]
+                        }
+                    },
+                    "code": "mxsc:../promises-features/output/promises-features.mxsc.json"
+                },
+                "sc:vault": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../vault/output/vault.mxsc.json"
+                }
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "multi-transfer-through-promises",
+            "tx": {
+                "from": "address:a_user",
+                "to": "sc:promises",
+                "function": "promise_raw_multi_transfer",
+                "arguments": [
+                    "sc:vault",
+                    "str:explicit_panic",
+                    "5,000",
+                    "str:FWD-TOKEN",
+                    "0",
+                    "500",
+                    "str:NFT-123456",
+                    "1",
+                    "1",
+                    "str:SFT-456789",
+                    "3",
+                    "6"
+                ],
+                "gasLimit": "100,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [],
+                "status": "0",
+                "message": "",
+                "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:explicit_panic"
+                        ]
+                    },
+                    {
+                        "address": "sc:vault",
+                        "endpoint": "str:transferValueOnly",
+                        "topics": [
+                            "",
+                            "sc:promises"
+                        ],
+                        "data": [
+                            "str:AsyncCallback",
+                            "str:the_one_callback",
+                            "0x04",
+                            "str:explicit panic"
+                        ]
+                    },
+                    {
+                        "address": "sc:promises",
+                        "endpoint": "str:the_one_callback",
+                        "topics": [
+                            "str:async_call_event_callback",
+                            "2001",
+                            "2002"
+                        ],
+                        "data": [
+                            [
+                                "nested:0x04",
+                                "nested:str:explicit panic"
+                            ]
+                        ]
+                    },
+                    {
+                        "address": "address:a_user",
+                        "endpoint": "str:internalVMErrors",
+                        "topics": [
+                            "sc:promises",
+                            "str:promise_raw_multi_transfer"
+                        ],
+                        "data": [
+                            "*"
+                        ]
+                    }
+                ]
+            }
+        },
+        {
+            "step": "checkState",
+            "accounts": {
+                "address:a_user": {
+                    "nonce": "*",
+                    "balance": "2000"
+                },
+                "sc:promises": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "esdt": {
+                        "str:FWD-TOKEN": "1000",
+                        "str:NFT-123456": {
+                            "instances": [
+                                {
+                                    "nonce": "1",
+                                    "balance": "1"
+                                }
+                            ]
+                        },
+                        "str:SFT-456789": {
+                            "instances": [
+                                {
+                                    "nonce": "3",
+                                    "balance": "10"
+                                }
+                            ]
+                        }
+                    },
+                    "code": "mxsc:../promises-features/output/promises-features.mxsc.json"
+                },
+                "sc:vault": {
+                    "nonce": "0",
+                    "balance": "0",
+                    "code": "mxsc:../vault/output/vault.mxsc.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 8f61befdbe..3dfb9fdc2d 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_go_test.rs
@@ -443,6 +443,11 @@ fn promises_multi_transfer_go() {
     world().run("scenarios/promises_multi_transfer.scen.json");
 }
 
+#[test]
+fn promises_multi_transfer_err_go() {
+    world().run("scenarios/promises_multi_transfer_err.scen.json");
+}
+
 #[test]
 fn promises_single_transfer_go() {
     world().run("scenarios/promises_single_transfer.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 33db8b4b49..dce2f9031a 100644
--- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
+++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs
@@ -2,6 +2,7 @@ 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",
@@ -492,6 +493,12 @@ fn promises_multi_transfer_rs() {
     world().run("scenarios/promises_multi_transfer.scen.json");
 }
 
+#[test]
+#[ignore = "TODO - some log is missing"]
+fn promises_multi_transfer_err_rs() {
+    world().run("scenarios/promises_multi_transfer_err.scen.json");
+}
+
 #[test]
 #[ignore = "gas"]
 fn promises_single_transfer_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 086dd9e11d..ee2f332e33 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_legacy_test.rs
@@ -22,6 +22,7 @@ type ForwarderContract = ContractInfo<forwarder_legacy::Proxy<StaticApi>>;
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
     blockchain.register_contract(FORWARDER_PATH_EXPR, forwarder_legacy::ContractBuilder);
     blockchain
 }
diff --git a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
index 7dd5c1a81b..b3a4592835 100644
--- a/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_blackbox_test.rs
@@ -12,6 +12,7 @@ const NFT_TOKEN: &[u8] = b"COOL-123456";
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
     blockchain.register_contract(FORWARDER_PATH, forwarder::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 8766bfa174..45b1187f77 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,17 @@
 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.set_current_dir_from_workspace("contracts/feature-tests/composability");
+    blockchain.register_contract(FORWARDER_PATH, forwarder_legacy::ContractBuilder);
     blockchain
 }
 
@@ -26,57 +19,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 +60,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)
+        .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);
+
+            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..7d5041db2e 100644
--- a/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
+++ b/contracts/feature-tests/composability/tests/forwarder_whitebox_test.rs
@@ -1,17 +1,16 @@
 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.set_current_dir_from_workspace("contracts/feature-tests/composability");
+    blockchain.register_contract(FORWARDER_PATH, forwarder::ContractBuilder);
     blockchain
 }
 
@@ -19,56 +18,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 +59,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)
+        .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);
+
+            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/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs
index 4fd4f4d1cc..75f7ee72a8 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,4 @@
+use forwarder::forwarder_proxy;
 use multiversx_sc::types::BigUint;
 use multiversx_sc_scenario::imports::*;
 
@@ -13,11 +14,18 @@ const VAULT_PATH: MxscPath = MxscPath::new("../vault/output/vault.mxsc.json");
 const TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("TOKEN-123456");
 const TOKEN_ID: &[u8] = b"TOKEN-123456";
 
+const OTHER_TOKEN_ID_EXPR: TestTokenIdentifier = TestTokenIdentifier::new("TOKEN-789123");
+
+const FORWARDER_ADDRESS: TestSCAddress = TestSCAddress::new("forwarder");
+const FORWARDER_PATH: MxscPath = MxscPath::new("../forwarder/output/forwarder.mxsc.json");
+
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability");
     blockchain.register_contract(PROMISES_FEATURES_PATH, promises_features::ContractBuilder);
     blockchain.register_contract(VAULT_PATH, vault::ContractBuilder);
+    blockchain.register_contract(FORWARDER_PATH, forwarder::ContractBuilder);
 
     blockchain
 }
@@ -30,7 +38,12 @@ impl PromisesFeaturesTestState {
     fn new() -> Self {
         let mut world = world();
 
-        world.account(USER_ADDRESS).nonce(1);
+        world
+            .account(USER_ADDRESS)
+            .nonce(1)
+            .balance(100)
+            .esdt_balance(TOKEN_ID_EXPR, 1000)
+            .esdt_balance(OTHER_TOKEN_ID_EXPR, 1000);
         world
             .account(PROMISES_FEATURE_ADDRESS)
             .nonce(1)
@@ -40,6 +53,10 @@ impl PromisesFeaturesTestState {
             .nonce(1)
             .code(VAULT_PATH)
             .esdt_balance(TOKEN_ID_EXPR, 1000);
+        world
+            .account(FORWARDER_ADDRESS)
+            .nonce(1)
+            .code(FORWARDER_PATH);
 
         Self { world }
     }
@@ -85,3 +102,114 @@ 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");
+}
+
+#[test]
+fn test_back_transfers_handlers() {
+    let mut state = PromisesFeaturesTestState::new();
+    let egld_amount = BigUint::from(2u64);
+    let token_amount = BigUint::from(500u64);
+
+    let result = state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .typed(forwarder_proxy::ForwarderProxy)
+        .forward_sync_accept_funds_rh_egld(VAULT_ADDRESS)
+        .egld(&egld_amount)
+        .returns(ReturnsResult)
+        .run();
+
+    assert_eq!(result, egld_amount);
+
+    let result = state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .typed(forwarder_proxy::ForwarderProxy)
+        .forward_sync_accept_funds_rh_single_esdt(VAULT_ADDRESS)
+        .single_esdt(&TOKEN_ID_EXPR.to_token_identifier(), 0u64, &token_amount)
+        .returns(ReturnsResult)
+        .run();
+
+    assert!(
+        result.token_identifier == TOKEN_ID_EXPR.to_token_identifier()
+            && result.token_nonce == 0u64
+            && result.amount == token_amount
+    );
+
+    let mut multi_transfer = ManagedVec::<StaticApi, EsdtTokenPayment<StaticApi>>::new();
+    multi_transfer.push(EsdtTokenPayment::new(
+        TOKEN_ID_EXPR.to_token_identifier(),
+        0u64,
+        token_amount.clone(),
+    ));
+    multi_transfer.push(EsdtTokenPayment::new(
+        OTHER_TOKEN_ID_EXPR.to_token_identifier(),
+        0u64,
+        token_amount.clone(),
+    ));
+
+    let result = state
+        .world
+        .tx()
+        .from(USER_ADDRESS)
+        .to(FORWARDER_ADDRESS)
+        .typed(forwarder_proxy::ForwarderProxy)
+        .forward_sync_accept_funds_rh_multi_esdt(VAULT_ADDRESS)
+        .payment(&multi_transfer)
+        .returns(ReturnsResult)
+        .run();
+
+    assert_eq!(result.len(), 2usize);
+    assert!(
+        result.get(0).token_identifier == TOKEN_ID_EXPR.to_token_identifier()
+            && result.get(0).amount == token_amount
+    );
+    assert!(
+        result.get(1).token_identifier == OTHER_TOKEN_ID_EXPR.to_token_identifier()
+            && result.get(1).amount == token_amount
+    );
+}
diff --git a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml
index b5a381b7bf..82887f7116 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.54.1"
 path = "../../../../framework/base"
 
 [dependencies.multiversx-sc-modules]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../contracts/modules"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 0e7fd744cd..f7e89ab735 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 080facb377..0876d9e961 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
@@ -15,6 +15,9 @@ 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,
         transfer_role_features::ContractBuilder,
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..b72b89ccb8 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,21 +1,26 @@
 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";
 
 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::ContractBuilder,
@@ -27,175 +32,145 @@ 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)
+        .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),
+                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)
+        .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(
-                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)
+        .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),
+                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)
+        .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),
+                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/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
index 9d65ed4026..302d0c4dc5 100644
--- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -148,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..e6298ef18b 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.54.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 631911bf9d..65fb245e78 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 98d4726b18..6a4248cb15 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/composability/vault/src/vault.rs b/contracts/feature-tests/composability/vault/src/vault.rs
index 1fb32cccdd..86ddbe31bb 100644
--- a/contracts/feature-tests/composability/vault/src/vault.rs
+++ b/contracts/feature-tests/composability/vault/src/vault.rs
@@ -170,6 +170,30 @@ pub trait Vault {
         }
     }
 
+    #[endpoint]
+    #[payable("*")]
+    fn retrieve_funds_egld_or_single_esdt(&self) {
+        let token = self.call_value().egld_or_single_esdt();
+        self.retrieve_funds_event(&token.token_identifier, token.token_nonce, &token.amount);
+
+        if let Some(esdt_token_id) = token.token_identifier.into_esdt_option() {
+            self.tx()
+                .to(ToCaller)
+                .esdt((esdt_token_id, token.token_nonce, token.amount))
+                .transfer();
+        } else {
+            self.tx().to(ToCaller).egld(token.amount).transfer();
+        }
+    }
+
+    #[endpoint]
+    #[payable("*")]
+    fn retrieve_funds_multi_esdt(&self) {
+        let tokens = self.call_value().all_esdt_transfers().clone_value();
+
+        self.tx().to(ToCaller).multi_esdt(tokens).transfer();
+    }
+
     #[endpoint]
     fn retrieve_multi_funds_async(
         &self,
@@ -225,6 +249,12 @@ pub trait Vault {
         self.tx().to(ToCaller).payment(new_tokens).transfer();
     }
 
+    #[endpoint]
+    #[payable("*")]
+    fn explicit_panic(&self) {
+        sc_panic!("explicit panic");
+    }
+
     #[event("accept_funds")]
     fn accept_funds_event(
         &self,
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..d403682662 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +150,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -152,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..8d844aaf17 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
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 014291f680..efb935753e 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:                           19
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  21
 
 #![no_std]
 
@@ -27,8 +27,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         reject_funds => reject_funds
         retrieve_funds_with_transfer_exec => retrieve_funds_with_transfer_exec
         retrieve_funds => retrieve_funds
+        retrieve_funds_egld_or_single_esdt => retrieve_funds_egld_or_single_esdt
+        retrieve_funds_multi_esdt => retrieve_funds_multi_esdt
         retrieve_multi_funds_async => retrieve_multi_funds_async
         burn_and_create_retrieve_async => burn_and_create_retrieve_async
+        explicit_panic => explicit_panic
         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-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
index 2805363f4e..f5b2a14117 100644
--- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +150,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -152,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..ef523e11f8 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
index 4b3f047c95..67ea23bb1d 100755
--- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock
+++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +150,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -152,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml
index b6ca2d35ac..1e48ae65d9 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.54.1"
 path = "../../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/composability/vault/wasm/src/lib.rs b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
index 9849ddf8ae..8846eba08e 100644
--- a/contracts/feature-tests/composability/vault/wasm/src/lib.rs
+++ b/contracts/feature-tests/composability/vault/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           15
+// Endpoints:                           18
 // Async Callback (empty):               1
-// Total number of exported functions:  18
+// Total number of exported functions:  21
 
 #![no_std]
 
@@ -29,8 +29,11 @@ multiversx_sc_wasm_adapter::endpoints! {
         reject_funds => reject_funds
         retrieve_funds_with_transfer_exec => retrieve_funds_with_transfer_exec
         retrieve_funds => retrieve_funds
+        retrieve_funds_egld_or_single_esdt => retrieve_funds_egld_or_single_esdt
+        retrieve_funds_multi_esdt => retrieve_funds_multi_esdt
         retrieve_multi_funds_async => retrieve_multi_funds_async
         burn_and_create_retrieve_async => burn_and_create_retrieve_async
+        explicit_panic => explicit_panic
         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/erc-style-contracts/crowdfunding-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml
index 3c8467ece6..85515068b6 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 714f87b95d..7a273b4cd5 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 a75f0a6dd3..045d710566 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,6 +2,9 @@ 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,
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..ce530d0f65 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -61,12 +61,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -75,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..3f0f421f9b 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.54.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 7c4a9ffa5d..b8958dae0b 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.54.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 7e6b6af16d..643b6251c8 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 3c19930d4d..dc94cae986 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
@@ -2,6 +2,9 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace(
+        "contracts/feature-tests/erc-style-contracts/erc1155-marketplace",
+    );
     blockchain.register_contract(
         "mxsc:output/erc1155-marketplace.mxsc.json",
         erc1155_marketplace::ContractBuilder,
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..d756ad8f1f 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -61,12 +61,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -75,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..6c2670cbb6 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.54.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 584fab3261..6e95bc3310 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 c75ffef383..0ce0208834 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = 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 7ad900bd33..6bae0470b7 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..20e367d129 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.54.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 a0219ac17d..db97f0817d 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.54.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 0255b41b48..9fb7d81b42 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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/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 46d25e9447..a60be28511 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,6 +2,8 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain
+        .set_current_dir_from_workspace("contracts/feature-tests/erc-style-contracts/erc1155");
     blockchain.register_contract("mxsc:output/erc1155.mxsc.json", erc1155::ContractBuilder);
     blockchain.register_contract(
         "mxsc:../erc1155-user-mock/output/erc1155-user-mock.mxsc.json",
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..7cd31b1013 100644
--- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..491254c29f 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.54.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 4f06ebc730..ada74cc930 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 2342302dcd..b0dbedd74e 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 bf8da38747..396a405063 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
@@ -3,6 +3,7 @@ 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/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
index a4e54dee49..a8b0ec73fa 100644
--- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..c901bb0273 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.54.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 ff4794f20d..0f4cd1b30e 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.54.1"
 path = "../../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 7fa687ce05..69250825d6 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 043a19ff36..8c15c416fa 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,6 +2,7 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/erc-style-contracts/erc721");
     blockchain.register_contract("mxsc:output/erc721.mxsc.json", erc721::ContractBuilder);
     blockchain
 }
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..da721eb645 100644
--- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
+++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..675af97acf 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.54.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 208dcb0b9b..f3957266f9 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.54.1"
 path = "../../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 f59e93231a..65743706f7 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.54.1"
 path = "../../../../../framework/meta-lib"
 default-features = false
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 fa03693cce..121adf4b8b 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,6 +2,9 @@ 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/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock
index 4345aeb947..eb4d851224 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -61,12 +61,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -75,7 +84,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -84,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -94,7 +103,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -105,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -139,9 +148,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 +173,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -175,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..4475b10a95 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.54.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 e01b4dbd8c..08cfc5e1a7 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 96ff4abc99..36b42d20fc 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 eca4daa6cb..1dfeb222d5 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
@@ -3,6 +3,7 @@ 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",
         esdt_system_sc_mock::ContractBuilder,
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..92102eda73 100644
--- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
+++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..2c4e5a2e37 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.54.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 516478a7e8..4c3e4f64e1 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 a9710c9ce0..147e8ad06e 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 ebf5b99b63..3a7a6a9be6 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
@@ -5,6 +5,7 @@ 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,
         exchange_features::ContractBuilder,
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.lock b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
index 970cab4843..ddd16e70cf 100644
--- a/contracts/feature-tests/exchange-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/exchange-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/exchange-features/wasm/Cargo.toml b/contracts/feature-tests/exchange-features/wasm/Cargo.toml
index 34f85546f2..ec52df0178 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.54.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 362869a552..b3983b5bf3 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.54.1"
 path = "../../../framework/base"
 features = ["alloc"]
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 65a87a025c..f01e69f5d4 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 0844d716d7..b1ca7de8b1 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
@@ -3,6 +3,7 @@ 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",
         formatted_message_features::ContractBuilder,
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
index 0463be1978..67ea841529 100644
--- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml
index 33c4f5c1ef..71c51b59c0 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.54.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 5aff14387a..e0fe2c8d97 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 139586e372..dd92786575 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 9981c49f93..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
@@ -2,6 +2,7 @@ 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/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
index 9e49dfafd7..5377271089 100644
--- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml
index 33365ece0e..5a771ca44b 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.54.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 f41a171611..1f05fc57a1 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 c9fe2270e0..63cff791ff 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
diff --git a/contracts/feature-tests/multi-contract-features/multicontract.toml b/contracts/feature-tests/multi-contract-features/multicontract.toml
index 92d196560c..b9822321bc 100644
--- a/contracts/feature-tests/multi-contract-features/multicontract.toml
+++ b/contracts/feature-tests/multi-contract-features/multicontract.toml
@@ -33,6 +33,7 @@ add-labels = ["mcs-external-view"]
 [contracts.multi-contract-example-feature]
 add-unlabelled = true          # optional here, since the default is true
 features = ["example_feature"]
+default-features = false
 
 [contracts.multi-contract-alt-impl]
 add-unlabelled = false
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 4c6b64db26..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
@@ -2,6 +2,7 @@ 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/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..1ca207c1a6 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..bf54018f41 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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..67b08d67e9 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..6de35dc1f7 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
@@ -27,9 +27,10 @@ panic = "abort"
 [dependencies.multi-contract-features]
 path = ".."
 features = ["example_feature"]
+default-features = false
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
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..0e0313fac0 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..c0e7fdef47 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
index 8368cdc345..3d2389bdd1 100755
--- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -53,12 +53,21 @@ dependencies = [
  "multiversx-sc-wasm-adapter",
 ]
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -67,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -76,7 +85,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -86,7 +95,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -97,7 +106,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml
index fb58d28f14..f5708e2c72 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.54.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 c4cb6c2c06..a87bd3d0b3 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 a4cb376679..3d8bb30d9a 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 d0588455ba..c727d26af4 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
@@ -9,6 +9,7 @@ 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/feature-tests/panic-message-features");
     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 3921b15f91..2808c0c462 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
@@ -3,6 +3,7 @@ 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",
         panic_message_features::ContractBuilder,
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
index 50da0b16d9..0b16db538e 100755
--- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml
index 5324f83a9b..e330373f18 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.54.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 a24d50e80d..a181586381 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 f0a206cee2..7ea775ba9b 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 6096bbe339..44aa98c1b5 100644
--- a/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
+++ b/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs
@@ -5,6 +5,7 @@ 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/paybale-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 bd2f75753b..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
@@ -2,6 +2,7 @@ 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/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock
index 0a0ca7dabc..87ba98f8d9 100755
--- a/contracts/feature-tests/payable-features/wasm/Cargo.lock
+++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -131,9 +140,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml
index 21b2072b7c..245adb4390 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.54.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 8d242d0e31..037b7afc1f 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 036a714c83..747d827bf9 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.54.1"
 path = "../../../../framework/snippets"
 
 # [workspace]
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 389c717f2c..587b7f8dde 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
@@ -54,6 +54,9 @@ struct State {
 impl State {
     async fn new() -> Self {
         let mut interactor = Interactor::new(GATEWAY).await;
+        interact.set_current_dir_from_workspace(
+            "contracts/feature-tests/rust-snippets-generator-test/interact-rs",
+        );
         let wallet_address = interactor.register_wallet(Wallet::from_pem_file(PEM).unwrap());
         let sc_addr_expr = if SC_ADDRESS == "" {
             DEFAULT_ADDRESS_EXPR.to_string()
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..89a7bba541 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.54.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 c5febca410..3abd82c802 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.54.1"
 // path = "../../../../framework/snippets"
 
 #[derive(
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..2dcf26ca58 100644
--- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..20723d08f1 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.54.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 28a6da23b1..3da07721b9 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.54.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.1"
+version = "0.54.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 d2a49226e1..856971e071 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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..ffc411dad0 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,
@@ -20,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/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/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 e5bfcc2def..b11609593a 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,6 +2,8 @@ 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 afdabb5199..23719e0cef 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,52 @@
 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
+        .set_current_dir_from_workspace("contracts/feature-tests/rust-testing-framework-tester");
+    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
-        .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.account(OWNER_ADDRESS).new_address(
+        OWNER_ADDRESS,
+        0,
+        RUST_TESTING_FRAMEWORK_TESTER_ADDRESS,
+    );
+
+    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();
 }
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..d610bc06f6 100644
--- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..b9ec0157d0 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.54.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 7fd5cda7d5..574bade2cc 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.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.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 3209371e04..ebab5ec218 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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 07fd7f68ca..b5d3ed5b15 100644
--- a/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
+++ b/contracts/feature-tests/scenario-tester/scenarios/interactor_trace.scen.json
@@ -36,7 +36,9 @@
                 "gasLimit": "70,000,000"
             },
             "expect": {
-                "out": [],
+                "out": [
+                    "str:init-result"
+                ],
                 "status": "0"
             }
         },
diff --git a/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json b/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
index 94ba305ed2..c2e6570007 100644
--- a/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
+++ b/contracts/feature-tests/scenario-tester/scenarios/st-adder.scen.json
@@ -32,7 +32,9 @@
                 "gasPrice": "0"
             },
             "expect": {
-                "out": [],
+                "out": [
+                    "str:init-result"
+                ],
                 "status": "",
                 "logs": "*",
                 "gas": "*",
diff --git a/contracts/feature-tests/scenario-tester/src/lib.rs b/contracts/feature-tests/scenario-tester/src/lib.rs
index 97c352adeb..ba80b21abd 100644
--- a/contracts/feature-tests/scenario-tester/src/lib.rs
+++ b/contracts/feature-tests/scenario-tester/src/lib.rs
@@ -12,9 +12,11 @@ pub trait ScenarioTester {
     #[storage_mapper("sum")]
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
+    /// Return value for testing reasons.
     #[init]
-    fn init(&self, initial_value: BigUint) {
+    fn init(&self, initial_value: BigUint) -> &'static str {
         self.sum().set(initial_value);
+        "init-result"
     }
 
     #[upgrade]
@@ -38,4 +40,9 @@ pub trait ScenarioTester {
         let value_plus_one = &value + 1u32;
         (value, value_plus_one).into()
     }
+
+    #[view]
+    fn sc_panic(&self) {
+        sc_panic!("sc_panic! example");
+    }
 }
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 66976893c2..25eb71225c 100644
--- a/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
+++ b/contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs
@@ -43,12 +43,13 @@ where
     From: TxFrom<Env>,
     Gas: TxGas<Env>,
 {
+    /// Return value for testing reasons. 
     pub fn init<
         Arg0: ProxyArg<BigUint<Env::Api>>,
     >(
         self,
         initial_value: Arg0,
-    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, ()> {
+    ) -> TxTypedDeploy<Env, From, NotPayable, Gas, &'static str> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_deploy()
@@ -139,4 +140,13 @@ where
             .argument(&value)
             .original_result()
     }
+
+    pub fn sc_panic(
+        self,
+    ) -> 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/tests/st_blackbox_chained_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_chained_test.rs
index 755647bb7b..37b1f62e97 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
@@ -8,6 +8,7 @@ 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 cdc7f071ff..a0711eaa1a 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
@@ -13,6 +13,7 @@ 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/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_raw_steps_test.rs b/contracts/feature-tests/scenario-tester/tests/st_blackbox_raw_steps_test.rs
index 68ac9b8d39..c7b36413d2 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
@@ -5,6 +5,7 @@ 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
 }
@@ -25,7 +26,7 @@ fn scenario_tester_blackbox_raw() {
                 .from("address:owner")
                 .code(scenario_tester_code)
                 .argument("5")
-                .expect(TxExpect::ok().no_result()),
+                .expect(TxExpect::ok().result("str:init-result")),
         )
         .sc_query(
             ScQueryStep::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 cdcf610b25..19586299ae 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_blackbox_test.rs
@@ -1,4 +1,4 @@
-use multiversx_sc_scenario::imports::*;
+use multiversx_sc_scenario::{imports::*, scenario_model::TxResponseStatus};
 
 use scenario_tester::*;
 
@@ -16,6 +16,7 @@ const NFT_ID: TestTokenIdentifier = TestTokenIdentifier::new("NFT-123456");
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/scenario-tester");
     blockchain.register_contract(
         SC_SCENARIO_TESTER_PATH_EXPR,
         scenario_tester::ContractBuilder,
@@ -244,3 +245,145 @@ fn set_state_test() {
         .balance(600)
         .esdt_balance(TOKEN_ID, 60);
 }
+
+#[test]
+fn st_blackbox_tx_hash() {
+    let mut world = world();
+
+    world
+        .account(OWNER_ADDRESS)
+        .nonce(1)
+        .balance(100)
+        .account(OTHER_ADDRESS)
+        .nonce(2)
+        .balance(300)
+        .esdt_balance(TOKEN_ID, 500)
+        .commit();
+
+    let (new_address, tx_hash) = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .init(5u32)
+        .code(CODE_PATH)
+        .new_address(ST_ADDRESS)
+        .tx_hash([11u8; 32])
+        .returns(ReturnsNewAddress)
+        .returns(ReturnsTxHash)
+        .run();
+
+    assert_eq!(new_address, ST_ADDRESS.to_address());
+    assert_eq!(tx_hash.as_array(), &[11u8; 32]);
+
+    let tx_hash = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .add(1u32)
+        .tx_hash([22u8; 32])
+        .returns(ReturnsTxHash)
+        .run();
+
+    assert_eq!(tx_hash.as_array(), &[22u8; 32]);
+}
+
+#[test]
+fn st_blackbox_returns_result_or_error() {
+    let mut world = world();
+
+    world
+        .account(OWNER_ADDRESS)
+        .nonce(1)
+        .balance(100)
+        .account(OTHER_ADDRESS)
+        .nonce(2)
+        .balance(300)
+        .esdt_balance(TOKEN_ID, 500)
+        .commit();
+
+    // deploy
+    let (result, check_tx_hash, pass_value_2) = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .init(5u32)
+        .code(CODE_PATH)
+        .new_address(ST_ADDRESS)
+        .tx_hash([33u8; 32])
+        .returns(
+            ReturnsHandledOrError::new()
+                .returns(ReturnsNewAddress)
+                .returns(ReturnsResultAs::<String>::new())
+                .returns(PassValue("pass-value-1"))
+                .returns(ReturnsTxHash),
+        )
+        .returns(ReturnsTxHash)
+        .returns(PassValue("pass-value-2"))
+        .run();
+
+    assert_eq!(check_tx_hash.as_array(), &[33u8; 32]);
+    let (new_address, out_value, pass_value_1, also_check_tx_hash) = result.unwrap();
+    assert_eq!(new_address, ST_ADDRESS.to_address());
+    assert_eq!(out_value, "init-result");
+    assert_eq!(pass_value_1, "pass-value-1");
+    assert_eq!(also_check_tx_hash.as_array(), &[33u8; 32]);
+    assert_eq!(pass_value_2, "pass-value-2");
+
+    // query - ok
+    let result = world
+        .query()
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .sum()
+        .returns(ReturnsHandledOrError::new().returns(ReturnsResultUnmanaged))
+        .run();
+    assert_eq!(result, Ok(RustBigUint::from(5u32)));
+
+    // query - error
+    let result = world
+        .query()
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .sc_panic()
+        .returns(ReturnsHandledOrError::new())
+        .run();
+
+    assert_eq!(
+        result,
+        Err(TxResponseStatus::new(
+            ReturnCode::UserError,
+            "sc_panic! example"
+        ))
+    );
+
+    // call - ok
+    let result = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .add(1u32)
+        .returns(ReturnsHandledOrError::new())
+        .run();
+
+    assert_eq!(result, Ok(()));
+
+    // call - error
+    let result = world
+        .tx()
+        .from(OWNER_ADDRESS)
+        .to(ST_ADDRESS)
+        .typed(scenario_tester_proxy::ScenarioTesterProxy)
+        .sc_panic()
+        .returns(ReturnsHandledOrError::new())
+        .run();
+
+    assert_eq!(
+        result,
+        Err(TxResponseStatus::new(
+            ReturnCode::UserError,
+            "sc_panic! example"
+        ))
+    );
+}
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 3242739239..3675f409aa 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
@@ -5,6 +5,7 @@ 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",
         scenario_tester::ContractBuilder,
@@ -29,7 +30,7 @@ fn st_blackbox_upgrade() {
                 .code(&st_code)
                 .argument("5")
                 .gas_limit("5,000,000")
-                .expect(TxExpect::ok().no_result()),
+                .expect(TxExpect::ok().result("str:init-result")),
         )
         .sc_call(
             ScCallStep::new()
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 6695bcb89c..c204d9d476 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
@@ -3,6 +3,7 @@ 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,
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..b64fbc43a1
--- /dev/null
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_deprecated_test.rs
@@ -0,0 +1,55 @@
+#![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.set_current_dir_from_workspace("contracts/feature-tests");
+    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/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
index a6318b1f7f..da5b36f8a6 100644
--- a/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
+++ b/contracts/feature-tests/scenario-tester/tests/st_whitebox_test.rs
@@ -1,11 +1,14 @@
 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();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests");
     blockchain.register_contract(
         "mxsc:output/scenario-tester.mxsc.json",
         scenario_tester::ContractBuilder,
@@ -16,37 +19,70 @@ 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");
+}
+
+#[test]
+fn st_whitebox_tx_hash() {
+    let mut world = world();
+
+    world.account(OWNER).nonce(1);
+
+    let (new_address, tx_hash) = world
+        .tx()
+        .from(OWNER)
+        .raw_deploy()
+        .code(ST_PATH_EXPR)
+        .new_address(SCENARIO_TESTER)
+        .tx_hash([11u8; 32])
+        .returns(ReturnsNewBech32Address)
+        .returns(ReturnsTxHash)
+        .whitebox(scenario_tester::contract_obj, |sc| {
+            sc.init(BigUint::from(5u64));
+        });
+
+    assert_eq!(new_address.to_address(), SCENARIO_TESTER.to_address());
+    assert_eq!(tx_hash.as_array(), &[11u8; 32]);
+
+    let tx_hash = world
+        .tx()
+        .from(OWNER)
+        .to(SCENARIO_TESTER)
+        .tx_hash([22u8; 32])
+        .returns(ReturnsTxHash)
+        .whitebox(scenario_tester::contract_obj, |sc| sc.add(3u32.into()));
+
+    assert_eq!(tx_hash.as_array(), &[22u8; 32]);
 }
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
index 9bbf0343b2..aefa90cdd4 100755
--- a/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
+++ b/contracts/feature-tests/scenario-tester/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,7 +91,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -116,9 +125,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 +165,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -167,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/scenario-tester/wasm/Cargo.toml b/contracts/feature-tests/scenario-tester/wasm/Cargo.toml
index ab4c5b5871..27244e490a 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/scenario-tester/wasm/src/lib.rs b/contracts/feature-tests/scenario-tester/wasm/src/lib.rs
index 7976698233..b1360c1d95 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:                            4
+// Endpoints:                            5
 // Async Callback (empty):               1
-// Total number of exported functions:   7
+// Total number of exported functions:   8
 
 #![no_std]
 
@@ -24,6 +24,7 @@ multiversx_sc_wasm_adapter::endpoints! {
         add => add
         multi_param => multi_param
         multi_return => multi_return
+        sc_panic => sc_panic
     )
 }
 
diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml
index 38db8b86c2..099e2230fa 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.54.1"
 path = "../../../contracts/modules"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/base"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.51.1"
+version = "0.54.1"
 path = "../../../framework/scenario"
 
 [dev-dependencies.multiversx-sc-meta-lib]
-version = "0.51.1"
+version = "0.54.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 fce4cb0dca..2623d9a9ae 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.54.1"
 path = "../../../../framework/meta-lib"
 default-features = false
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..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
@@ -70,7 +70,7 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
@@ -110,7 +110,7 @@
             "expect": {
                 "out": [],
                 "status": "",
-                "logs": [],
+                "logs": "*",
                 "gas": "*",
                 "refund": "*"
             }
@@ -137,4 +137,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
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..45dde6deb1 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: &str = "str: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;
@@ -15,13 +14,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>,
@@ -32,6 +31,7 @@ pub struct Payment {
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/use-module");
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
 }
@@ -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, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(FIRST_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(SECOND_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID, INITIAL_GOV_TOKEN_BALANCE);
+    world
+        .account(THIRD_USER_ADDRESS)
+        .nonce(1)
+        .esdt_balance(GOV_TOKEN_ID, 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),
+                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,14 @@ 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)
+        .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 {
                 args_managed.push(managed_buffer!(&arg));
@@ -131,8 +115,7 @@ pub fn propose(
             );
 
             proposal_id = sc.propose(managed_buffer!(b"change quorum"), actions);
-        },
-    );
+        });
 
     proposal_id
 }
@@ -145,16 +128,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 +143,188 @@ 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)
+        .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);
-        },
-        |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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 999))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
+        .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)
+        .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);
-        },
-        |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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
+        .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, BigUint::from(300u64));
+    world
+        .check_account(SECOND_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(1u64));
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(800u64));
+    world
+        .check_account(OWNER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, 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 +332,75 @@ 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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 300))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 200))
+        .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, 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, BigUint::from(800u64));
+
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, 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 +408,93 @@ 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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 500))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 400))
+        .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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 600))
+        .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, BigUint::zero());
+    world
+        .check_account(SECOND_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, BigUint::from(600u64));
+    world
+        .check_account(THIRD_USER_ADDRESS)
+        .esdt_balance(GOV_TOKEN_ID, 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 +502,33 @@ 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)
+        .payment(TestEsdtTransfer(GOV_TOKEN_ID, 0, 999))
+        .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));
 }
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..7416932f3b 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,27 +1,27 @@
 use multiversx_sc_modules::staking::StakingModule;
 use multiversx_sc_scenario::imports::*;
 
-const STAKING_TOKEN_ID_EXPR: &str = "str: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;
 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();
 
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/use-module");
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
 }
@@ -30,447 +30,339 @@ 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, INITIAL_BALANCE);
+    world
+        .account(BOB_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
+    world
+        .account(CAROL_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
+    world
+        .account(EVE_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
+    world
+        .account(PAUL_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID, INITIAL_BALANCE);
+    world
+        .account(SALLY_ADDRESS)
+        .nonce(1)
+        .esdt_balance(STAKING_TOKEN_ID, 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.to_token_identifier()),
+                &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)
+        .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();
+        });
 
     // stake half and try unstake
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(ALICE_ADDRESS_EXPR).esdt_transfer(
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(
             STAKING_TOKEN_ID,
             0,
             REQUIRED_STAKE_AMOUNT / 2,
-        ),
-        |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");
-        },
-    );
+        ))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.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,
-            0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(CAROL_ADDRESS_EXPR).esdt_transfer(
-            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,
-            0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
-
-    world.whitebox_call(
-        &use_module_whitebox,
-        ScCallStep::new().from(SALLY_ADDRESS_EXPR).esdt_transfer(
-            STAKING_TOKEN_ID,
-            0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| sc.stake(),
-    );
+    world
+        .tx()
+        .from(BOB_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(CAROL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(PAUL_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, REQUIRED_STAKE_AMOUNT))
+        .whitebox(use_module::contract_obj, |sc| {
+            sc.stake();
+        });
+
+    world
+        .tx()
+        .from(SALLY_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, 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,
-            0,
-            REQUIRED_STAKE_AMOUNT,
-        ),
-        |sc| {
+    world
+        .tx()
+        .from(ALICE_ADDRESS)
+        .to(USE_MODULE_ADDRESS)
+        .payment(TestEsdtTransfer(STAKING_TOKEN_ID, 0, 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, 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.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()
+    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(STAKING_TOKEN_ID, INITIAL_BALANCE - SLASH_AMOUNT);
 }
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..a981a4f5f2 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
@@ -5,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;
@@ -33,6 +30,8 @@ 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/feature-tests/use-module");
     blockchain.register_contract(USE_MODULE_PATH_EXPR, use_module::ContractBuilder);
     blockchain
 }
@@ -41,561 +40,465 @@ 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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             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_state_step(CheckStateStep::new().put_account(
-        USE_MODULE_ADDRESS_EXPR,
-        CheckAccount::new().esdt_nft_balance_and_attributes(
+    world
+        .check_account(USER_ADDRESS_EXPR)
+        .esdt_nft_balance_and_attributes(MERGED_TOKEN_ID_EXPR, 1, NFT_AMOUNT, &Empty);
+
+    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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
-        },
-    );
+            assert_eq!(expected_uri, *actual_uri.into_instances());
+        });
 
     // 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),
             ));
@@ -603,12 +506,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),
             ));
@@ -616,112 +519,101 @@ 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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             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 {
@@ -729,39 +621,39 @@ 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 = 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);
-            assert_eq!(expected_uri, actual_uri.into_instances());
+            assert_eq!(expected_uri, *actual_uri.into_instances());
 
             let actual_attributes: CustomAttributes = merged_token_data.decode_attributes();
             assert_eq!(expected_attributes, actual_attributes);
@@ -770,40 +662,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,
+        );
 }
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 9600b19bcb..e7cc44a77a 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,7 +5,8 @@ use std::{fs, fs::File, io::Write};
 
 #[test]
 fn use_module_abi_generated_ok() {
-    let blockchain = ScenarioWorld::new();
+    let mut blockchain = ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/use-module");
 
     // generate ABI
     let multi_contract_config = multiversx_sc_meta_lib::multi_contract_config::<
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 a7360462a4..7a14793c46 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
@@ -21,6 +21,8 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
+
+    blockchain.set_current_dir_from_workspace("contracts/feature-tests/use-module");
     blockchain.register_contract(
         "mxsc:output/use-module.mxsc.json",
         use_module::ContractBuilder,
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..0d107e14ff 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.54.1"
         }
     },
     "docs": [
@@ -1000,6 +1000,14 @@
                     "type": "EsdtTokenPayment"
                 }
             ]
+        },
+        {
+            "identifier": "pauseContract",
+            "inputs": []
+        },
+        {
+            "identifier": "unpauseContract",
+            "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 d2481bb18c..55ec26a1e6 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.54.1"
         }
     },
     "docs": [
@@ -244,6 +244,14 @@
                     "type": "EsdtTokenPayment"
                 }
             ]
+        },
+        {
+            "identifier": "pauseContract",
+            "inputs": []
+        },
+        {
+            "identifier": "unpauseContract",
+            "inputs": []
         }
     ],
     "esdtAttributes": [
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..9dadc5b69f 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,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -148,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -159,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
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..d342bd3a8a 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock
index cf397eb361..6933934c1f 100644
--- a/contracts/feature-tests/use-module/wasm/Cargo.lock
+++ b/contracts/feature-tests/use-module/wasm/Cargo.lock
@@ -4,15 +4,15 @@ 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"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -38,12 +38,21 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "multiversx-chain-core"
+version = "0.11.0"
+dependencies = [
+ "bitflags",
+ "multiversx-sc-codec",
+]
+
 [[package]]
 name = "multiversx-sc"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "bitflags",
  "hex-literal",
+ "multiversx-chain-core",
  "multiversx-sc-codec",
  "multiversx-sc-derive",
  "num-traits",
@@ -52,7 +61,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "arrayvec",
  "multiversx-sc-codec-derive",
@@ -61,7 +70,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-codec-derive"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -71,7 +80,7 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-derive"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "hex",
  "proc-macro2",
@@ -82,14 +91,14 @@ dependencies = [
 
 [[package]]
 name = "multiversx-sc-modules"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
 
 [[package]]
 name = "multiversx-sc-wasm-adapter"
-version = "0.51.1"
+version = "0.54.1"
 dependencies = [
  "multiversx-sc",
 ]
@@ -123,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",
 ]
@@ -148,9 +157,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "2.0.68"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -159,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unwrap-infallible"
diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml
index 01344d8430..f7db25e265 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.54.1"
 path = "../../../../framework/wasm-adapter"
 
 [workspace]
diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml
index 47f47da038..1678c3457a 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.54.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.1"
+version = "0.54.1"
 path = "../../framework/base"
diff --git a/contracts/modules/src/esdt.rs b/contracts/modules/src/esdt.rs
index ea977f53be..42314e9608 100644
--- a/contracts/modules/src/esdt.rs
+++ b/contracts/modules/src/esdt.rs
@@ -84,7 +84,9 @@ pub trait EsdtModule {
     fn nft_create<T: TopEncode>(&self, amount: &BigUint, attributes: &T) -> u64 {
         let token_id = self.token_id().get();
         let empty_buffer = ManagedBuffer::new();
-        let empty_vec = ManagedVec::from_handle(empty_buffer.get_handle());
+
+        // sneakily reuses the same handle
+        let empty_vec = unsafe { ManagedRef::wrap_handle(empty_buffer.get_handle()) };
 
         self.send().esdt_nft_create(
             &token_id,
diff --git a/contracts/modules/src/pause.rs b/contracts/modules/src/pause.rs
index a02be8b5cc..db877a0d56 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("pauseContract")]
+    fn pause_event(&self);
+
+    #[event("unpauseContract")]
+    fn unpause_event(&self);
+
     #[view(isPaused)]
     #[storage_mapper("pause_module:paused")]
     fn paused_status(&self) -> SingleValueMapper<bool>;
diff --git a/contracts/modules/src/staking.rs b/contracts/modules/src/staking.rs
index e30a457e51..7e3ce968d5 100644
--- a/contracts/modules/src/staking.rs
+++ b/contracts/modules/src/staking.rs
@@ -8,7 +8,7 @@ pub struct TokenAmountPair<M: ManagedTypeApi> {
 }
 
 static NOT_ENOUGH_STAKE_ERR_MSG: &[u8] = b"Not enough stake";
-static MINIMUM_BOARD_MEMBERS: usize = 3;
+static MINIMUM_BOARD_MEMBERS: usize = 2;
 static MAXIMUM_BOARD_MEMBERS: usize = 100;
 
 #[multiversx_sc::module]
diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml
index 6405168a03..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.0"
+version = "0.21.0"
 edition = "2021"
 
 authors = ["dorin.iancu <dorin.iancu@multiversx.com>", "Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -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.68"
+quote = "=1.0.37"
+syn = "=2.0.77"
 hex = "=0.4.3"
diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml
index 88f3516d50..1bb9ceb0bd 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.21.0"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -18,14 +18,14 @@ derive = ["multiversx-sc-codec-derive"]
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.0"
+version = "=0.21.0"
 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"
 
 [dev-dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"
-version = "=0.20.0"
+version = "=0.21.0"
diff --git a/data/codec/src/impl_for_types/impl_string.rs b/data/codec/src/impl_for_types/impl_string.rs
index c7a7cf4d7d..026c9d92e9 100644
--- a/data/codec/src/impl_for_types/impl_string.rs
+++ b/data/codec/src/impl_for_types/impl_string.rs
@@ -126,8 +126,8 @@ mod tests {
     #[test]
     fn test_top() {
         let s = "abc";
-        check_top_encode_decode(String::from(s), &[b'a', b'b', b'c']);
-        check_top_encode_decode(String::from(s).into_boxed_str(), &[b'a', b'b', b'c']);
+        check_top_encode_decode(String::from(s), b"abc");
+        check_top_encode_decode(String::from(s).into_boxed_str(), b"abc");
     }
 
     #[test]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000..59bc14e0db
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: "3.9"
+
+services:
+ chain-simulator:
+  image: multiversx/chainsimulator:latest
+  ports:
+    - 8085:8085
+  volumes:
+    - "../scripts:/docker/scripts"
+  entrypoint: "./chainsimulator -log-level *:INFO"
\ No newline at end of file
diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml
index a53034d882..300cc13d6e 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.54.1"
 edition = "2021"
 rust-version = "1.78"
 
@@ -30,10 +30,14 @@ num-traits = { version = "=0.2.19", default-features = false }
 unwrap-infallible = "0.1.5"
 
 [dependencies.multiversx-sc-derive]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../derive"
 
 [dependencies.multiversx-sc-codec]
-version = "=0.20.0"
+version = "=0.21.0"
 path = "../../data/codec"
 features = ["derive"]
+
+[dependencies.multiversx-chain-core]
+version = "=0.11.0"
+path = "../../chain/core"
diff --git a/framework/base/src/abi.rs b/framework/base/src/abi.rs
index c031a62166..dd128161bc 100644
--- a/framework/base/src/abi.rs
+++ b/framework/base/src/abi.rs
@@ -7,6 +7,7 @@ mod type_abi;
 mod type_abi_from;
 mod type_abi_impl_basic;
 mod type_abi_impl_codec_multi;
+mod type_abi_impl_vm_core;
 mod type_description;
 mod type_description_container;
 
diff --git a/framework/base/src/abi/endpoint_abi.rs b/framework/base/src/abi/endpoint_abi.rs
index 03e098d0e9..8e96554d84 100644
--- a/framework/base/src/abi/endpoint_abi.rs
+++ b/framework/base/src/abi/endpoint_abi.rs
@@ -1,5 +1,6 @@
 use super::*;
 use alloc::{
+    borrow::ToOwned,
     string::{String, ToString},
     vec::Vec,
 };
@@ -42,6 +43,7 @@ pub struct EndpointAbi {
     pub docs: Vec<String>,
     pub name: String,
     pub rust_method_name: String,
+    pub title: Option<String>,
     pub only_owner: bool,
     pub only_admin: bool,
     pub labels: Vec<String>,
@@ -55,37 +57,64 @@ pub struct EndpointAbi {
 
 impl EndpointAbi {
     /// Used in code generation.
-    ///
-    /// TODO: replace with builder pattern to gt rid of the too many arguments.
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
-        docs: &[&str],
         name: &str,
         rust_method_name: &str,
-        only_owner: bool,
-        only_admin: bool,
         mutability: EndpointMutabilityAbi,
         endpoint_type: EndpointTypeAbi,
-        payable_in_tokens: &[&str],
-        labels: &[&str],
-        allow_multiple_var_args: bool,
     ) -> Self {
         EndpointAbi {
-            docs: docs.iter().map(|s| s.to_string()).collect(),
+            docs: Vec::new(),
             name: name.to_string(),
             rust_method_name: rust_method_name.to_string(),
-            only_owner,
-            only_admin,
-            labels: labels.iter().map(|s| s.to_string()).collect(),
+            only_owner: false,
+            only_admin: false,
+            labels: Vec::new(),
             endpoint_type,
             mutability,
-            payable_in_tokens: payable_in_tokens.iter().map(|s| s.to_string()).collect(),
+            payable_in_tokens: Vec::new(),
+            title: None,
             inputs: Vec::new(),
             outputs: Vec::new(),
-            allow_multiple_var_args,
+            allow_multiple_var_args: false,
         }
     }
 
+    pub fn with_docs(mut self, doc_line: &str) -> Self {
+        self.docs.push(doc_line.to_owned());
+        self
+    }
+
+    pub fn with_title(mut self, title: &str) -> Self {
+        self.title = Some(title.to_owned());
+        self
+    }
+
+    pub fn with_only_owner(mut self) -> Self {
+        self.only_owner = true;
+        self
+    }
+
+    pub fn with_only_admin(mut self) -> Self {
+        self.only_admin = true;
+        self
+    }
+
+    pub fn with_allow_multiple_var_args(mut self) -> Self {
+        self.allow_multiple_var_args = true;
+        self
+    }
+
+    pub fn with_label(mut self, label: &str) -> Self {
+        self.labels.push(label.to_owned());
+        self
+    }
+
+    pub fn with_payable_token(mut self, token: &str) -> Self {
+        self.payable_in_tokens.push(token.to_owned());
+        self
+    }
+
     pub fn add_input<T: TypeAbi>(&mut self, arg_name: &str) {
         self.inputs.push(InputAbi {
             arg_name: arg_name.to_string(),
diff --git a/framework/base/src/abi/type_abi_impl_vm_core.rs b/framework/base/src/abi/type_abi_impl_vm_core.rs
new file mode 100644
index 0000000000..13b8988a59
--- /dev/null
+++ b/framework/base/src/abi/type_abi_impl_vm_core.rs
@@ -0,0 +1,204 @@
+use super::*;
+
+use alloc::vec::Vec;
+use multiversx_chain_core::types::{
+    Address, BoxedBytes, CodeMetadata, EsdtLocalRole, EsdtTokenType, H256,
+};
+
+impl TypeAbiFrom<Self> for H256 {}
+
+impl TypeAbi for H256 {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        "H256".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "H256".into()
+    }
+}
+
+impl TypeAbiFrom<Self> for Address {}
+
+impl TypeAbi for Address {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        "Address".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "Address".into()
+    }
+}
+
+impl TypeAbiFrom<Self> for BoxedBytes {}
+
+impl TypeAbi for BoxedBytes {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        "bytes".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "BoxedBytes".into()
+    }
+}
+
+impl TypeAbiFrom<Self> for CodeMetadata {}
+impl TypeAbi for CodeMetadata {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        "CodeMetadata".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "CodeMetadata".into()
+    }
+}
+
+impl TypeAbiFrom<Self> for EsdtTokenType {}
+impl TypeAbiFrom<&Self> for EsdtTokenType {}
+
+// implementation originally geneated via #[type_abi] attribute
+impl TypeAbi for EsdtTokenType {
+    type Unmanaged = Self;
+    fn type_name() -> TypeName {
+        "EsdtTokenType".into()
+    }
+
+    #[allow(clippy::vec_init_then_push)]
+    fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
+        let type_names = Self::type_names();
+        if !accumulator.contains_type(&type_names.abi) {
+            accumulator.reserve_type_name(type_names.clone());
+            let mut variant_descriptions = Vec::new();
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "Fungible",
+                0usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NonFungible",
+                1usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "SemiFungible",
+                2usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(&[], "Meta", 3usize, Vec::new()));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "Invalid",
+                4usize,
+                Vec::new(),
+            ));
+            accumulator.insert(
+                type_names.clone(),
+                TypeDescription::new(
+                    &[],
+                    type_names,
+                    TypeContents::Enum(variant_descriptions),
+                    &[
+                        "TopDecode",
+                        "TopEncode",
+                        "NestedDecode",
+                        "NestedEncode",
+                        "Clone",
+                        "PartialEq",
+                        "Eq",
+                        "Debug",
+                        "ManagedVecItem",
+                    ],
+                ),
+            );
+        }
+    }
+}
+
+impl TypeAbiFrom<Self> for EsdtLocalRole {}
+impl TypeAbiFrom<&Self> for EsdtLocalRole {}
+
+// implementation originally geneated via #[type_abi] attribute
+impl TypeAbi for EsdtLocalRole {
+    type Unmanaged = Self;
+
+    fn type_name() -> TypeName {
+        "EsdtLocalRole".into()
+    }
+
+    #[allow(clippy::vec_init_then_push)]
+    fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
+        let type_names = Self::type_names();
+        if !accumulator.contains_type(&type_names.abi) {
+            accumulator.reserve_type_name(type_names.clone());
+            let mut variant_descriptions = Vec::new();
+            variant_descriptions.push(EnumVariantDescription::new(&[], "None", 0usize, Vec::new()));
+            variant_descriptions.push(EnumVariantDescription::new(&[], "Mint", 1usize, Vec::new()));
+            variant_descriptions.push(EnumVariantDescription::new(&[], "Burn", 2usize, Vec::new()));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NftCreate",
+                3usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NftAddQuantity",
+                4usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NftBurn",
+                5usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NftAddUri",
+                6usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "NftUpdateAttributes",
+                7usize,
+                Vec::new(),
+            ));
+            variant_descriptions.push(EnumVariantDescription::new(
+                &[],
+                "Transfer",
+                8usize,
+                Vec::new(),
+            ));
+            accumulator.insert(
+                type_names.clone(),
+                TypeDescription::new(
+                    &[],
+                    type_names,
+                    TypeContents::Enum(variant_descriptions),
+                    &[
+                        "TopDecode",
+                        "TopEncode",
+                        "NestedDecode",
+                        "NestedEncode",
+                        "Clone",
+                        "PartialEq",
+                        "Eq",
+                        "Debug",
+                        "Copy",
+                    ],
+                ),
+            );
+        }
+    }
+}
diff --git a/framework/base/src/api.rs b/framework/base/src/api.rs
index 094522d1ac..8123eded28 100644
--- a/framework/base/src/api.rs
+++ b/framework/base/src/api.rs
@@ -30,4 +30,4 @@ pub use storage_api::*;
 pub use vm_api::VMApi;
 
 // Backwards compatibility.
-pub use crate::types::system_proxy::builtin_func_names::*;
+pub use crate::chain_core::builtin_func_names::*;
diff --git a/framework/base/src/api/crypto_api.rs b/framework/base/src/api/crypto_api.rs
index 3c5c374a87..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,
@@ -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,
+    );
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    );
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    );
 }
diff --git a/framework/base/src/api/uncallable/crypto_api_uncallable.rs b/framework/base/src/api/uncallable/crypto_api_uncallable.rs
index 59195618c9..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!()
     }
 
@@ -82,4 +82,31 @@ impl CryptoApiImpl for UncallableApi {
     ) {
         unreachable!()
     }
+
+    fn verify_secp256r1_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) {
+        unreachable!()
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) {
+        unreachable!()
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: 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 c499c9f663..e769bb69c7 100644
--- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs
@@ -11,8 +11,8 @@ use crate::{
     storage::{self},
     types::{
         BackTransfers, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags,
-        EsdtTokenData, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType,
-        ManagedVec, TokenIdentifier,
+        EsdtTokenData, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray,
+        ManagedRefMut, ManagedType, ManagedVec, TokenIdentifier,
     },
 };
 
@@ -49,9 +49,11 @@ where
 
     #[inline]
     pub fn get_caller(&self) -> ManagedAddress<A> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_caller_managed(handle.clone());
-        ManagedAddress::from_handle(handle)
+        unsafe {
+            let result = ManagedAddress::new_uninit();
+            A::blockchain_api_impl().load_caller_managed(result.get_handle());
+            result
+        }
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `get_sc_address` instead.")]
@@ -63,16 +65,20 @@ where
 
     #[inline]
     pub fn get_sc_address(&self) -> ManagedAddress<A> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_sc_address_managed(handle.clone());
-        ManagedAddress::from_handle(handle)
+        unsafe {
+            let result = ManagedAddress::new_uninit();
+            A::blockchain_api_impl().load_sc_address_managed(result.get_handle());
+            result
+        }
     }
 
     #[inline]
     pub fn get_owner_address(&self) -> ManagedAddress<A> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_owner_address_managed(handle.clone());
-        ManagedAddress::from_handle(handle)
+        unsafe {
+            let result = ManagedAddress::new_uninit();
+            A::blockchain_api_impl().load_owner_address_managed(result.get_handle());
+            result
+        }
     }
 
     pub fn check_caller_is_owner(&self) {
@@ -123,16 +129,20 @@ where
     #[cfg(feature = "alloc")]
     #[inline]
     pub fn get_balance_legacy(&self, address: &crate::types::Address) -> BigUint<A> {
-        let handle: A::BigIntHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_balance_legacy(handle.clone(), address);
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            A::blockchain_api_impl().load_balance_legacy(result.get_handle(), address);
+            result
+        }
     }
 
     #[inline]
     pub fn get_balance(&self, address: &ManagedAddress<A>) -> BigUint<A> {
-        let handle: A::BigIntHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_balance(handle.clone(), address.get_handle());
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            A::blockchain_api_impl().load_balance(result.get_handle(), address.get_handle());
+            result
+        }
     }
 
     #[inline]
@@ -141,7 +151,10 @@ where
         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);
+        unsafe {
+            ManagedRefMut::<'static, A, ManagedBuffer<A>>::wrap_handle(mbuf_temp_1)
+                .load_to_byte_array(&mut buffer);
+        }
         CodeMetadata::from(buffer)
     }
 
@@ -173,9 +186,11 @@ where
 
     #[inline]
     pub fn get_state_root_hash(&self) -> ManagedByteArray<A, 32> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_state_root_hash_managed(handle.clone());
-        ManagedByteArray::from_handle(handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::blockchain_api_impl().load_state_root_hash_managed(result.get_handle());
+            result
+        }
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `get_tx_hash` instead.")]
@@ -187,9 +202,11 @@ where
 
     #[inline]
     pub fn get_tx_hash(&self) -> ManagedByteArray<A, 32> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_tx_hash_managed(handle.clone());
-        ManagedByteArray::from_handle(handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::blockchain_api_impl().load_tx_hash_managed(result.get_handle());
+            result
+        }
     }
 
     #[inline]
@@ -229,9 +246,11 @@ where
 
     #[inline]
     pub fn get_block_random_seed(&self) -> ManagedByteArray<A, 48> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_block_random_seed_managed(handle.clone());
-        ManagedByteArray::from_handle(handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::blockchain_api_impl().load_block_random_seed_managed(result.get_handle());
+            result
+        }
     }
 
     #[inline]
@@ -266,9 +285,11 @@ where
 
     #[inline]
     pub fn get_prev_block_random_seed(&self) -> ManagedByteArray<A, 48> {
-        let handle: A::ManagedBufferHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_prev_block_random_seed_managed(handle.clone());
-        ManagedByteArray::from_handle(handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::blockchain_api_impl().load_prev_block_random_seed_managed(result.get_handle());
+            result
+        }
     }
 
     #[inline]
@@ -288,14 +309,16 @@ where
         token_id: &TokenIdentifier<A>,
         nonce: u64,
     ) -> BigUint<A> {
-        let result_handle: A::BigIntHandle = use_raw_handle(A::static_var_api_impl().next_handle());
-        A::blockchain_api_impl().load_esdt_balance(
-            address.get_handle(),
-            token_id.get_handle(),
-            nonce,
-            result_handle.clone(),
-        );
-        BigUint::from_handle(result_handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            A::blockchain_api_impl().load_esdt_balance(
+                address.get_handle(),
+                token_id.get_handle(),
+                nonce,
+                result.get_handle(),
+            );
+            result
+        }
     }
 
     pub fn get_esdt_token_data(
@@ -346,16 +369,18 @@ where
         let _ = managed_api_impl.mb_load_slice(properties_handle, 0, &mut properties_bytes[..]);
         let frozen = esdt_is_frozen(&properties_bytes);
 
-        EsdtTokenData {
-            token_type,
-            amount: BigUint::from_raw_handle(value_handle.get_raw_handle()),
-            frozen,
-            hash: ManagedBuffer::from_raw_handle(hash_handle.get_raw_handle()),
-            name: ManagedBuffer::from_raw_handle(name_handle.get_raw_handle()),
-            attributes: ManagedBuffer::from_raw_handle(attributes_handle.get_raw_handle()),
-            creator: ManagedAddress::from_raw_handle(creator_handle.get_raw_handle()),
-            royalties: BigUint::from_raw_handle(royalties_handle.get_raw_handle()),
-            uris: ManagedVec::from_raw_handle(uris_handle.get_raw_handle()),
+        unsafe {
+            EsdtTokenData {
+                token_type,
+                amount: BigUint::from_raw_handle(value_handle.get_raw_handle()),
+                frozen,
+                hash: ManagedBuffer::from_raw_handle(hash_handle.get_raw_handle()),
+                name: ManagedBuffer::from_raw_handle(name_handle.get_raw_handle()),
+                attributes: ManagedBuffer::from_raw_handle(attributes_handle.get_raw_handle()),
+                creator: ManagedAddress::from_raw_handle(creator_handle.get_raw_handle()),
+                royalties: BigUint::from_raw_handle(royalties_handle.get_raw_handle()),
+                uris: ManagedVec::from_raw_handle(uris_handle.get_raw_handle()),
+            }
         }
     }
 
@@ -375,9 +400,13 @@ where
             call_value_handle.get_raw_handle(),
         );
 
-        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()),
+        unsafe {
+            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(),
+                ),
+            }
         }
     }
 
@@ -441,13 +470,11 @@ where
         // load value
         A::storage_read_api_impl()
             .storage_load_managed_buffer_raw(temp_handle_1, temp_handle_2.clone());
-        let result_handle: A::BigIntHandle = use_raw_handle(A::static_var_api_impl().next_handle());
 
         // convert value to BigUint
-        A::managed_type_impl().mb_to_big_int_unsigned(temp_handle_2, result_handle.clone());
-
-        //wrap
-        BigUint::from_handle(result_handle)
+        let result = unsafe { BigUint::new_uninit() };
+        A::managed_type_impl().mb_to_big_int_unsigned(temp_handle_2, result.get_handle());
+        result
     }
 }
 
diff --git a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
index c314899eaa..3731d4a964 100644
--- a/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/crypto_wrapper.rs
@@ -1,11 +1,8 @@
 use core::marker::PhantomData;
 
 use crate::{
-    api::{
-        use_raw_handle, CryptoApi, CryptoApiImpl, StaticVarApiImpl, KECCAK256_RESULT_LEN,
-        SHA256_RESULT_LEN,
-    },
-    types::{ManagedBuffer, ManagedByteArray, ManagedType, MessageHashType},
+    api::{CryptoApi, CryptoApiImpl, KECCAK256_RESULT_LEN, SHA256_RESULT_LEN},
+    types::{ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, MessageHashType},
 };
 
 #[derive(Default)]
@@ -30,30 +27,33 @@ where
         &self,
         data: B,
     ) -> ManagedByteArray<A, SHA256_RESULT_LEN> {
-        let new_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::crypto_api_impl().sha256_managed(new_handle.clone(), data.borrow().get_handle());
-        ManagedByteArray::from_handle(new_handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::crypto_api_impl().sha256_managed(result.get_handle(), data.borrow().get_handle());
+            result
+        }
     }
 
     pub fn keccak256<B: core::borrow::Borrow<ManagedBuffer<A>>>(
         &self,
         data: B,
     ) -> ManagedByteArray<A, KECCAK256_RESULT_LEN> {
-        let new_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::crypto_api_impl().keccak256_managed(new_handle.clone(), data.borrow().get_handle());
-        ManagedByteArray::from_handle(new_handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::crypto_api_impl().keccak256_managed(result.get_handle(), data.borrow().get_handle());
+            result
+        }
     }
 
     pub fn ripemd160<B: core::borrow::Borrow<ManagedBuffer<A>>>(
         &self,
         data: B,
     ) -> ManagedByteArray<A, { crate::api::RIPEMD_RESULT_LEN }> {
-        let new_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::crypto_api_impl().ripemd160_managed(new_handle.clone(), data.borrow().get_handle());
-        ManagedByteArray::from_handle(new_handle)
+        unsafe {
+            let result = ManagedByteArray::new_uninit();
+            A::crypto_api_impl().ripemd160_managed(result.get_handle(), data.borrow().get_handle());
+            result
+        }
     }
 
     pub fn verify_bls(
@@ -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(
@@ -120,13 +122,62 @@ where
         r: &ManagedBuffer<A>,
         s: &ManagedBuffer<A>,
     ) -> ManagedBuffer<A> {
-        let new_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::crypto_api_impl().encode_secp256k1_der_signature_managed(
-            r.get_handle(),
-            s.get_handle(),
-            new_handle.clone(),
-        );
-        ManagedBuffer::from_handle(new_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            A::crypto_api_impl().encode_secp256k1_der_signature_managed(
+                r.get_handle(),
+                s.get_handle(),
+                result.get_handle(),
+            );
+            result
+        }
+    }
+
+    /// 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>,
+    ) {
+        A::crypto_api_impl().verify_secp256r1_managed(
+            key.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
+    }
+
+    /// 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>,
+    ) {
+        A::crypto_api_impl().verify_bls_signature_share_managed(
+            key.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
+    }
+
+    /// Calls the Vm to verify BLS aggregated signature.
+    ///
+    /// Does not return result, will fail tx directly!
+    pub fn verify_bls_aggregated_signature(
+        &self,
+        keys: &ManagedVec<A, ManagedBuffer<A>>,
+        message: &ManagedBuffer<A>,
+        signature: &ManagedBuffer<A>,
+    ) {
+        A::crypto_api_impl().verify_bls_aggregated_signature_managed(
+            keys.get_handle(),
+            message.get_handle(),
+            signature.get_handle(),
+        )
     }
 }
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 5d290369df..07466ac234 100644
--- a/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_raw_wrapper.rs
@@ -192,10 +192,12 @@ where
             new_address_handle,
             result_handle,
         );
-        (
-            ManagedAddress::from_raw_handle(new_address_handle),
-            ManagedVec::from_raw_handle(result_handle),
-        )
+        unsafe {
+            (
+                ManagedAddress::from_raw_handle(new_address_handle),
+                ManagedVec::from_raw_handle(result_handle),
+            )
+        }
     }
 
     /// Deploys a new contract in the same shard by re-using the code of an already deployed source contract.
@@ -222,10 +224,12 @@ where
             new_address_handle,
             result_handle,
         );
-        (
-            ManagedAddress::from_raw_handle(new_address_handle),
-            ManagedVec::from_raw_handle(result_handle),
-        )
+        unsafe {
+            (
+                ManagedAddress::from_raw_handle(new_address_handle),
+                ManagedVec::from_raw_handle(result_handle),
+            )
+        }
     }
 
     pub fn upgrade_from_source_contract(
@@ -291,7 +295,7 @@ where
             arg_buffer.get_handle().get_raw_handle(),
             result_handle,
         );
-        ManagedVec::from_raw_handle(result_handle)
+        unsafe { ManagedVec::from_raw_handle(result_handle) }
     }
 
     pub fn execute_on_same_context_raw(
@@ -311,7 +315,7 @@ where
             arg_buffer.get_handle().get_raw_handle(),
             result_handle,
         );
-        ManagedVec::from_raw_handle(result_handle)
+        unsafe { ManagedVec::from_raw_handle(result_handle) }
     }
 
     /// Same shard, in-line execution of another contract.
@@ -330,7 +334,7 @@ where
             arg_buffer.get_handle().get_raw_handle(),
             result_handle,
         );
-        ManagedVec::from_raw_handle(result_handle)
+        unsafe { ManagedVec::from_raw_handle(result_handle) }
     }
 
     /// Allows synchronously calling a local function by name. Execution is resumed afterwards.
@@ -357,8 +361,7 @@ where
         );
 
         self.clean_return_data();
-
-        ManagedVec::from_raw_handle(result_handle)
+        unsafe { ManagedVec::from_raw_handle(result_handle) }
     }
 
     pub fn clean_return_data(&self) {
diff --git a/framework/base/src/contract_base/wrappers/send_wrapper.rs b/framework/base/src/contract_base/wrappers/send_wrapper.rs
index 3a11bde247..0c23b67cd4 100644
--- a/framework/base/src/contract_base/wrappers/send_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/send_wrapper.rs
@@ -2,6 +2,7 @@ use core::marker::PhantomData;
 
 use crate::codec::Empty;
 
+use crate::types::ManagedRef;
 use crate::{
     api::{BlockchainApi, CallTypeApi, StorageReadApi},
     codec,
@@ -589,7 +590,9 @@ where
     ) -> u64 {
         let big_zero = BigUint::zero();
         let empty_buffer = ManagedBuffer::new();
-        let empty_vec = ManagedVec::from_handle(empty_buffer.get_handle());
+
+        // sneakily reuses the same handle
+        let empty_vec = unsafe { ManagedRef::wrap_handle(empty_buffer.get_handle()) };
 
         self.esdt_nft_create(
             token,
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 7417d6ca52..9fd49e115b 100644
--- a/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
+++ b/framework/base/src/contract_base/wrappers/storage_raw_wrapper.rs
@@ -59,7 +59,8 @@ where
         V: TopDecode,
     {
         let key: StorageKey<A> = storage_key.into();
-        let result_buffer = ManagedBuffer::<A>::from_handle(use_raw_handle(MBUF_TEMPORARY_1));
+        let result_buffer =
+            unsafe { ManagedBuffer::<A>::from_handle(use_raw_handle(MBUF_TEMPORARY_1)) };
         A::storage_read_api_impl().storage_load_from_address(
             address.get_handle(),
             key.get_handle(),
diff --git a/framework/base/src/external_view_contract.rs b/framework/base/src/external_view_contract.rs
index 2b01176176..4388e74618 100644
--- a/framework/base/src/external_view_contract.rs
+++ b/framework/base/src/external_view_contract.rs
@@ -32,21 +32,14 @@ where
 /// The definition for the external view
 pub fn external_view_contract_constructor_abi() -> EndpointAbi {
     let mut endpoint_abi = EndpointAbi::new(
-        &[
-            "The external view init prepares a contract that looks in another contract's storage.",
-            "It takes a single argument, the other contract's address",
-            "You won't find this constructors' definition in the contract, it gets injected automatically by the framework. See `multiversx_sc::external_view_contract`.",
-            ],
         "init",
         EXTERNAL_VIEW_CONSTRUCTOR_FLAG,
-        false,
-        false,
         EndpointMutabilityAbi::Mutable,
         EndpointTypeAbi::Init,
-        &[],
-        &[],
-        false
-    );
+    )
+    .with_docs("The external view init prepares a contract that looks in another contract's storage.")
+    .with_docs("It takes a single argument, the other contract's address")
+    .with_docs("You won't find this constructors' definition in the contract, it gets injected automatically by the framework. See `multiversx_sc::external_view_contract`.");
     endpoint_abi.inputs.push(InputAbi {
         arg_name: "target_contract_address".to_string(),
         type_names: crate::types::heap::Address::type_names(),
diff --git a/framework/base/src/formatter.rs b/framework/base/src/formatter.rs
index e850ec2111..117d332382 100644
--- a/framework/base/src/formatter.rs
+++ b/framework/base/src/formatter.rs
@@ -1,6 +1,7 @@
 mod formatter_impl_bool;
 mod formatter_impl_bytes;
 mod formatter_impl_num;
+mod formatter_impl_vm_core;
 mod formatter_traits;
 pub mod hex_util;
 
diff --git a/framework/base/src/formatter/formatter_impl_vm_core.rs b/framework/base/src/formatter/formatter_impl_vm_core.rs
new file mode 100644
index 0000000000..609c090e36
--- /dev/null
+++ b/framework/base/src/formatter/formatter_impl_vm_core.rs
@@ -0,0 +1,25 @@
+use multiversx_chain_core::types::CodeMetadata;
+
+use super::{hex_util, FormatByteReceiver, SCBinary, SCDisplay, SCLowerHex};
+
+impl SCDisplay for CodeMetadata {
+    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
+        self.for_each_string_token(|token| f.append_bytes(token.as_bytes()))
+    }
+}
+
+impl SCLowerHex for CodeMetadata {
+    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
+        let num = self.bits().to_be_bytes();
+        f.append_bytes(&hex_util::byte_to_hex_digits(num[0])[..]);
+        f.append_bytes(&hex_util::byte_to_hex_digits(num[1])[..]);
+    }
+}
+
+impl SCBinary for CodeMetadata {
+    fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
+        let num = self.bits().to_be_bytes();
+        f.append_bytes(&hex_util::byte_to_binary_digits(num[0])[..]);
+        f.append_bytes(&hex_util::byte_to_binary_digits(num[1])[..]);
+    }
+}
diff --git a/framework/base/src/io/arg_de_input.rs b/framework/base/src/io/arg_de_input.rs
index 98faef2899..1b5502b6fa 100644
--- a/framework/base/src/io/arg_de_input.rs
+++ b/framework/base/src/io/arg_de_input.rs
@@ -1,10 +1,7 @@
 use core::marker::PhantomData;
 
 use crate::{
-    api::{
-        use_raw_handle, EndpointArgumentApi, EndpointArgumentApiImpl, ManagedTypeApi,
-        StaticVarApiImpl,
-    },
+    api::{EndpointArgumentApi, EndpointArgumentApiImpl, ManagedTypeApi},
     codec::{
         try_execute_then_cast, DecodeError, DecodeErrorHandler, TopDecodeInput, TryStaticCast,
     },
@@ -43,22 +40,30 @@ where
     }
 
     fn to_managed_buffer(&self) -> ManagedBuffer<AA> {
-        let mbuf_handle: AA::ManagedBufferHandle =
-            use_raw_handle(AA::static_var_api_impl().next_handle());
-        AA::argument_api_impl().load_argument_managed_buffer(self.arg_index, mbuf_handle.clone());
-        ManagedBuffer::from_handle(mbuf_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            AA::argument_api_impl()
+                .load_argument_managed_buffer(self.arg_index, result.get_handle());
+            result
+        }
     }
 
     fn to_big_int(&self) -> BigInt<AA> {
-        let bi_handle: AA::BigIntHandle = use_raw_handle(AA::static_var_api_impl().next_handle());
-        AA::argument_api_impl().load_argument_big_int_signed(self.arg_index, bi_handle.clone());
-        BigInt::from_handle(bi_handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            AA::argument_api_impl()
+                .load_argument_big_int_signed(self.arg_index, result.get_handle());
+            result
+        }
     }
 
     fn to_big_uint(&self) -> BigUint<AA> {
-        let bi_handle: AA::BigIntHandle = use_raw_handle(AA::static_var_api_impl().next_handle());
-        AA::argument_api_impl().load_argument_big_int_unsigned(self.arg_index, bi_handle.clone());
-        BigUint::from_handle(bi_handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            AA::argument_api_impl()
+                .load_argument_big_int_unsigned(self.arg_index, result.get_handle());
+            result
+        }
     }
 }
 
diff --git a/framework/base/src/io/arg_nested_tuple.rs b/framework/base/src/io/arg_nested_tuple.rs
index fca34c9886..1a0eaace7a 100644
--- a/framework/base/src/io/arg_nested_tuple.rs
+++ b/framework/base/src/io/arg_nested_tuple.rs
@@ -198,13 +198,15 @@ 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())
+    unsafe {
+        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())
+    }
 }
diff --git a/framework/base/src/lib.rs b/framework/base/src/lib.rs
index 3b8fc6c0f5..9f6680af7c 100644
--- a/framework/base/src/lib.rs
+++ b/framework/base/src/lib.rs
@@ -9,6 +9,9 @@ extern crate alloc;
 /// The current version of `multiversx_sc_codec`, re-exported.
 pub use multiversx_sc_codec as codec;
 
+// Re-exporting the VM-core, for convenience.
+pub use multiversx_chain_core as chain_core;
+
 /// Reexported for convenience.
 pub use crate::codec::arrayvec;
 
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) {
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/base/src/storage/storage_get.rs b/framework/base/src/storage/storage_get.rs
index 85107896dd..b33b5e1dcb 100644
--- a/framework/base/src/storage/storage_get.rs
+++ b/framework/base/src/storage/storage_get.rs
@@ -3,7 +3,7 @@ use core::{convert::Infallible, marker::PhantomData};
 use crate::{
     api::{
         const_handles, use_raw_handle, ErrorApi, ErrorApiImpl, HandleConstraints,
-        ManagedBufferApiImpl, ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
+        ManagedBufferApiImpl, ManagedTypeApi, StorageReadApi, StorageReadApiImpl,
     },
     codec::*,
     err_msg,
@@ -33,11 +33,12 @@ where
     }
 
     fn to_managed_buffer(&self) -> ManagedBuffer<A> {
-        let mbuf_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::storage_read_api_impl()
-            .storage_load_managed_buffer_raw(self.key.buffer.get_handle(), mbuf_handle.clone());
-        ManagedBuffer::from_handle(mbuf_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            A::storage_read_api_impl()
+                .storage_load_managed_buffer_raw(self.key.buffer.get_handle(), result.get_handle());
+            result
+        }
     }
 
     fn to_big_uint(&self) -> BigUint<A> {
diff --git a/framework/base/src/storage/storage_get_from_address.rs b/framework/base/src/storage/storage_get_from_address.rs
index 2b40987bd3..13a467d2f0 100644
--- a/framework/base/src/storage/storage_get_from_address.rs
+++ b/framework/base/src/storage/storage_get_from_address.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::{
         const_handles, use_raw_handle, ErrorApi, HandleConstraints, ManagedBufferApiImpl,
-        ManagedTypeApi, StaticVarApiImpl, StorageReadApi, StorageReadApiImpl,
+        ManagedTypeApi, StorageReadApi, StorageReadApiImpl,
     },
     codec::*,
     types::{
@@ -35,15 +35,15 @@ where
     }
 
     fn to_managed_buffer(&self) -> ManagedBuffer<A> {
-        let mbuf_handle: A::ManagedBufferHandle =
-            use_raw_handle(A::static_var_api_impl().next_handle());
-        A::storage_read_api_impl().storage_load_from_address(
-            self.addr.get_handle(),
-            self.key.buffer.get_handle(),
-            mbuf_handle.clone(),
-        );
-
-        ManagedBuffer::from_handle(mbuf_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            A::storage_read_api_impl().storage_load_from_address(
+                self.addr.get_handle(),
+                self.key.buffer.get_handle(),
+                result.get_handle(),
+            );
+            result
+        }
     }
 
     fn to_big_uint(&self) -> BigUint<A> {
diff --git a/framework/base/src/storage/storage_key.rs b/framework/base/src/storage/storage_key.rs
index b56358218b..b3a35643e1 100644
--- a/framework/base/src/storage/storage_key.rs
+++ b/framework/base/src/storage/storage_key.rs
@@ -22,7 +22,7 @@ where
     type OwnHandle = A::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: A::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: A::ManagedBufferHandle) -> Self {
         StorageKey {
             buffer: ManagedBuffer::from_handle(handle),
         }
@@ -35,6 +35,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &A::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut A::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<A> StorageKey<A>
diff --git a/framework/base/src/types.rs b/framework/base/src/types.rs
index 23d94214ba..41d303e91b 100644
--- a/framework/base/src/types.rs
+++ b/framework/base/src/types.rs
@@ -1,5 +1,4 @@
 mod crypto;
-mod flags;
 pub mod heap;
 mod interaction;
 mod io;
@@ -8,7 +7,6 @@ pub(crate) mod math_util;
 mod static_buffer;
 
 pub use crypto::*;
-pub use flags::*;
 pub use interaction::*;
 pub use io::*;
 pub use managed::*;
@@ -17,3 +15,8 @@ pub use static_buffer::*;
 /// Only import the heap types in contracts when the "alloc" feature is on.
 #[cfg(feature = "alloc")]
 pub use heap::*;
+
+pub use crate::chain_core::types::CodeMetadata;
+pub use crate::chain_core::types::EsdtLocalRole;
+pub use crate::chain_core::types::EsdtLocalRoleFlags;
+pub use crate::chain_core::types::EsdtTokenType;
diff --git a/framework/base/src/types/flags/esdt_local_role.rs b/framework/base/src/types/flags/esdt_local_role.rs
deleted file mode 100644
index b66ac612f5..0000000000
--- a/framework/base/src/types/flags/esdt_local_role.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use super::EsdtLocalRoleFlags;
-use crate as multiversx_sc;
-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";
-static ESDT_ROLE_LOCAL_BURN: &[u8] = b"ESDTRoleLocalBurn";
-static ESDT_ROLE_NFT_CREATE: &[u8] = b"ESDTRoleNFTCreate";
-static ESDT_ROLE_NFT_ADD_QUANTITY: &[u8] = b"ESDTRoleNFTAddQuantity";
-static ESDT_ROLE_NFT_BURN: &[u8] = b"ESDTRoleNFTBurn";
-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";
-
-#[type_abi]
-#[derive(TopDecode, TopEncode, NestedDecode, NestedEncode, Clone, PartialEq, Eq, Debug, Copy)]
-pub enum EsdtLocalRole {
-    None,
-    Mint,
-    Burn,
-    NftCreate,
-    NftAddQuantity,
-    NftBurn,
-    NftAddUri,
-    NftUpdateAttributes,
-    Transfer,
-}
-
-impl EsdtLocalRole {
-    pub fn as_u16(&self) -> u16 {
-        match self {
-            Self::None => 0,
-            Self::Mint => 1,
-            Self::Burn => 2,
-            Self::NftCreate => 3,
-            Self::NftAddQuantity => 4,
-            Self::NftBurn => 5,
-            Self::NftAddUri => 6,
-            Self::NftUpdateAttributes => 7,
-            Self::Transfer => 8,
-        }
-    }
-
-    pub fn as_role_name(&self) -> &'static [u8] {
-        match self {
-            Self::None => ESDT_ROLE_NONE,
-            Self::Mint => ESDT_ROLE_LOCAL_MINT,
-            Self::Burn => ESDT_ROLE_LOCAL_BURN,
-            Self::NftCreate => ESDT_ROLE_NFT_CREATE,
-            Self::NftAddQuantity => ESDT_ROLE_NFT_ADD_QUANTITY,
-            Self::NftBurn => ESDT_ROLE_NFT_BURN,
-            Self::NftAddUri => ESDT_ROLE_NFT_ADD_URI,
-            Self::NftUpdateAttributes => ESDT_ROLE_NFT_UPDATE_ATTRIBUTES,
-            Self::Transfer => ESDT_ROLE_TRANSFER,
-        }
-    }
-
-    pub fn to_flag(&self) -> EsdtLocalRoleFlags {
-        match self {
-            Self::None => EsdtLocalRoleFlags::NONE,
-            Self::Mint => EsdtLocalRoleFlags::MINT,
-            Self::Burn => EsdtLocalRoleFlags::BURN,
-            Self::NftCreate => EsdtLocalRoleFlags::NFT_CREATE,
-            Self::NftAddQuantity => EsdtLocalRoleFlags::NFT_ADD_QUANTITY,
-            Self::NftBurn => EsdtLocalRoleFlags::NFT_BURN,
-            Self::NftAddUri => EsdtLocalRoleFlags::NFT_ADD_URI,
-            Self::NftUpdateAttributes => EsdtLocalRoleFlags::NFT_UPDATE_ATTRIBUTES,
-            Self::Transfer => EsdtLocalRoleFlags::TRANSFER,
-        }
-    }
-}
-
-// TODO: can be done with macros, but I didn't find a public library that does it and is no_std
-// we can implement it, it's easy
-const ALL_ROLES: [EsdtLocalRole; 8] = [
-    EsdtLocalRole::Mint,
-    EsdtLocalRole::Burn,
-    EsdtLocalRole::NftCreate,
-    EsdtLocalRole::NftAddQuantity,
-    EsdtLocalRole::NftBurn,
-    EsdtLocalRole::NftAddUri,
-    EsdtLocalRole::NftUpdateAttributes,
-    EsdtLocalRole::Transfer,
-];
-
-impl EsdtLocalRole {
-    pub fn iter_all() -> core::slice::Iter<'static, EsdtLocalRole> {
-        ALL_ROLES.iter()
-    }
-}
-
-impl From<u16> for EsdtLocalRole {
-    #[inline]
-    fn from(value: u16) -> Self {
-        match value {
-            1 => Self::Mint,
-            2 => Self::Burn,
-            3 => Self::NftCreate,
-            4 => Self::NftAddQuantity,
-            5 => Self::NftBurn,
-            6 => Self::NftAddUri,
-            7 => Self::NftUpdateAttributes,
-            8 => Self::Transfer,
-            _ => Self::None,
-        }
-    }
-}
-
-impl<'a> From<&'a [u8]> for EsdtLocalRole {
-    #[inline]
-    fn from(byte_slice: &'a [u8]) -> Self {
-        if byte_slice == ESDT_ROLE_LOCAL_MINT {
-            Self::Mint
-        } else if byte_slice == ESDT_ROLE_LOCAL_BURN {
-            Self::Burn
-        } else if byte_slice == ESDT_ROLE_NFT_CREATE {
-            Self::NftCreate
-        } else if byte_slice == ESDT_ROLE_NFT_ADD_QUANTITY {
-            Self::NftAddQuantity
-        } else if byte_slice == ESDT_ROLE_NFT_BURN {
-            Self::NftBurn
-        } else if byte_slice == ESDT_ROLE_NFT_ADD_URI {
-            Self::NftAddUri
-        } else if byte_slice == ESDT_ROLE_NFT_UPDATE_ATTRIBUTES {
-            Self::NftUpdateAttributes
-        } else if byte_slice == ESDT_ROLE_TRANSFER {
-            Self::Transfer
-        } else {
-            Self::None
-        }
-    }
-}
-
-impl ManagedVecItem for EsdtLocalRole {
-    type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
-    const SKIPS_RESERIALIZATION: bool = false; // TODO: might be ok to be true, but needs testing
-    type Ref<'a> = Self;
-
-    fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self {
-        u16::from_byte_reader(reader).into()
-    }
-
-    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, writer: Writer) -> R {
-        <u16 as ManagedVecItem>::to_byte_writer(&self.as_u16(), writer)
-    }
-}
diff --git a/framework/base/src/types/heap/mod.rs b/framework/base/src/types/heap.rs
similarity index 63%
rename from framework/base/src/types/heap/mod.rs
rename to framework/base/src/types/heap.rs
index eea5a01b90..18a7a5f9fc 100644
--- a/framework/base/src/types/heap/mod.rs
+++ b/framework/base/src/types/heap.rs
@@ -1,15 +1,11 @@
 mod arg_buffer;
 mod async_call_result;
-mod boxed_bytes;
-mod h256;
-mod h256_address;
 mod queue;
 
 pub use arg_buffer::ArgBuffer;
 pub use async_call_result::{AsyncCallError, AsyncCallResult};
-pub use boxed_bytes::BoxedBytes;
-pub use h256::H256;
-pub use h256_address::Address;
 pub use queue::Queue;
 
 pub use alloc::{boxed::Box, string::String, vec::Vec};
+
+pub use crate::chain_core::types::{Address, BoxedBytes, H256};
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 ee3726c0eb..f2d091e2b3 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
@@ -1,5 +1,7 @@
+use core::ops::DerefMut;
+
 use crate::{
-    api::CallTypeApi,
+    api::{const_handles, CallTypeApi},
     contract_base::SendRawWrapper,
     types::{BigUint, CallbackClosure, FunctionCall, ManagedAddress, ManagedBuffer},
 };
@@ -41,16 +43,14 @@ where
     }
 
     pub fn register_promise(self) {
-        use crate::{api::const_handles, types::ManagedType};
-
         let mut cb_closure_args_serialized =
-            ManagedBuffer::<SA>::from_raw_handle(const_handles::MBUF_TEMPORARY_1);
+            unsafe { ManagedBuffer::temp_const_ref_mut(const_handles::MBUF_TEMPORARY_1) };
         let callback_name;
         if let Some(callback_call) = self.callback_call {
             callback_name = callback_call.callback_name;
             callback_call
                 .closure_args
-                .serialize_overwrite(&mut cb_closure_args_serialized);
+                .serialize_overwrite(cb_closure_args_serialized.deref_mut());
         } else {
             callback_name = "";
             cb_closure_args_serialized.overwrite(&[]);
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 427218f1c8..f0f1722f24 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
@@ -36,10 +36,12 @@ where
             call_value_handle.get_raw_handle(),
         );
 
-        (
-            BigUint::from_raw_handle(call_value_handle.get_raw_handle()),
-            ManagedVec::from_raw_handle(esdt_transfer_value_handle.get_raw_handle()),
-        )
+        unsafe {
+            (
+                BigUint::from_raw_handle(call_value_handle.get_raw_handle()),
+                ManagedVec::from_raw_handle(esdt_transfer_value_handle.get_raw_handle()),
+            )
+        }
     }
 
     pub fn to_call_data_string(&self) -> ManagedBuffer<SA> {
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..68865d8fbc 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,18 @@ 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()
+    }
+
+    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/managed_arg_buffer.rs b/framework/base/src/types/interaction/managed_arg_buffer.rs
index c6dae76afd..009ad74e3a 100644
--- a/framework/base/src/types/interaction/managed_arg_buffer.rs
+++ b/framework/base/src/types/interaction/managed_arg_buffer.rs
@@ -33,7 +33,7 @@ where
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         ManagedArgBuffer {
             data: ManagedVec::from_handle(handle),
         }
@@ -46,6 +46,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> ManagedArgBuffer<M>
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..8487f001cd 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,10 +1,11 @@
 use hex_literal::hex;
+use multiversx_chain_core::types::Address;
 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.
@@ -26,6 +27,10 @@ impl ESDTSystemSCAddress {
         ManagedAddress::from(SYSTEM_SC_ADDRESS_BYTES)
     }
 
+    pub fn to_address(&self) -> Address {
+        SYSTEM_SC_ADDRESS_BYTES.into()
+    }
+
     pub fn to_bech32_str(&self) -> &str {
         SYSTEM_SC_ADDRESS_BECH32
     }
@@ -35,21 +40,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/framework/base/src/types/interaction/markers/to_caller.rs b/framework/base/src/types/interaction/markers/to_caller.rs
index f24191ce9f..9066a16239 100644
--- a/framework/base/src/types/interaction/markers/to_caller.rs
+++ b/framework/base/src/types/interaction/markers/to_caller.rs
@@ -1,5 +1,5 @@
 use crate::{
-    api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
+    api::{const_handles, BlockchainApi, BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
     types::{
         AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
@@ -25,9 +25,11 @@ where
     where
         F: FnOnce(&ManagedAddress<Api>) -> R,
     {
-        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))
+        unsafe {
+            let temp = ManagedAddress::temp_const_ref(const_handles::ADDRESS_CALLER);
+            Api::blockchain_api_impl().load_caller_managed(temp.get_handle());
+            f(&temp)
+        }
     }
 }
 
diff --git a/framework/base/src/types/interaction/markers/to_self.rs b/framework/base/src/types/interaction/markers/to_self.rs
index f339a448e2..8a78e13d6d 100644
--- a/framework/base/src/types/interaction/markers/to_self.rs
+++ b/framework/base/src/types/interaction/markers/to_self.rs
@@ -1,5 +1,5 @@
 use crate::{
-    api::{const_handles, use_raw_handle, BlockchainApi, BlockchainApiImpl, CallTypeApi},
+    api::{const_handles, BlockchainApi, BlockchainApiImpl, CallTypeApi},
     contract_base::BlockchainWrapper,
     types::{
         AnnotatedValue, ManagedAddress, ManagedBuffer, ManagedType, TxScEnv, TxTo, TxToSpecified,
@@ -26,10 +26,11 @@ where
     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))
+        unsafe {
+            let temp = ManagedAddress::temp_const_ref(const_handles::ADDRESS_CALLER);
+            Api::blockchain_api_impl().load_sc_address_managed(temp.get_handle());
+            f(&temp)
+        }
     }
 }
 
diff --git a/framework/base/src/types/interaction/result_handlers.rs b/framework/base/src/types/interaction/result_handlers.rs
index dd3a334e2c..7e7003940a 100644
--- a/framework/base/src/types/interaction/result_handlers.rs
+++ b/framework/base/src/types/interaction/result_handlers.rs
@@ -1,4 +1,8 @@
+mod pass_value;
 mod returns_bt;
+mod returns_bt_egld;
+mod returns_bt_multi_esdt;
+mod returns_bt_single_esdt;
 mod returns_new_address;
 mod returns_new_managed_address;
 mod returns_raw_result;
@@ -10,7 +14,11 @@ mod with_raw_result;
 mod with_result;
 mod with_result_as;
 
+pub use pass_value::PassValue;
 pub use returns_bt::*;
+pub use returns_bt_egld::ReturnsBackTransfersEGLD;
+pub use returns_bt_multi_esdt::ReturnsBackTransfersMultiESDT;
+pub use returns_bt_single_esdt::ReturnsBackTransfersSingleESDT;
 pub use returns_new_address::*;
 pub use returns_new_managed_address::*;
 pub use returns_raw_result::*;
diff --git a/framework/base/src/types/interaction/result_handlers/pass_value.rs b/framework/base/src/types/interaction/result_handlers/pass_value.rs
new file mode 100644
index 0000000000..db45683e42
--- /dev/null
+++ b/framework/base/src/types/interaction/result_handlers/pass_value.rs
@@ -0,0 +1,24 @@
+use crate::types::{RHListItem, RHListItemExec, TxEnv};
+
+/// Simply passes a value to the result.
+///
+/// The value is constant with respect to the tx, will always be returned, irrespective of the tx execution.
+///
+/// It is especially useful in multi-calls, since it can pass context from the setup section to the result processing section.
+pub struct PassValue<T>(pub T);
+
+impl<Env, Original, T> RHListItem<Env, Original> for PassValue<T>
+where
+    Env: TxEnv,
+{
+    type Returns = T;
+}
+
+impl<RawResult, Env, Original, T> RHListItemExec<RawResult, Env, Original> for PassValue<T>
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, _raw_result: &RawResult) -> T {
+        self.0
+    }
+}
diff --git a/framework/base/src/types/interaction/result_handlers/returns_bt_egld.rs b/framework/base/src/types/interaction/result_handlers/returns_bt_egld.rs
new file mode 100644
index 0000000000..3b25ea5c25
--- /dev/null
+++ b/framework/base/src/types/interaction/result_handlers/returns_bt_egld.rs
@@ -0,0 +1,25 @@
+use crate::{
+    contract_base::BlockchainWrapper,
+    types::{BigUint, RHListItem, RHListItemExec, TxEnv},
+};
+
+/// Indicates that back-transfers will be returned.
+pub struct ReturnsBackTransfersEGLD;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfersEGLD
+where
+    Env: TxEnv,
+{
+    type Returns = BigUint<Env::Api>;
+}
+
+impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original> for ReturnsBackTransfersEGLD
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {
+        BlockchainWrapper::<Env::Api>::new()
+            .get_back_transfers()
+            .total_egld_amount
+    }
+}
diff --git a/framework/base/src/types/interaction/result_handlers/returns_bt_multi_esdt.rs b/framework/base/src/types/interaction/result_handlers/returns_bt_multi_esdt.rs
new file mode 100644
index 0000000000..445269f7ec
--- /dev/null
+++ b/framework/base/src/types/interaction/result_handlers/returns_bt_multi_esdt.rs
@@ -0,0 +1,26 @@
+use crate::{
+    contract_base::BlockchainWrapper,
+    types::{EsdtTokenPayment, ManagedVec, RHListItem, RHListItemExec, TxEnv},
+};
+
+/// Indicates that back-transfers will be returned.
+pub struct ReturnsBackTransfersMultiESDT;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfersMultiESDT
+where
+    Env: TxEnv,
+{
+    type Returns = ManagedVec<Env::Api, EsdtTokenPayment<Env::Api>>;
+}
+
+impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original>
+    for ReturnsBackTransfersMultiESDT
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {
+        BlockchainWrapper::<Env::Api>::new()
+            .get_back_transfers()
+            .esdt_payments
+    }
+}
diff --git a/framework/base/src/types/interaction/result_handlers/returns_bt_single_esdt.rs b/framework/base/src/types/interaction/result_handlers/returns_bt_single_esdt.rs
new file mode 100644
index 0000000000..996891c1c2
--- /dev/null
+++ b/framework/base/src/types/interaction/result_handlers/returns_bt_single_esdt.rs
@@ -0,0 +1,33 @@
+use crate::{
+    api::{ErrorApi, ErrorApiImpl},
+    contract_base::BlockchainWrapper,
+    types::{EsdtTokenPayment, RHListItem, RHListItemExec, TxEnv},
+};
+
+/// Indicates that back-transfers will be returned.
+pub struct ReturnsBackTransfersSingleESDT;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsBackTransfersSingleESDT
+where
+    Env: TxEnv,
+{
+    type Returns = EsdtTokenPayment<Env::Api>;
+}
+
+impl<RawResult, Env, Original> RHListItemExec<RawResult, Env, Original>
+    for ReturnsBackTransfersSingleESDT
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, _raw_result: &RawResult) -> Self::Returns {
+        let esdt_payments = BlockchainWrapper::<Env::Api>::new()
+            .get_back_transfers()
+            .esdt_payments;
+
+        if esdt_payments.len() != 1 {
+            Env::Api::error_api_impl().signal_error(b"Back transfers expected to be a single ESDT")
+        }
+
+        esdt_payments.get(0)
+    }
+}
diff --git a/framework/base/src/types/interaction/system_proxy.rs b/framework/base/src/types/interaction/system_proxy.rs
index 3b1fb836d6..e86c9f32ff 100644
--- a/framework/base/src/types/interaction/system_proxy.rs
+++ b/framework/base/src/types/interaction/system_proxy.rs
@@ -1,4 +1,3 @@
-pub mod builtin_func_names;
 mod builtin_func_proxy;
 mod esdt_system_sc_proxy;
 mod legacy_system_sc_proxy;
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..1bf7c3a1fc 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
@@ -5,7 +5,7 @@ use crate::types::{
     TxEnv, TxFrom, TxGas, TxProxyTrait, TxTo, TxTypedCall,
 };
 
-use super::builtin_func_names::{
+use crate::chain_core::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,
@@ -78,62 +78,68 @@ where
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call(CHANGE_OWNER_BUILTIN_FUNC_NAME)
-            .argument(new_owner)
+            .argument(&new_owner)
             .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
                 .wrapped_tx
                 .payment(NotPayable)
                 .raw_call(ESDT_LOCAL_BURN_FUNC_NAME)
-                .argument(token)
-                .argument(amount)
+                .argument(&token)
+                .argument(&amount)
                 .original_result();
         }
 
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call(ESDT_NFT_BURN_FUNC_NAME)
-            .argument(token)
+            .argument(&token)
             .argument(&nonce)
-            .argument(amount)
+            .argument(&amount)
             .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
                 .wrapped_tx
                 .payment(NotPayable)
                 .raw_call(ESDT_LOCAL_MINT_FUNC_NAME)
-                .argument(token)
-                .argument(amount)
+                .argument(&token)
+                .argument(&amount)
                 .original_result();
         }
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call(ESDT_NFT_ADD_QUANTITY_FUNC_NAME)
-            .argument(token)
+            .argument(&token)
             .argument(&nonce)
-            .argument(amount)
+            .argument(&amount)
             .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, ()> {
@@ -141,7 +147,7 @@ where
             .wrapped_tx
             .payment(NotPayable)
             .raw_call(ESDT_NFT_ADD_URI_FUNC_NAME)
-            .argument(token_id)
+            .argument(&token_id)
             .argument(&nft_nonce);
 
         for uri in new_uris {
@@ -151,29 +157,36 @@ 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, ()> {
         self.wrapped_tx
             .payment(NotPayable)
             .raw_call(ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME)
-            .argument(token_id)
+            .argument(&token_id)
             .argument(&nft_nonce)
-            .argument(new_attributes)
+            .argument(&new_attributes)
             .original_result()
     }
 
     #[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> {
@@ -181,12 +194,12 @@ where
             .wrapped_tx
             .payment(NotPayable)
             .raw_call(ESDT_NFT_CREATE_FUNC_NAME)
-            .argument(token)
-            .argument(amount)
-            .argument(name)
-            .argument(royalties)
-            .argument(hash)
-            .argument(attributes);
+            .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
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..979f9d1d60 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 {
@@ -233,11 +253,11 @@ where
             .wrapped_tx
             .raw_call(endpoint_name)
             .egld(issue_cost)
-            .argument(token_display_name)
-            .argument(token_ticker);
+            .argument(&token_display_name)
+            .argument(&token_ticker);
 
         if token_type == EsdtTokenType::Fungible {
-            tx = tx.argument(initial_supply);
+            tx = tx.argument(&initial_supply);
             tx = tx.argument(&properties.num_decimals);
         } else if token_type == EsdtTokenType::Meta {
             tx = tx.argument(&properties.num_decimals);
@@ -268,86 +288,92 @@ 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)
             .raw_call("mint")
-            .argument(token_identifier)
-            .argument(amount)
+            .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(
+    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)
             .raw_call("ESDTBurn")
-            .argument(token_identifier)
-            .argument(amount)
+            .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(
+    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)
             .raw_call("pause")
-            .argument(token_identifier)
+            .argument(&token_identifier)
             .original_result()
     }
 
     /// 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)
             .raw_call("unPause")
-            .argument(token_identifier)
+            .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(
+    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)
             .raw_call("freeze")
-            .argument(token_identifier)
-            .argument(address)
+            .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(
+    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)
             .raw_call("unFreeze")
-            .argument(token_identifier)
-            .argument(address)
+            .argument(&token_identifier)
+            .argument(&address)
             .original_result()
     }
 
@@ -355,50 +381,59 @@ 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)
             .raw_call("wipe")
-            .argument(token_identifier)
-            .argument(address)
+            .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(
+    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)
             .raw_call("freezeSingleNFT")
-            .argument(token_identifier)
+            .argument(&token_identifier)
             .argument(&nft_nonce)
-            .argument(address)
+            .argument(&address)
             .original_result()
     }
 
     /// 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)
             .raw_call("unFreezeSingleNFT")
-            .argument(token_identifier)
+            .argument(&token_identifier)
             .argument(&nft_nonce)
-            .argument(address)
+            .argument(&address)
             .original_result()
     }
 
@@ -406,26 +441,29 @@ 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)
             .raw_call("wipeSingleNFT")
-            .argument(token_identifier)
+            .argument(&token_identifier)
             .argument(&nft_nonce)
-            .argument(address)
+            .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(
+    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
@@ -440,18 +478,22 @@ 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
             .wrapped_tx
             .payment(NotPayable)
             .raw_call("setSpecialRole")
-            .argument(token_identifier)
-            .argument(address);
+            .argument(&token_identifier)
+            .argument(&address);
         for role in roles_iter {
             if role != EsdtLocalRole::None {
                 tx = tx.argument(&role.as_role_name());
@@ -465,18 +507,22 @@ 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
             .wrapped_tx
             .payment(NotPayable)
             .raw_call("unSetSpecialRole")
-            .argument(token_identifier)
-            .argument(address);
+            .argument(&token_identifier)
+            .argument(&address);
         for role in roles_iter {
             if role != EsdtLocalRole::None {
                 tx = tx.argument(&role.as_role_name());
@@ -486,44 +532,50 @@ 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)
             .raw_call("transferOwnership")
-            .argument(token_identifier)
-            .argument(new_owner)
+            .argument(&token_identifier)
+            .argument(&new_owner)
             .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)
             .raw_call("transferNFTCreateRole")
-            .argument(token_identifier)
-            .argument(old_creator)
-            .argument(new_creator)
+            .argument(&token_identifier)
+            .argument(&old_creator)
+            .argument(&new_creator)
             .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
             .wrapped_tx
             .payment(NotPayable)
             .raw_call("controlChanges")
-            .argument(token_identifier);
+            .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 905b9af8fc..b216ce0f28 100644
--- a/framework/base/src/types/interaction/tx.rs
+++ b/framework/base/src/types/interaction/tx.rs
@@ -908,11 +908,11 @@ where
 impl<Env, From, To, Payment, Gas, Data, RH> Tx<Env, From, To, Payment, Gas, Data, RH>
 where
     Env: TxEnvWithTxHash,
-    From: TxFromSpecified<Env>,
+    From: TxFrom<Env>,
     To: TxTo<Env>,
-    Payment: TxPaymentEgldOnly<Env>,
+    Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
-    Data: TxDataFunctionCall<Env>,
+    Data: TxData<Env>,
     RH: TxResultHandler<Env>,
 {
     /// Sets the mock transaction hash to be used in a test.
diff --git a/framework/base/src/types/interaction/tx_env.rs b/framework/base/src/types/interaction/tx_env.rs
index 37e18d7dec..188e304311 100644
--- a/framework/base/src/types/interaction/tx_env.rs
+++ b/framework/base/src/types/interaction/tx_env.rs
@@ -27,4 +27,7 @@ pub trait TxEnvMockDeployAddress: TxEnv {
 
 pub trait TxEnvWithTxHash: TxEnv {
     fn set_tx_hash(&mut self, tx_hash: H256);
+
+    /// Retrieves current tx hash, while resetting it in self.
+    fn take_tx_hash(&mut self) -> Option<H256>;
 }
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 38e38fcbcd..333bbf9379 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::{ErrorHelper, SendRawWrapper},
     types::{
         interaction::callback_closure::CallbackClosureWithGas, CallbackClosure, ExplicitGas,
-        FunctionCall, ManagedBuffer, ManagedType, OriginalResultMarker, Tx, TxGas, TxGasValue,
-        TxPayment, TxResultHandler, TxScEnv, TxToSpecified,
+        FunctionCall, ManagedBuffer, OriginalResultMarker, Tx, TxGas, TxGasValue, TxPayment,
+        TxResultHandler, TxScEnv, TxToSpecified,
     },
 };
 
@@ -160,7 +160,7 @@ where
     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);
+            unsafe { ManagedBuffer::temp_const_ref_mut(const_handles::MBUF_TEMPORARY_1) };
         self.result_handler
             .overwrite_with_serialized_args(&mut cb_closure_args_serialized);
         let extra_gas_for_callback = self.result_handler.gas_for_callback();
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)
+    }
+}
diff --git a/framework/base/src/types/managed/basic/big_float.rs b/framework/base/src/types/managed/basic/big_float.rs
index 54850a1672..634d76f67d 100644
--- a/framework/base/src/types/managed/basic/big_float.rs
+++ b/framework/base/src/types/managed/basic/big_float.rs
@@ -27,7 +27,7 @@ pub struct BigFloat<M: ManagedTypeApi> {
 impl<M: ManagedTypeApi> ManagedType<M> for BigFloat<M> {
     type OwnHandle = M::BigFloatHandle;
 
-    fn from_handle(handle: M::BigFloatHandle) -> Self {
+    unsafe fn from_handle(handle: M::BigFloatHandle) -> Self {
         BigFloat { handle }
     }
 
@@ -38,6 +38,10 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigFloat<M> {
     fn transmute_from_handle_ref(handle_ref: &M::BigFloatHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::BigFloatHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> From<&ManagedBuffer<M>> for BigFloat<M> {
@@ -81,10 +85,11 @@ macro_rules! big_float_conv_num {
         impl<M: ManagedTypeApi> From<$num_ty> for BigFloat<M> {
             #[inline]
             fn from(value: $num_ty) -> Self {
-                let new_bf_handle: M::BigFloatHandle =
-                    use_raw_handle(M::static_var_api_impl().next_handle());
-                M::managed_type_impl().bf_set_i64(new_bf_handle.clone(), value as i64);
-                BigFloat::from_handle(new_bf_handle)
+                unsafe {
+                    let result = BigFloat::new_uninit();
+                    M::managed_type_impl().bf_set_i64(result.get_handle(), value as i64);
+                    result
+                }
             }
         }
     };
@@ -98,31 +103,31 @@ big_float_conv_num! {i8}
 
 impl<M: ManagedTypeApi> BigFloat<M> {
     pub fn neg(&self) -> Self {
-        let new_bf_handle: M::BigFloatHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bf_neg(new_bf_handle.clone(), self.handle.clone());
-        BigFloat::from_handle(new_bf_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_neg(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     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)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_abs(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
-    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.value.handle.clone());
-        BigFloat::from_handle(new_bf_handle)
+    pub fn from_big_int(big_int: &BigInt<M>) -> Self {
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_set_bi(result.get_handle(), big_int.handle.clone());
+            result
+        }
     }
 
-    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());
-        M::managed_type_impl().bf_set_bi(new_bf_handle.clone(), big_int.handle.clone());
-        BigFloat::from_handle(new_bf_handle)
+    pub fn from_big_uint(big_uint: &BigUint<M>) -> Self {
+        Self::from_big_int(big_uint.as_big_int())
     }
 
     #[inline]
@@ -134,42 +139,45 @@ impl<M: ManagedTypeApi> BigFloat<M> {
         let api = M::managed_type_impl();
         let new_bf_handle =
             api.bf_from_parts(integral_part_value, fractional_part_value, exponent_value);
-        BigFloat::from_handle(new_bf_handle)
+        unsafe { BigFloat::from_handle(new_bf_handle) }
     }
 
     #[inline]
     pub fn from_frac(numerator_value: i64, denominator_value: i64) -> Self {
         let api = M::managed_type_impl();
         let new_bf_handle = api.bf_from_frac(numerator_value, denominator_value);
-        BigFloat::from_handle(new_bf_handle)
+        unsafe { BigFloat::from_handle(new_bf_handle) }
     }
 
     #[inline]
     pub fn from_sci(significand_value: i64, exponent_value: i32) -> Self {
         let api = M::managed_type_impl();
         let new_bf_handle = api.bf_from_sci(significand_value, exponent_value as i64);
-        BigFloat::from_handle(new_bf_handle)
+        unsafe { BigFloat::from_handle(new_bf_handle) }
     }
 
     pub fn trunc(&self) -> BigInt<M> {
-        let result: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        let api = M::managed_type_impl();
-        api.bf_trunc(result.clone(), self.handle.clone());
-        BigInt::from_handle(result)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bf_trunc(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     pub fn floor(&self) -> BigInt<M> {
-        let result: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        let api = M::managed_type_impl();
-        api.bf_floor(result.clone(), self.handle.clone());
-        BigInt::from_handle(result)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bf_floor(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     pub fn ceil(&self) -> BigInt<M> {
-        let result: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        let api = M::managed_type_impl();
-        api.bf_ceil(result.clone(), self.handle.clone());
-        BigInt::from_handle(result)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bf_ceil(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     pub fn to_fixed_point(&self, denominator: &BigFloat<M>) -> BigInt<M> {
@@ -250,38 +258,52 @@ impl<M: ManagedTypeApi> BigFloat<M> {
 
     #[inline]
     pub fn zero() -> Self {
-        BigFloat::from_handle(M::managed_type_impl().bf_new_zero())
+        unsafe { BigFloat::from_handle(M::managed_type_impl().bf_new_zero()) }
     }
 
     pub fn from_buffer(managed_buffer: &ManagedBuffer<M>) -> Self {
-        let new_bf_handle: M::BigFloatHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl()
-            .mb_to_big_float(managed_buffer.handle.clone(), new_bf_handle.clone());
-        BigFloat::from_handle(new_bf_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl()
+                .mb_to_big_float(managed_buffer.handle.clone(), result.get_handle());
+            result
+        }
     }
 
     pub fn to_buffer(&self) -> ManagedBuffer<M> {
-        let new_man_buf_handle: M::ManagedBufferHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_from_big_float(self.handle.clone(), new_man_buf_handle.clone());
-        ManagedBuffer::from_handle(new_man_buf_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            M::managed_type_impl().mb_from_big_float(self.get_handle(), result.get_handle());
+            result
+        }
+    }
+
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
+        let new_handle: M::BigFloatHandle = use_raw_handle(M::static_var_api_impl().next_handle());
+        BigFloat::from_handle(new_handle)
     }
 }
 
 impl<M: ManagedTypeApi> BigFloat<M> {
     pub fn sqrt(&self) -> Self {
-        let api = M::managed_type_impl();
-        let new_handle: M::BigFloatHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bf_sqrt(new_handle.clone(), self.handle.clone());
-        BigFloat::from_handle(new_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_sqrt(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     pub fn pow(&self, exp: i32) -> Self {
-        let api = M::managed_type_impl();
-        let new_handle: M::BigFloatHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bf_pow(new_handle.clone(), self.handle.clone(), exp);
-        BigFloat::from_handle(new_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_pow(result.get_handle(), self.handle.clone(), exp);
+            result
+        }
     }
 
     /// Returns the sign of the `BigFloat` as a `Sign`.
@@ -295,9 +317,11 @@ impl<M: ManagedTypeApi> BigFloat<M> {
 
     /// Returns the magnitude of the `BigFloat`
     pub fn magnitude(&self) -> BigFloat<M> {
-        let result: M::BigFloatHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bf_abs(result.clone(), self.handle.clone());
-        BigFloat::from_handle(result)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_abs(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 
     /// Convert this `BigFloat` into its `Sign` and its magnitude,
@@ -337,9 +361,11 @@ impl<M: ManagedTypeApi> BigFloat<M> {
 
 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());
-        M::managed_type_impl().bf_clone(new_handle.clone(), self.handle.clone());
-        BigFloat::from_handle(new_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_clone(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/big_float_operators.rs b/framework/base/src/types/managed/basic/big_float_operators.rs
index 7874c1ab86..e8d27016a8 100644
--- a/framework/base/src/types/managed/basic/big_float_operators.rs
+++ b/framework/base/src/types/managed/basic/big_float_operators.rs
@@ -1,6 +1,6 @@
 use super::BigFloat;
 use crate::{
-    api::{use_raw_handle, BigFloatApiImpl, ManagedTypeApi, StaticVarApiImpl},
+    api::{BigFloatApiImpl, ManagedTypeApi},
     types::managed::managed_type_trait::ManagedType,
 };
 use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
@@ -16,7 +16,7 @@ macro_rules! binary_operator {
                     self.handle.clone(),
                     other.handle.clone(),
                 );
-                BigFloat::from_handle(self.handle.clone())
+                self
             }
         }
 
@@ -24,14 +24,15 @@ macro_rules! binary_operator {
             type Output = BigFloat<M>;
 
             fn $method(self, other: &BigFloat<M>) -> BigFloat<M> {
-                let result_handle: M::BigFloatHandle =
-                    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(),
-                );
-                BigFloat::from_handle(result_handle)
+                unsafe {
+                    let result = BigFloat::new_uninit();
+                    M::managed_type_impl().$api_func(
+                        result.get_handle(),
+                        self.handle.clone(),
+                        other.handle.clone(),
+                    );
+                    result
+                }
             }
         }
     };
@@ -79,9 +80,10 @@ impl<M: ManagedTypeApi> Neg for BigFloat<M> {
     type Output = BigFloat<M>;
 
     fn neg(self) -> Self::Output {
-        let result_handle: M::BigFloatHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bf_neg(result_handle.clone(), self.handle);
-        BigFloat::from_handle(result_handle)
+        unsafe {
+            let result = BigFloat::new_uninit();
+            M::managed_type_impl().bf_neg(result.get_handle(), self.handle.clone());
+            result
+        }
     }
 }
diff --git a/framework/base/src/types/managed/basic/big_int.rs b/framework/base/src/types/managed/basic/big_int.rs
index c705511f56..13c3b965af 100644
--- a/framework/base/src/types/managed/basic/big_int.rs
+++ b/framework/base/src/types/managed/basic/big_int.rs
@@ -11,7 +11,9 @@ use crate::{
         NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput, TryStaticCast,
     },
     formatter::{hex_util::encode_bytes_as_hex, FormatByteReceiver, SCDisplay},
-    types::{heap::BoxedBytes, BigUint, ManagedBuffer, ManagedOption, ManagedType, Sign},
+    types::{
+        heap::BoxedBytes, BigUint, ManagedBuffer, ManagedOption, ManagedRef, ManagedType, Sign,
+    },
 };
 
 use super::cast_to_i64::cast_to_i64;
@@ -25,7 +27,7 @@ pub struct BigInt<M: ManagedTypeApi> {
 impl<M: ManagedTypeApi> ManagedType<M> for BigInt<M> {
     type OwnHandle = M::BigIntHandle;
 
-    fn from_handle(handle: M::BigIntHandle) -> Self {
+    unsafe fn from_handle(handle: M::BigIntHandle) -> Self {
         BigInt {
             handle,
             _phantom: PhantomData,
@@ -39,6 +41,10 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigInt<M> {
     fn transmute_from_handle_ref(handle_ref: &M::BigIntHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::BigIntHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> Default for BigInt<M> {
@@ -63,6 +69,16 @@ impl<M: ManagedTypeApi> From<ManagedBuffer<M>> for BigInt<M> {
 }
 
 impl<M: ManagedTypeApi> BigInt<M> {
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
+        let new_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
+        BigInt::from_handle(new_handle)
+    }
+
     pub(crate) fn set_value<T>(handle: M::BigIntHandle, value: T)
     where
         T: TryInto<i64>,
@@ -83,7 +99,7 @@ impl<M: ManagedTypeApi> BigInt<M> {
 impl<M: ManagedTypeApi> From<BigUint<M>> for BigInt<M> {
     #[inline]
     fn from(item: BigUint<M>) -> Self {
-        BigInt::from_handle(item.get_handle())
+        item.into_big_int()
     }
 }
 
@@ -92,10 +108,11 @@ macro_rules! big_int_conv_num {
         impl<M: ManagedTypeApi> From<$num_ty> for BigInt<M> {
             #[inline]
             fn from(value: $num_ty) -> Self {
-                let handle: M::BigIntHandle =
-                    use_raw_handle(M::static_var_api_impl().next_handle());
-                Self::set_value(handle.clone(), value);
-                BigInt::from_handle(handle)
+                unsafe {
+                    let result = BigInt::new_uninit();
+                    Self::set_value(result.get_handle(), value);
+                    result
+                }
             }
         }
 
@@ -151,10 +168,11 @@ impl<M: ManagedTypeApi> From<crate::codec::num_bigint::BigInt> for BigInt<M> {
 impl<M: ManagedTypeApi> BigInt<M> {
     #[inline]
     pub fn zero() -> Self {
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        // TODO: seting 0 will no longer be needed once we fix VM handle error
-        M::managed_type_impl().bi_set_int64(handle.clone(), 0);
-        BigInt::from_handle(handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bi_set_int64(result.get_handle(), 0);
+            result
+        }
     }
 
     #[inline]
@@ -171,9 +189,11 @@ impl<M: ManagedTypeApi> BigInt<M> {
     pub fn from_signed_bytes_be(bytes: &[u8]) -> Self {
         let mb_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
         M::managed_type_impl().mb_overwrite(mb_handle.clone(), bytes);
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_to_big_int_signed(mb_handle, handle.clone());
-        BigInt::from_handle(handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().mb_to_big_int_signed(mb_handle, result.get_handle());
+            result
+        }
     }
 
     #[inline]
@@ -185,41 +205,47 @@ impl<M: ManagedTypeApi> BigInt<M> {
 
     #[inline]
     pub fn from_signed_bytes_be_buffer(managed_buffer: &ManagedBuffer<M>) -> Self {
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_to_big_int_signed(managed_buffer.handle.clone(), handle.clone());
-        BigInt::from_handle(handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl()
+                .mb_to_big_int_signed(managed_buffer.handle.clone(), result.get_handle());
+            result
+        }
     }
 
     #[inline]
     pub fn to_signed_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_signed(self.handle.clone(), mb_handle.clone());
-        ManagedBuffer::from_handle(mb_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            M::managed_type_impl().mb_from_big_int_signed(self.handle.clone(), result.get_handle());
+            result
+        }
     }
 }
 
 impl<M: ManagedTypeApi> Clone for BigInt<M> {
     fn clone(&self) -> Self {
         let api = M::managed_type_impl();
-        let clone_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_set_int64(clone_handle.clone(), 0);
-        api.bi_add(
-            clone_handle.clone(),
-            clone_handle.clone(),
-            self.handle.clone(),
-        );
-        BigInt::from_handle(clone_handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            api.bi_set_int64(result.get_handle(), 0);
+            api.bi_add(
+                result.get_handle(),
+                result.get_handle(),
+                self.handle.clone(),
+            );
+            result
+        }
     }
 }
 
 impl<M: ManagedTypeApi> BigInt<M> {
     pub fn from_biguint(sign: Sign, unsigned: BigUint<M>) -> Self {
-        let api = M::managed_type_impl();
+        let result = unsigned.into_big_int();
         if sign.is_minus() {
-            api.bi_neg(unsigned.value.handle.clone(), unsigned.value.handle.clone());
+            M::managed_type_impl().bi_neg(result.handle.clone(), result.handle.clone());
         }
-        BigInt::from_handle(unsigned.value.handle)
+        result
     }
 
     /// Returns the sign of the `BigInt` as a `Sign`.
@@ -234,10 +260,11 @@ impl<M: ManagedTypeApi> BigInt<M> {
 
     /// Returns the magnitude of the `BigInt` as a `BigUint`.
     pub fn magnitude(&self) -> BigUint<M> {
-        let api = M::managed_type_impl();
-        let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_abs(result_handle.clone(), self.handle.clone());
-        BigUint::from_handle(result_handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            M::managed_type_impl().bi_abs(result.get_handle(), self.get_handle());
+            result
+        }
     }
 
     /// Convert this `BigInt` into its `Sign` and `BigUint` magnitude,
@@ -252,7 +279,7 @@ impl<M: ManagedTypeApi> BigInt<M> {
     ///
     /// 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)
+        BigUint { value: self }
     }
 
     /// Converts this `BigInt` into a `BigUint`, if it's not negative.
@@ -327,10 +354,12 @@ impl<M: ManagedTypeApi> TopDecode for BigInt<M> {
 impl<M: ManagedTypeApi> BigInt<M> {
     #[must_use]
     pub fn pow(&self, exp: u32) -> Self {
-        let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
         let exp_handle = BigUint::<M>::make_temp(const_handles::BIG_INT_TEMPORARY_1, exp);
-        M::managed_type_impl().bi_pow(result_handle.clone(), self.handle.clone(), exp_handle);
-        BigInt::from_handle(result_handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bi_pow(result.get_handle(), self.get_handle(), exp_handle);
+            result
+        }
     }
 }
 
@@ -338,9 +367,9 @@ impl<M: ManagedTypeApi> SCDisplay for BigInt<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());
-        f.append_managed_buffer(&ManagedBuffer::from_handle(
-            str_handle.cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = str_handle.cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&wrap_cast);
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/big_int_operators.rs b/framework/base/src/types/managed/basic/big_int_operators.rs
index fed47d5a26..9edf670cb9 100644
--- a/framework/base/src/types/managed/basic/big_int_operators.rs
+++ b/framework/base/src/types/managed/basic/big_int_operators.rs
@@ -3,7 +3,7 @@ use core::ops::{
 };
 
 use crate::{
-    api::{use_raw_handle, BigIntApiImpl, ManagedTypeApi, StaticVarApiImpl},
+    api::{BigIntApiImpl, ManagedTypeApi},
     types::{BigInt, BigUint, ManagedType, Sign},
 };
 
@@ -19,7 +19,7 @@ macro_rules! binary_operator {
                     self.handle.clone(),
                     other.handle.clone(),
                 );
-                BigInt::from_handle(self.handle.clone())
+                self
             }
         }
 
@@ -44,14 +44,15 @@ macro_rules! binary_operator {
 
             fn $method(self, other: &BigInt<M>) -> BigInt<M> {
                 let api = M::managed_type_impl();
-                let result_handle: M::BigIntHandle =
-                    use_raw_handle(M::static_var_api_impl().next_handle());
-                api.$api_func(
-                    result_handle.clone(),
-                    self.handle.clone(),
-                    other.handle.clone(),
-                );
-                BigInt::from_handle(result_handle)
+                unsafe {
+                    let result = BigInt::new_uninit();
+                    api.$api_func(
+                        result.get_handle(),
+                        self.handle.clone(),
+                        other.handle.clone(),
+                    );
+                    result
+                }
             }
         }
 
@@ -59,7 +60,7 @@ macro_rules! binary_operator {
             type Output = BigInt<M>;
 
             fn $method(self, other: &BigUint<M>) -> BigInt<M> {
-                self.$method(&BigInt::from_handle(other.get_handle()))
+                self.$method(other.as_big_int())
             }
         }
 
@@ -67,7 +68,7 @@ macro_rules! binary_operator {
             type Output = BigInt<M>;
 
             fn $method(self, other: &BigInt<M>) -> BigInt<M> {
-                (&BigInt::from_handle(self.get_handle())).$method(other)
+                self.as_big_int().$method(other)
             }
         }
     };
@@ -117,9 +118,10 @@ impl<M: ManagedTypeApi> Neg for BigInt<M> {
     type Output = BigInt<M>;
 
     fn neg(self) -> Self::Output {
-        let api = M::managed_type_impl();
-        let result_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_neg(result_handle.clone(), self.handle);
-        BigInt::from_handle(result_handle)
+        unsafe {
+            let result = BigInt::new_uninit();
+            M::managed_type_impl().bi_neg(result.get_handle(), self.handle);
+            result
+        }
     }
 }
diff --git a/framework/base/src/types/managed/basic/elliptic_curve.rs b/framework/base/src/types/managed/basic/elliptic_curve.rs
index 99189d06c5..2cc7097a18 100644
--- a/framework/base/src/types/managed/basic/elliptic_curve.rs
+++ b/framework/base/src/types/managed/basic/elliptic_curve.rs
@@ -35,7 +35,7 @@ pub struct EllipticCurve<M: ManagedTypeApi> {
 impl<M: ManagedTypeApi> ManagedType<M> for EllipticCurve<M> {
     type OwnHandle = M::EllipticCurveHandle;
 
-    fn from_handle(handle: M::EllipticCurveHandle) -> Self {
+    unsafe fn from_handle(handle: M::EllipticCurveHandle) -> Self {
         EllipticCurve { handle }
     }
 
@@ -46,17 +46,21 @@ impl<M: ManagedTypeApi> ManagedType<M> for EllipticCurve<M> {
     fn transmute_from_handle_ref(handle_ref: &M::EllipticCurveHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::EllipticCurveHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> EllipticCurve<M> {
     pub fn from_name(name: &ManagedBuffer<M>) -> Self {
         let handle = M::managed_type_impl().ec_create_from_name_mb(name.get_handle());
-        EllipticCurve::from_handle(handle)
+        unsafe { EllipticCurve::from_handle(handle) }
     }
 
     pub fn from_name_str(name: &str) -> Self {
         let handle = M::managed_type_impl().ec_create_from_name_bytes(name.as_bytes());
-        EllipticCurve::from_handle(handle)
+        unsafe { EllipticCurve::from_handle(handle) }
     }
 
     pub fn from_bitsize(bitsize: u32) -> Option<Self> {
@@ -84,14 +88,16 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_base_point_handle.clone(),
             y_base_point_handle.clone(),
         );
-        (
-            BigUint::from_handle(field_order_handle),
-            BigUint::from_handle(base_point_order_handle),
-            BigUint::from_handle(eq_constant_handle),
-            BigUint::from_handle(x_base_point_handle),
-            BigUint::from_handle(y_base_point_handle),
-            api.ec_curve_length(self.handle.clone()),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(field_order_handle),
+                BigUint::from_handle(base_point_order_handle),
+                BigUint::from_handle(eq_constant_handle),
+                BigUint::from_handle(x_base_point_handle),
+                BigUint::from_handle(y_base_point_handle),
+                api.ec_curve_length(self.handle.clone()),
+            )
+        }
     }
 
     pub fn get_curve_length(&self) -> u32 {
@@ -123,10 +129,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_second_point.value.handle,
             y_second_point.value.handle,
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     pub fn double(&self, x_point: BigUint<M>, y_point: BigUint<M>) -> (BigUint<M>, BigUint<M>) {
@@ -140,10 +148,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             x_point.value.handle,
             y_point.value.handle,
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     pub fn is_on_curve(&self, x_point: BigUint<M>, y_point: BigUint<M>) -> bool {
@@ -173,10 +183,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             y_point.value.handle,
             data,
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     pub fn scalar_mult(
@@ -196,10 +208,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             y_point.value.handle,
             data.get_handle(),
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     #[deprecated(
@@ -216,10 +230,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data,
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     pub fn scalar_base_mult(&self, data: &ManagedBuffer<M>) -> (BigUint<M>, BigUint<M>) {
@@ -232,10 +248,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data.get_handle(),
         );
-        (
-            BigUint::from_handle(x_result_handle),
-            BigUint::from_handle(y_result_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_result_handle),
+                BigUint::from_handle(y_result_handle),
+            )
+        }
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `marshal` instead.")]
@@ -262,7 +280,7 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             y_pair.value.handle,
             result_handle.clone(),
         );
-        ManagedBuffer::from_handle(result_handle)
+        unsafe { ManagedBuffer::from_handle(result_handle) }
     }
 
     #[deprecated(
@@ -292,7 +310,7 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             y_pair.value.handle,
             result_handle.clone(),
         );
-        ManagedBuffer::from_handle(result_handle)
+        unsafe { ManagedBuffer::from_handle(result_handle) }
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `unmarshal` instead.")]
@@ -306,10 +324,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data,
         );
-        (
-            BigUint::from_handle(x_pair_handle),
-            BigUint::from_handle(y_pair_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pair_handle),
+                BigUint::from_handle(y_pair_handle),
+            )
+        }
     }
 
     pub fn unmarshal(&self, data: &ManagedBuffer<M>) -> (BigUint<M>, BigUint<M>) {
@@ -322,10 +342,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data.get_handle(),
         );
-        (
-            BigUint::from_handle(x_pair_handle),
-            BigUint::from_handle(y_pair_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pair_handle),
+                BigUint::from_handle(y_pair_handle),
+            )
+        }
     }
 
     #[deprecated(
@@ -342,10 +364,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data,
         );
-        (
-            BigUint::from_handle(x_pair_handle),
-            BigUint::from_handle(y_pair_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pair_handle),
+                BigUint::from_handle(y_pair_handle),
+            )
+        }
     }
 
     pub fn unmarshal_compressed(&self, data: &ManagedBuffer<M>) -> (BigUint<M>, BigUint<M>) {
@@ -358,10 +382,12 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             data.get_handle(),
         );
-        (
-            BigUint::from_handle(x_pair_handle),
-            BigUint::from_handle(y_pair_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pair_handle),
+                BigUint::from_handle(y_pair_handle),
+            )
+        }
     }
 
     #[deprecated(since = "0.41.0", note = "Please use method `generate_key` instead.")]
@@ -375,11 +401,13 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             y_pub_key_handle.clone(),
             self.handle.clone(),
         );
-        (
-            BigUint::from_handle(x_pub_key_handle),
-            BigUint::from_handle(y_pub_key_handle),
-            private_key,
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pub_key_handle),
+                BigUint::from_handle(y_pub_key_handle),
+                private_key,
+            )
+        }
     }
 
     pub fn generate_key(&self) -> (BigUint<M>, BigUint<M>, ManagedBuffer<M>) {
@@ -394,11 +422,13 @@ impl<M: ManagedTypeApi> EllipticCurve<M> {
             self.handle.clone(),
             private_key_handle.clone(),
         );
-        (
-            BigUint::from_handle(x_pub_key_handle),
-            BigUint::from_handle(y_pub_key_handle),
-            ManagedBuffer::from_handle(private_key_handle),
-        )
+        unsafe {
+            (
+                BigUint::from_handle(x_pub_key_handle),
+                BigUint::from_handle(y_pub_key_handle),
+                ManagedBuffer::from_handle(private_key_handle),
+            )
+        }
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/managed_buffer.rs b/framework/base/src/types/managed/basic/managed_buffer.rs
index de2dc63bb8..d1e0b52f9e 100644
--- a/framework/base/src/types/managed/basic/managed_buffer.rs
+++ b/framework/base/src/types/managed/basic/managed_buffer.rs
@@ -2,7 +2,7 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         use_raw_handle, ErrorApiImpl, HandleConstraints, InvalidSliceError, ManagedBufferApiImpl,
-        ManagedTypeApi, StaticVarApiImpl,
+        ManagedTypeApi, RawHandle, StaticVarApiImpl,
     },
     codec::{
         DecodeErrorHandler, Empty, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
@@ -13,7 +13,10 @@ use crate::{
         hex_util::encode_bytes_as_hex, FormatBuffer, FormatByteReceiver, SCBinary, SCDisplay,
         SCLowerHex,
     },
-    types::{heap::BoxedBytes, ManagedBufferCachedBuilder, ManagedType, StaticBufferRef},
+    types::{
+        heap::BoxedBytes, ManagedBufferCachedBuilder, ManagedRef, ManagedRefMut, ManagedType,
+        StaticBufferRef,
+    },
 };
 
 /// A byte buffer managed by an external API.
@@ -26,7 +29,7 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedBuffer<M> {
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         ManagedBuffer { handle }
     }
 
@@ -37,34 +40,70 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedBuffer<M> {
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> ManagedBuffer<M> {
     #[inline]
     pub fn new() -> Self {
-        let new_handle: M::ManagedBufferHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        // TODO: remove after VM no longer crashes with "unknown handle":
-        M::managed_type_impl().mb_overwrite(new_handle.clone(), &[]);
-        ManagedBuffer::from_handle(new_handle)
+        Self::new_from_bytes(&[])
     }
 
     #[inline]
     pub fn new_from_bytes(bytes: &[u8]) -> Self {
-        let new_handle: M::ManagedBufferHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_overwrite(new_handle.clone(), bytes);
-        ManagedBuffer::from_handle(new_handle)
+        unsafe {
+            let result = Self::new_uninit();
+            M::managed_type_impl().mb_overwrite(result.get_handle(), bytes);
+            result
+        }
     }
 
     #[inline]
     pub fn new_random(nr_bytes: usize) -> Self {
+        unsafe {
+            let result = Self::new_uninit();
+            M::managed_type_impl().mb_set_random(result.get_handle(), nr_bytes);
+            result
+        }
+    }
+
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
         let new_handle: M::ManagedBufferHandle =
             use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_set_random(new_handle.clone(), nr_bytes);
         ManagedBuffer::from_handle(new_handle)
     }
 
+    /// Creates a shared managed reference to a given raw handle.
+    ///
+    /// ## Safety
+    ///
+    /// The reference points to a shared value. Make sure the handle is not leaked.
+
+    pub unsafe fn temp_const_ref(
+        raw_handle: RawHandle,
+    ) -> ManagedRef<'static, M, ManagedBuffer<M>> {
+        ManagedRef::wrap_handle(use_raw_handle(raw_handle))
+    }
+
+    /// Creates a shared managed reference to a given raw handle.
+    ///
+    /// ## Safety
+    ///
+    /// The reference points to a shared value. Make sure the handle is not leaked.
+    pub unsafe fn temp_const_ref_mut(
+        raw_handle: RawHandle,
+    ) -> ManagedRefMut<'static, M, ManagedBuffer<M>> {
+        ManagedRefMut::wrap_handle(use_raw_handle(raw_handle))
+    }
+
     fn load_static_cache(&self) -> StaticBufferRef<M>
     where
         M: ManagedTypeApi,
@@ -233,7 +272,7 @@ impl<M: ManagedTypeApi> ManagedBuffer<M> {
             result_handle.clone(),
         );
         if err_result.is_ok() {
-            Some(ManagedBuffer::from_handle(result_handle))
+            Some(unsafe { ManagedBuffer::from_handle(result_handle) })
         } else {
             None
         }
@@ -346,7 +385,7 @@ impl<M: ManagedTypeApi> Clone for ManagedBuffer<M> {
         let api = M::managed_type_impl();
         let clone_handle = api.mb_new_empty();
         api.mb_append(clone_handle.clone(), self.handle.clone());
-        ManagedBuffer::from_handle(clone_handle)
+        unsafe { ManagedBuffer::from_handle(clone_handle) }
     }
 }
 
@@ -476,9 +515,9 @@ impl<M: ManagedTypeApi> TypeAbi for ManagedBuffer<M> {
 
 impl<M: ManagedTypeApi> SCDisplay for ManagedBuffer<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        f.append_managed_buffer(&ManagedBuffer::from_handle(
-            self.get_handle().cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = self.get_handle().cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&wrap_cast);
     }
 }
 
@@ -487,18 +526,18 @@ impl<M: ManagedTypeApi> SCLowerHex for ManagedBuffer<M> {
         let hex_handle: M::ManagedBufferHandle =
             use_raw_handle(crate::api::const_handles::MBUF_TEMPORARY_1);
         M::managed_type_impl().mb_to_hex(self.handle.clone(), hex_handle.clone());
-        f.append_managed_buffer(&ManagedBuffer::from_handle(
-            hex_handle.cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = hex_handle.cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&wrap_cast);
     }
 }
 
 impl<M: ManagedTypeApi> SCBinary for ManagedBuffer<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         // TODO: in Rust thr `0b` prefix appears only when writing "{:#x}", not "{:x}"
-        f.append_managed_buffer_binary(&ManagedBuffer::from_handle(
-            self.get_handle().cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = self.get_handle().cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer_binary(&wrap_cast);
     }
 }
 
diff --git a/framework/base/src/types/managed/basic/managed_map.rs b/framework/base/src/types/managed/basic/managed_map.rs
index 1f0c0be867..139f93cf9c 100644
--- a/framework/base/src/types/managed/basic/managed_map.rs
+++ b/framework/base/src/types/managed/basic/managed_map.rs
@@ -1,5 +1,5 @@
 use crate::{
-    api::{use_raw_handle, ManagedMapApiImpl, ManagedTypeApi, StaticVarApiImpl},
+    api::{ManagedMapApiImpl, ManagedTypeApi},
     types::ManagedType,
 };
 
@@ -15,7 +15,7 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedMap<M> {
     type OwnHandle = M::ManagedMapHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedMapHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedMapHandle) -> Self {
         ManagedMap { handle }
     }
 
@@ -26,12 +26,16 @@ impl<M: ManagedTypeApi> ManagedType<M> for ManagedMap<M> {
     fn transmute_from_handle_ref(handle_ref: &M::ManagedMapHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedMapHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> ManagedMap<M> {
     pub fn new() -> Self {
         let new_handle = M::managed_type_impl().mm_new();
-        ManagedMap::from_handle(new_handle)
+        unsafe { ManagedMap::from_handle(new_handle) }
     }
 }
 
@@ -44,10 +48,15 @@ impl<M: ManagedTypeApi> Default for ManagedMap<M> {
 
 impl<M: ManagedTypeApi> ManagedMap<M> {
     pub fn get(&self, key: &ManagedBuffer<M>) -> ManagedBuffer<M> {
-        let new_handle: M::ManagedBufferHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mm_get(self.handle.clone(), key.handle.clone(), new_handle.clone());
-        ManagedBuffer::from_handle(new_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            M::managed_type_impl().mm_get(
+                self.handle.clone(),
+                key.handle.clone(),
+                result.get_handle(),
+            );
+            result
+        }
     }
 
     pub fn put(&mut self, key: &ManagedBuffer<M>, value: &ManagedBuffer<M>) {
@@ -59,14 +68,15 @@ impl<M: ManagedTypeApi> ManagedMap<M> {
     }
 
     pub fn remove(&mut self, key: &ManagedBuffer<M>) -> ManagedBuffer<M> {
-        let new_handle: M::ManagedBufferHandle =
-            use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mm_remove(
-            self.handle.clone(),
-            key.handle.clone(),
-            new_handle.clone(),
-        );
-        ManagedBuffer::from_handle(new_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            M::managed_type_impl().mm_remove(
+                self.handle.clone(),
+                key.handle.clone(),
+                result.get_handle(),
+            );
+            result
+        }
     }
 
     pub fn contains(&self, key: &ManagedBuffer<M>) -> bool {
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..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,
+        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>
@@ -106,7 +118,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::<ManagedBufferReadToEnd<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>
@@ -123,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 3bf8345f2d..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},
-};
+use crate::{api::ManagedTypeApi, types::ManagedBuffer};
 
 impl<M: ManagedTypeApi> NestedEncodeOutput for ManagedBuffer<M> {
     fn write(&mut self, bytes: &[u8]) {
@@ -12,7 +9,7 @@ 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>>()
     }
 
     #[inline]
diff --git a/framework/base/src/types/managed/managed_type_trait.rs b/framework/base/src/types/managed/managed_type_trait.rs
index ae9b48e4d0..ca9210d594 100644
--- a/framework/base/src/types/managed/managed_type_trait.rs
+++ b/framework/base/src/types/managed/managed_type_trait.rs
@@ -7,12 +7,12 @@ pub trait ManagedType<M: ManagedTypeApi>: Sized {
     type OwnHandle: HandleConstraints;
 
     #[doc(hidden)]
-    fn from_handle(handle: Self::OwnHandle) -> Self;
+    unsafe fn from_handle(handle: Self::OwnHandle) -> Self;
 
     fn get_handle(&self) -> Self::OwnHandle;
 
     #[doc(hidden)]
-    fn from_raw_handle(handle: RawHandle) -> Self {
+    unsafe fn from_raw_handle(handle: RawHandle) -> Self {
         Self::from_handle(Self::OwnHandle::new(handle))
     }
 
@@ -26,6 +26,8 @@ pub trait ManagedType<M: ManagedTypeApi>: Sized {
     /// For types that just wrap another managed type it is easier, call for the wrapped object.
     fn transmute_from_handle_ref(handle_ref: &Self::OwnHandle) -> &Self;
 
+    fn transmute_from_handle_ref_mut(handle_ref: &mut Self::OwnHandle) -> &mut Self;
+
     fn as_ref(&self) -> ManagedRef<'_, M, Self> {
         ManagedRef::new(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 7e7cd934a3..1ebc5d5fe7 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
@@ -57,8 +57,8 @@ impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPaymentMultiValue<M> {
     }
 
     #[inline]
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-        self.obj.to_byte_writer(writer)
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        self.obj.into_byte_writer(writer)
     }
 }
 
diff --git a/framework/base/src/types/managed/multi_value/mod.rs b/framework/base/src/types/managed/multi_value/mod.rs
index 2a4af1f18c..bfd2981c16 100644
--- a/framework/base/src/types/managed/multi_value/mod.rs
+++ b/framework/base/src/types/managed/multi_value/mod.rs
@@ -1,6 +1,7 @@
 mod async_call_result_managed;
 mod esdt_token_payment_multi_value;
 mod multi_value_encoded;
+mod multi_value_encoded_counted;
 mod multi_value_encoded_iter;
 mod multi_value_managed_vec;
 mod multi_value_managed_vec_counted;
@@ -8,6 +9,7 @@ mod multi_value_managed_vec_counted;
 pub use async_call_result_managed::{ManagedAsyncCallError, ManagedAsyncCallResult};
 pub use esdt_token_payment_multi_value::{EsdtTokenPaymentMultiArg, EsdtTokenPaymentMultiValue};
 pub use multi_value_encoded::{ManagedMultiResultVec, ManagedVarArgs, MultiValueEncoded};
+pub use multi_value_encoded_counted::MultiValueEncodedCounted;
 pub use multi_value_encoded_iter::MultiValueEncodedIterator;
 pub use multi_value_managed_vec::{
     ManagedMultiResultVecEager, ManagedVarArgsEager, MultiValueManagedVec,
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 04dbde9357..a598ba9795 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
@@ -15,6 +15,8 @@ use crate::{
 };
 use core::{iter::FromIterator, marker::PhantomData};
 
+use super::MultiValueEncodedIterator;
+
 /// A multi-value container, that keeps raw values as ManagedBuffer
 /// It allows encoding and decoding of multi-values.
 ///
@@ -115,7 +117,7 @@ where
     M: ManagedTypeApi,
 {
     pub fn to_arg_buffer(&self) -> ManagedArgBuffer<M> {
-        ManagedArgBuffer::from_handle(self.raw_buffers.get_handle())
+        unsafe { ManagedArgBuffer::from_handle(self.raw_buffers.get_handle()) }
     }
 }
 
@@ -147,6 +149,18 @@ where
     }
 }
 
+impl<M, T> IntoIterator for MultiValueEncoded<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopDecodeMulti,
+{
+    type Item = T;
+    type IntoIter = MultiValueEncodedIterator<M, T>;
+    fn into_iter(self) -> Self::IntoIter {
+        MultiValueEncodedIterator::new(self.raw_buffers)
+    }
+}
+
 impl<M, T> MultiValueEncoded<M, T>
 where
     M: ManagedTypeApi + ErrorApi,
diff --git a/framework/base/src/types/managed/multi_value/multi_value_encoded_counted.rs b/framework/base/src/types/managed/multi_value/multi_value_encoded_counted.rs
new file mode 100644
index 0000000000..ce53008377
--- /dev/null
+++ b/framework/base/src/types/managed/multi_value/multi_value_encoded_counted.rs
@@ -0,0 +1,267 @@
+use unwrap_infallible::UnwrapInfallible;
+
+use crate::codec::multi_types::MultiValueVec;
+use crate::{
+    abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
+    api::{ErrorApi, ManagedTypeApi},
+    codec::{
+        DecodeErrorHandler, EncodeErrorHandler, TopDecode, TopDecodeMulti, TopDecodeMultiInput,
+        TopDecodeMultiLength, TopEncodeMulti, TopEncodeMultiOutput,
+    },
+    contract_base::{ExitCodecErrorHandler, ManagedSerializer},
+    err_msg,
+    types::{ManagedBuffer, ManagedVec, ManagedVecItem},
+};
+use core::{iter::FromIterator, marker::PhantomData};
+
+use super::MultiValueEncodedIterator;
+
+/// A multi-value container, that keeps raw values as ManagedBuffer, and which encodes and decodes its length explicitly.
+///
+/// It allows encoding and decoding of multi-values. Its multi-encoding always starts with the number of items.
+///
+/// Since items are kept raw, the item type does not need to implement `ManagedVecItem`.
+///
+/// Behavior:
+/// - It is lazy when decoding, in that it keeps them raw and will not decode the values until they are requested.
+/// - It is eager when encoding, items are serialized before being added to this structure.
+///
+/// ## Item length
+///
+/// Its item type must implement `TopDecodeMultiLength`, which is a length marker for multi-values.
+///
+/// Some examples for `TopDecodeMultiLength`:
+/// - MultiValue3 has a "multi-length" of 3
+/// - a simple type, like i32, has a "multi-length" of 1
+/// - MultiValueEncoded has no known "multi-length", and therefore cannot be used inside `MultiValueEncodedCounted`.
+///
+/// `MultiValueEncodedCounted` requires this "multi-length" to determine the number of buffers needed to store the encoded values.
+///
+/// More specifically, the number of buffers (raw length) is equal to the item count multiplied by the item "multi-length".
+#[derive(Clone, Default, Debug, PartialEq)]
+pub struct MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: TopDecodeMultiLength,
+{
+    raw_buffers: ManagedVec<M, ManagedBuffer<M>>,
+    _phantom: PhantomData<T>,
+}
+
+impl<M, T> MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: TopDecodeMultiLength,
+{
+    #[inline]
+    fn from_raw_vec(raw_buffers: ManagedVec<M, ManagedBuffer<M>>) -> Self {
+        MultiValueEncodedCounted {
+            raw_buffers,
+            _phantom: PhantomData,
+        }
+    }
+
+    #[inline]
+    pub fn new() -> Self {
+        MultiValueEncodedCounted::from_raw_vec(ManagedVec::new())
+    }
+}
+
+impl<M, T> MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti + TopDecodeMultiLength,
+{
+    pub fn push(&mut self, item: T) {
+        item.multi_encode_or_handle_err(
+            &mut self.raw_buffers,
+            ExitCodecErrorHandler::<M>::from(err_msg::SERIALIZER_ENCODE_ERROR),
+        )
+        .unwrap_infallible()
+    }
+}
+
+impl<M, T> IntoIterator for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopDecodeMulti + TopDecodeMultiLength,
+{
+    type Item = T;
+    type IntoIter = MultiValueEncodedIterator<M, T>;
+    fn into_iter(self) -> Self::IntoIter {
+        MultiValueEncodedIterator::new(self.raw_buffers)
+    }
+}
+
+impl<M> MultiValueEncodedCounted<M, ManagedBuffer<M>>
+where
+    M: ManagedTypeApi,
+{
+    pub fn into_vec_of_buffers(self) -> ManagedVec<M, ManagedBuffer<M>> {
+        self.raw_buffers
+    }
+}
+
+impl<M, T> MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopDecodeMultiLength,
+{
+    /// Length of the underlying data.
+    ///
+    /// Note:
+    /// In general, it is **not** the number of items that can be decoded.
+    /// It is the same as `len()` only for single encode items.
+    #[inline]
+    pub fn raw_len(&self) -> usize {
+        self.raw_buffers.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.raw_buffers.is_empty()
+    }
+
+    /// Number of items. Only available for multi-encode items.
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.raw_len() / T::LEN
+    }
+}
+
+impl<M, T> MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: ManagedVecItem + TopDecode + TopDecodeMultiLength,
+{
+    pub fn to_vec(&self) -> ManagedVec<M, T> {
+        let mut result = ManagedVec::new();
+        let serializer = ManagedSerializer::<M>::new();
+        for item in self.raw_buffers.into_iter() {
+            result.push(serializer.top_decode_from_managed_buffer(&item));
+        }
+        result
+    }
+}
+
+impl<M, T> TopEncodeMulti for &MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti + TopDecodeMultiLength,
+{
+    fn multi_encode_or_handle_err<O, H>(&self, output: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeMultiOutput,
+        H: EncodeErrorHandler,
+    {
+        let raw_count = self.raw_buffers.len();
+        let count = raw_count / T::LEN;
+        count.multi_encode_or_handle_err(output, h)?;
+        for elem in self.raw_buffers.into_iter() {
+            elem.multi_encode_or_handle_err(output, h)?;
+        }
+        Ok(())
+    }
+}
+
+impl<M, T> TopEncodeMulti for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti + TopDecodeMultiLength,
+{
+    fn multi_encode_or_handle_err<O, H>(&self, output: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeMultiOutput,
+        H: EncodeErrorHandler,
+    {
+        (&self).multi_encode_or_handle_err(output, h)
+    }
+}
+
+impl<M, T> TopDecodeMulti for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopDecodeMulti + TopDecodeMultiLength,
+{
+    fn multi_decode_or_handle_err<I, H>(input: &mut I, h: H) -> Result<Self, H::HandledErr>
+    where
+        I: TopDecodeMultiInput,
+        H: DecodeErrorHandler,
+    {
+        let count: usize = input.next_value(h)?;
+        let raw_count = count * T::LEN;
+        let mut raw_buffers = ManagedVec::new();
+        for _ in 0..raw_count {
+            raw_buffers.push(input.next_value(h)?);
+        }
+        Ok(Self::from_raw_vec(raw_buffers))
+    }
+}
+
+impl<M, T> TypeAbiFrom<Self> for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi + TopDecodeMultiLength,
+{
+}
+
+impl<M, T> TypeAbiFrom<&Self> for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi + TopDecodeMultiLength,
+{
+}
+
+impl<M, T> TypeAbi for MultiValueEncodedCounted<M, T>
+where
+    M: ManagedTypeApi,
+    T: TypeAbi + TopDecodeMultiLength,
+{
+    type Unmanaged = MultiValueVec<T::Unmanaged>;
+
+    fn type_name() -> TypeName {
+        let mut repr = TypeName::from("counted-variadic<");
+        repr.push_str(T::type_name().as_str());
+        repr.push('>');
+        repr
+    }
+
+    fn type_name_rust() -> TypeName {
+        crate::abi::type_name_multi_value_encoded::<T>()
+    }
+
+    fn provide_type_descriptions<TDC: TypeDescriptionContainer>(accumulator: &mut TDC) {
+        T::provide_type_descriptions(accumulator);
+    }
+
+    fn is_variadic() -> bool {
+        true
+    }
+}
+
+impl<M, T, U> TypeAbiFrom<MultiValueVec<T>> for MultiValueEncodedCounted<M, U>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti,
+    U: TypeAbiFrom<T> + TopDecodeMultiLength,
+{
+}
+
+impl<M, T, U> TypeAbiFrom<MultiValueEncodedCounted<M, T>> for MultiValueVec<U>
+where
+    M: ManagedTypeApi + ErrorApi,
+    T: TopEncodeMulti + TopDecodeMultiLength,
+    U: TypeAbiFrom<T>,
+{
+}
+
+impl<M, V> FromIterator<V> for MultiValueEncodedCounted<M, V>
+where
+    M: ManagedTypeApi,
+    V: TopEncodeMulti + TopDecodeMultiLength,
+{
+    fn from_iter<T: IntoIterator<Item = V>>(iter: T) -> Self {
+        let mut result: MultiValueEncodedCounted<M, V> = MultiValueEncodedCounted::new();
+        iter.into_iter().for_each(|f| result.push(f));
+        result
+    }
+}
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 8a88ffeef7..4b8db58ffb 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
@@ -4,25 +4,15 @@ use unwrap_infallible::UnwrapInfallible;
 
 use crate::codec::{TopDecodeMulti, TopDecodeMultiInput};
 
+use crate::types::{ManagedBuffer, ManagedVec};
 use crate::{
     api::{ErrorApi, ManagedTypeApi},
     io::{ArgErrorHandler, ArgId, ManagedResultArgLoader},
 };
 
-use super::MultiValueEncoded;
-
-impl<M, T> IntoIterator for MultiValueEncoded<M, T>
-where
-    M: ManagedTypeApi + ErrorApi,
-    T: TopDecodeMulti,
-{
-    type Item = T;
-    type IntoIter = MultiValueEncodedIterator<M, T>;
-    fn into_iter(self) -> Self::IntoIter {
-        MultiValueEncodedIterator::new(self)
-    }
-}
-
+/// Iterator for `MultiValueEncoded` and `MultiValueEncodedCounted`.
+///
+/// Decodes items while it is iterating.
 pub struct MultiValueEncodedIterator<M, T>
 where
     M: ManagedTypeApi + ErrorApi,
@@ -37,9 +27,9 @@ where
     M: ManagedTypeApi + ErrorApi,
     T: TopDecodeMulti,
 {
-    pub(crate) fn new(obj: MultiValueEncoded<M, T>) -> Self {
+    pub(crate) fn new(raw_buffers: ManagedVec<M, ManagedBuffer<M>>) -> Self {
         MultiValueEncodedIterator {
-            data_loader: ManagedResultArgLoader::new(obj.raw_buffers),
+            data_loader: ManagedResultArgLoader::new(raw_buffers),
             _phantom: PhantomData,
         }
     }
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..6ad36a25e8 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
@@ -46,7 +46,7 @@ where
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         Self(ManagedVec::from_handle(handle))
     }
 
@@ -57,6 +57,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M, T> MultiValueManagedVec<M, T>
diff --git a/framework/base/src/types/managed/wrapped/big_uint.rs b/framework/base/src/types/managed/wrapped/big_uint.rs
index 615d790480..344842c2a3 100644
--- a/framework/base/src/types/managed/wrapped/big_uint.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint.rs
@@ -4,7 +4,7 @@ use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
     api::{
         const_handles, use_raw_handle, BigIntApiImpl, HandleConstraints, ManagedBufferApiImpl,
-        ManagedTypeApi, ManagedTypeApiImpl, RawHandle, StaticVarApiImpl,
+        ManagedTypeApi, ManagedTypeApiImpl, RawHandle,
     },
     codec::{
         DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput, NestedEncode,
@@ -26,7 +26,7 @@ pub struct BigUint<M: ManagedTypeApi> {
 impl<M: ManagedTypeApi> ManagedType<M> for BigUint<M> {
     type OwnHandle = M::BigIntHandle;
 
-    fn from_handle(handle: M::BigIntHandle) -> Self {
+    unsafe fn from_handle(handle: M::BigIntHandle) -> Self {
         BigUint {
             value: BigInt::from_handle(handle),
         }
@@ -39,6 +39,10 @@ impl<M: ManagedTypeApi> ManagedType<M> for BigUint<M> {
     fn transmute_from_handle_ref(handle_ref: &M::BigIntHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::BigIntHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> From<u128> for BigUint<M> {
@@ -62,6 +66,17 @@ impl<M: ManagedTypeApi> From<&ManagedBuffer<M>> for BigUint<M> {
 }
 
 impl<M: ManagedTypeApi> BigUint<M> {
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
+        BigUint {
+            value: BigInt::new_uninit(),
+        }
+    }
+
     pub(crate) fn set_value<T>(handle: M::BigIntHandle, value: T)
     where
         T: TryInto<i64> + num_traits::Unsigned,
@@ -73,9 +88,11 @@ impl<M: ManagedTypeApi> BigUint<M> {
     where
         T: TryInto<i64> + num_traits::Unsigned,
     {
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        Self::set_value(handle.clone(), value);
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = Self::new_uninit();
+            Self::set_value(result.get_handle(), value);
+            result
+        }
     }
 
     pub(crate) fn make_temp<T>(handle: RawHandle, value: T) -> M::BigIntHandle
@@ -169,9 +186,11 @@ impl<M: ManagedTypeApi> Default for BigUint<M> {
 impl<M: ManagedTypeApi> BigUint<M> {
     #[inline]
     pub fn zero() -> Self {
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().bi_set_int64(handle.clone(), 0);
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = Self::new_uninit();
+            M::managed_type_impl().bi_set_int64(result.get_handle(), 0);
+            result
+        }
     }
 
     pub fn zero_ref() -> ManagedRef<'static, M, BigUint<M>> {
@@ -191,16 +210,16 @@ impl<M: ManagedTypeApi> BigUint<M> {
         Self::set_value(self.value.handle.clone(), value);
     }
 
-    #[inline]
     pub fn from_bytes_be(bytes: &[u8]) -> Self {
         let mb_handle: M::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1);
         M::managed_type_impl().mb_overwrite(mb_handle.clone(), bytes);
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl().mb_to_big_int_unsigned(mb_handle, handle.clone());
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = Self::new_uninit();
+            M::managed_type_impl().mb_to_big_int_unsigned(mb_handle, result.get_handle());
+            result
+        }
     }
 
-    #[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()
@@ -208,44 +227,40 @@ impl<M: ManagedTypeApi> BigUint<M> {
         M::managed_type_impl().mb_to_boxed_bytes(mb_handle)
     }
 
-    #[inline]
     pub fn from_bytes_be_buffer(managed_buffer: &ManagedBuffer<M>) -> Self {
-        let handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        M::managed_type_impl()
-            .mb_to_big_int_unsigned(managed_buffer.handle.clone(), handle.clone());
-        BigUint::from_handle(handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            M::managed_type_impl()
+                .mb_to_big_int_unsigned(managed_buffer.handle.clone(), result.get_handle());
+            result
+        }
     }
 
-    #[inline]
     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.value.handle.clone(), mb_handle.clone());
-        ManagedBuffer::from_handle(mb_handle)
+        unsafe {
+            let result = ManagedBuffer::new_uninit();
+            M::managed_type_impl().mb_from_big_int_unsigned(self.get_handle(), result.get_handle());
+            result
+        }
     }
 }
 
 impl<M: ManagedTypeApi> BigUint<M> {
-    #[inline]
-    #[must_use]
     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.value.handle.clone());
-        BigUint::from_handle(result_handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            M::managed_type_impl().bi_sqrt(result.get_handle(), self.get_handle());
+            result
+        }
     }
 
-    #[must_use]
     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.value.handle.clone(),
-            big_int_temp_1,
-        );
-        BigUint::from_handle(result_handle)
+        unsafe {
+            let result = BigUint::new_uninit();
+            M::managed_type_impl().bi_pow(result.get_handle(), self.get_handle(), big_int_temp_1);
+            result
+        }
     }
 
     /// The whole part of the base-2 logarithm.
@@ -254,7 +269,6 @@ impl<M: ManagedTypeApi> BigUint<M> {
     /// 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_floor(&self) -> Option<u32> {
         let api = M::managed_type_impl();
         let result = api.bi_log2(self.value.handle.clone());
@@ -298,15 +312,7 @@ impl<M: ManagedTypeApi> BigUint<M> {
 
 impl<M: ManagedTypeApi> Clone for BigUint<M> {
     fn clone(&self) -> Self {
-        let api = M::managed_type_impl();
-        let clone_handle: M::BigIntHandle = use_raw_handle(M::static_var_api_impl().next_handle());
-        api.bi_set_int64(clone_handle.clone(), 0);
-        api.bi_add(
-            clone_handle.clone(),
-            clone_handle.clone(),
-            self.value.handle.clone(),
-        );
-        BigUint::from_handle(clone_handle)
+        unsafe { self.as_big_int().clone().into_big_uint_unchecked() }
     }
 }
 
@@ -372,9 +378,9 @@ 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.value.handle.clone(), str_handle.clone());
-        f.append_managed_buffer(&ManagedBuffer::from_handle(
-            str_handle.cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = str_handle.cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&wrap_cast);
     }
 }
 
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 934079eef7..5ca27f783e 100644
--- a/framework/base/src/types/managed/wrapped/big_uint_operators.rs
+++ b/framework/base/src/types/managed/wrapped/big_uint_operators.rs
@@ -1,5 +1,5 @@
 use crate::{
-    api::{const_handles, use_raw_handle, BigIntApiImpl, ManagedTypeApi, StaticVarApiImpl},
+    api::{const_handles, BigIntApiImpl, ManagedTypeApi},
     types::{BigUint, ManagedType},
 };
 use core::ops::{
@@ -14,11 +14,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.value.handle.clone(),
-                    self.value.handle.clone(),
-                    other.value.handle.clone(),
+                    self.get_handle(),
+                    self.get_handle(),
+                    other.get_handle(),
                 );
-                BigUint::from_handle(self.value.handle.clone())
+                self
             }
         }
 
@@ -26,14 +26,15 @@ macro_rules! binary_operator {
             type Output = BigUint<M>;
 
             fn $method(self, other: &BigUint<M>) -> 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.value.handle.clone(),
-                    other.value.handle.clone(),
-                );
-                BigUint::from_handle(result_handle)
+                unsafe {
+                    let result = BigUint::new_uninit();
+                    M::managed_type_impl().$api_func(
+                        result.get_handle(),
+                        self.get_handle(),
+                        other.get_handle(),
+                    );
+                    result
+                }
             }
         }
 
@@ -42,11 +43,11 @@ macro_rules! binary_operator {
 
             fn $method(self, other: &BigUint<M>) -> BigUint<M> {
                 M::managed_type_impl().$api_func(
-                    self.value.handle.clone(),
-                    self.value.handle.clone(),
-                    other.value.handle.clone(),
+                    self.get_handle(),
+                    self.get_handle(),
+                    other.get_handle(),
                 );
-                BigUint::from_handle(self.value.handle.clone())
+                self
             }
         }
 
@@ -56,11 +57,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.value.handle.clone(),
-                    self.value.handle.clone(),
+                    self.get_handle(),
+                    self.get_handle(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.value.handle.clone())
+                self
             }
         }
 
@@ -70,14 +71,15 @@ macro_rules! binary_operator {
             fn $method(self, other: u32) -> BigUint<M> {
                 let big_int_temp_1 =
                     BigUint::<M>::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
-                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.value.handle.clone(),
-                    big_int_temp_1,
-                );
-                BigUint::from_handle(result_handle)
+                unsafe {
+                    let result = BigUint::new_uninit();
+                    M::managed_type_impl().$api_func(
+                        result.get_handle(),
+                        self.get_handle(),
+                        big_int_temp_1,
+                    );
+                    result
+                }
             }
         }
 
@@ -91,7 +93,7 @@ macro_rules! binary_operator {
                     self.value.handle.clone(),
                     big_int_temp_1,
                 );
-                BigUint::from_handle(self.value.handle.clone())
+                self
             }
         }
 
@@ -101,14 +103,15 @@ macro_rules! binary_operator {
             fn $method(self, other: u64) -> BigUint<M> {
                 let big_int_temp_1 =
                     BigUint::<M>::make_temp(const_handles::BIG_INT_TEMPORARY_1, other);
-                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.value.handle.clone(),
-                    big_int_temp_1,
-                );
-                BigUint::from_handle(result_handle)
+                unsafe {
+                    let result = BigUint::new_uninit();
+                    M::managed_type_impl().$api_func(
+                        result.get_handle(),
+                        self.get_handle(),
+                        big_int_temp_1,
+                    );
+                    result
+                }
             }
         }
     };
@@ -200,14 +203,11 @@ macro_rules! shift_traits {
             type Output = BigUint<M>;
 
             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.value.handle.clone(),
-                    rhs,
-                );
-                BigUint::from_handle(result_handle)
+                unsafe {
+                    let result = BigUint::new_uninit();
+                    M::managed_type_impl().$api_func(result.get_handle(), self.get_handle(), rhs);
+                    result
+                }
             }
         }
     };
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 19506645a2..6221188618 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
@@ -58,7 +58,7 @@ impl<M: ManagedTypeApi> EgldOrEsdtTokenIdentifier<M> {
 
     pub fn from_opt_raw_handle(opt_handle: Option<M::ManagedBufferHandle>) -> Self {
         match opt_handle {
-            Some(handle) => Self::esdt(TokenIdentifier::from_handle(handle)),
+            Some(handle) => Self::esdt(unsafe { TokenIdentifier::from_handle(handle) }),
             None => Self::egld(),
         }
     }
@@ -240,9 +240,9 @@ impl<M: ManagedTypeApi> TypeAbi for EgldOrEsdtTokenIdentifier<M> {
 impl<M: ManagedTypeApi> SCDisplay for EgldOrEsdtTokenIdentifier<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         if let Some(token_identifier) = self.data.as_option() {
-            f.append_managed_buffer(&ManagedBuffer::from_handle(
-                token_identifier.get_handle().cast_or_signal_error::<M, _>(),
-            ));
+            let cast_handle = token_identifier.get_handle().cast_or_signal_error::<M, _>();
+            let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+            f.append_managed_buffer(&wrap_cast);
         } else {
             f.append_bytes(Self::EGLD_REPRESENTATION);
         }
@@ -254,9 +254,9 @@ const EGLD_REPRESENTATION_HEX: &[u8] = b"45474C44";
 impl<M: ManagedTypeApi> SCLowerHex for EgldOrEsdtTokenIdentifier<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
         if let Some(token_identifier) = self.data.as_option() {
-            f.append_managed_buffer_lower_hex(&ManagedBuffer::from_handle(
-                token_identifier.get_handle().cast_or_signal_error::<M, _>(),
-            ));
+            let cast_handle = token_identifier.get_handle().cast_or_signal_error::<M, _>();
+            let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+            f.append_managed_buffer_lower_hex(&wrap_cast);
         } else {
             f.append_bytes(EGLD_REPRESENTATION_HEX);
         }
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 5aedefb3d8..cf2ccf0ceb 100644
--- a/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
+++ b/framework/base/src/types/managed/wrapped/esdt_token_payment.rs
@@ -164,11 +164,11 @@ where
     })
 }
 
-fn managed_vec_item_to_slice<T>(arr: &mut [u8], index: &mut usize, item: &T)
+fn managed_vec_item_to_slice<T>(arr: &mut [u8], index: &mut usize, item: T)
 where
     T: ManagedVecItem,
 {
-    ManagedVecItem::to_byte_writer(item, |bytes| {
+    ManagedVecItem::into_byte_writer(item, |bytes| {
         let size = T::payload_size();
         arr[*index..*index + size].copy_from_slice(bytes);
         *index += size;
@@ -211,13 +211,13 @@ impl<M: ManagedTypeApi> ManagedVecItem for EsdtTokenPayment<M> {
         Self::from_byte_reader(reader)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
         let mut arr: [u8; 16] = [0u8; 16];
         let mut index = 0;
 
-        managed_vec_item_to_slice(&mut arr, &mut index, &self.token_identifier);
-        managed_vec_item_to_slice(&mut arr, &mut index, &self.token_nonce);
-        managed_vec_item_to_slice(&mut arr, &mut index, &self.amount);
+        managed_vec_item_to_slice(&mut arr, &mut index, self.token_identifier);
+        managed_vec_item_to_slice(&mut arr, &mut index, self.token_nonce);
+        managed_vec_item_to_slice(&mut arr, &mut index, self.amount);
 
         writer(&arr[..])
     }
diff --git a/framework/base/src/types/managed/wrapped/managed_address.rs b/framework/base/src/types/managed/wrapped/managed_address.rs
index a90482fb04..a12200a039 100644
--- a/framework/base/src/types/managed/wrapped/managed_address.rs
+++ b/framework/base/src/types/managed/wrapped/managed_address.rs
@@ -2,7 +2,7 @@ use core::convert::{TryFrom, TryInto};
 
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeName},
-    api::ManagedTypeApi,
+    api::{use_raw_handle, ManagedTypeApi, RawHandle},
     codec::{
         DecodeError, DecodeErrorHandler, EncodeErrorHandler, NestedDecode, NestedDecodeInput,
         NestedEncode, NestedEncodeOutput, TopDecode, TopDecodeInput, TopEncode, TopEncodeOutput,
@@ -11,6 +11,8 @@ use crate::{
     types::{heap::Address, ManagedBuffer, ManagedByteArray, ManagedType},
 };
 
+use super::ManagedRef;
+
 #[repr(transparent)]
 #[derive(Clone)]
 pub struct ManagedAddress<M: ManagedTypeApi> {
@@ -49,6 +51,28 @@ where
         }
     }
 
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
+        ManagedAddress {
+            bytes: ManagedByteArray::new_uninit(),
+        }
+    }
+
+    /// Creates a shared managed reference to a given raw handle.
+    ///
+    /// ## Safety
+    ///
+    /// The reference points to a shared value. Make sure the handle is not leaked.
+    pub unsafe fn temp_const_ref(
+        raw_handle: RawHandle,
+    ) -> ManagedRef<'static, M, ManagedAddress<M>> {
+        ManagedRef::wrap_handle(use_raw_handle(raw_handle))
+    }
+
     #[inline]
     pub fn as_managed_buffer(&self) -> &ManagedBuffer<M> {
         self.bytes.as_managed_buffer()
@@ -133,7 +157,7 @@ where
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         ManagedAddress {
             bytes: ManagedByteArray::from_handle(handle),
         }
@@ -146,6 +170,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M> Default for ManagedAddress<M>
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..e722d9e9f6
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_buffer_read_to_end.rs
@@ -0,0 +1,92 @@
+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,
+};
+
+/// A wrapper over a ManagedBuffer with different decode properties. It reads until the end of the buffer.
+#[repr(transparent)]
+#[derive(Clone, Debug)]
+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 }
+    }
+
+    #[inline]
+    pub fn as_managed_buffer(&self) -> &ManagedBuffer<M> {
+        &self.buffer
+    }
+
+    #[inline]
+    pub fn into_managed_buffer(self) -> ManagedBuffer<M> {
+        self.buffer
+    }
+}
+
+impl<M: ManagedTypeApi> PartialEq for ManagedBufferReadToEnd<M> {
+    fn eq(&self, other: &Self) -> bool {
+        self.buffer == other.buffer
+    }
+}
+
+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> 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-read-to-end".into()
+    }
+
+    fn type_name_rust() -> TypeName {
+        "ManagedBufferReadToEnd<$API>".into()
+    }
+}
+
+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::<ManagedBuffer<M>>() {
+            dest.push_specialized((), &self.buffer, h)
+        } else {
+            Err(h.handle_error(EncodeError::UNSUPPORTED_OPERATION))
+        }
+    }
+}
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 83e95d332c..5ef3e661b7 100644
--- a/framework/base/src/types/managed/wrapped/managed_byte_array.rs
+++ b/framework/base/src/types/managed/wrapped/managed_byte_array.rs
@@ -35,7 +35,7 @@ where
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         ManagedByteArray {
             buffer: ManagedBuffer::from_handle(handle),
         }
@@ -48,6 +48,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M, const N: usize> Default for ManagedByteArray<M, N>
@@ -81,6 +85,17 @@ where
         }
     }
 
+    /// Creates a new object, without initializing it.
+    ///
+    /// ## Safety
+    ///
+    /// The value needs to be initialized after creation, otherwise the VM will halt the first time the value is attempted to be read.
+    pub unsafe fn new_uninit() -> Self {
+        ManagedByteArray {
+            buffer: ManagedBuffer::new_uninit(),
+        }
+    }
+
     /// Number of items.
     #[inline]
     pub fn len(&self) -> usize {
diff --git a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
index 41f173a50a..43c4debbac 100644
--- a/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
+++ b/framework/base/src/types/managed/wrapped/managed_decimal/managed_decimal_logarithm.rs
@@ -2,7 +2,7 @@ use super::decimals::{ConstDecimals, Decimals};
 use super::ManagedDecimalSigned;
 use super::{ManagedDecimal, NumDecimals};
 
-use crate::proxy_imports::ManagedType;
+use crate::types::ManagedRef;
 use crate::{
     api::ManagedTypeApi,
     contract_base::ErrorHelper,
@@ -104,7 +104,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
             return None;
         }
 
-        let bu = BigUint::from_handle(self.data.handle.clone());
+        let bu = unsafe { ManagedRef::wrap_handle(self.data.handle.clone()) };
         compute_ln(&bu, self.decimals.num_decimals())
     }
 
@@ -118,7 +118,7 @@ impl<M: ManagedTypeApi, D: Decimals> ManagedDecimalSigned<M, D> {
             return None;
         }
 
-        let bu = BigUint::from_handle(self.data.handle.clone());
+        let bu = unsafe { ManagedRef::wrap_handle(self.data.handle.clone()) };
         compute_log2(&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 c8ee403f37..0338417f82 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
@@ -6,7 +6,7 @@ use crate::{
     },
     err_msg,
     formatter::{FormatBuffer, FormatByteReceiver, SCDisplay},
-    types::{BigFloat, BigInt, BigUint, ManagedBuffer, ManagedType, Sign},
+    types::{BigFloat, BigInt, BigUint, Sign},
 };
 
 use alloc::string::ToString;
@@ -354,15 +354,15 @@ pub(super) fn managed_decimal_fmt<M: ManagedTypeApi, F: FormatByteReceiver>(
     if len > num_dec {
         let temp_str_handle: M::ManagedBufferHandle =
             use_raw_handle(const_handles::MBUF_TEMPORARY_2);
+        let cast_handle = temp_str_handle.clone().cast_or_signal_error::<M, _>();
+        let temp_str_ref = unsafe { ManagedRef::wrap_handle(cast_handle) };
         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_managed_buffer(&temp_str_ref);
         f.append_bytes(b".");
         let _ = M::managed_type_impl().mb_copy_slice(
             full_str_handle.clone(),
@@ -370,17 +370,15 @@ pub(super) fn managed_decimal_fmt<M: ManagedTypeApi, F: FormatByteReceiver>(
             num_dec,
             temp_str_handle.clone(),
         );
-        f.append_managed_buffer(&ManagedBuffer::from_raw_handle(
-            temp_str_handle.get_raw_handle(),
-        ));
+        f.append_managed_buffer(&temp_str_ref);
     } 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(),
-        ));
+        let cast_handle = full_str_handle.clone().cast_or_signal_error::<M, _>();
+        let full_str_ref = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&full_str_ref);
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/managed_option.rs b/framework/base/src/types/managed/wrapped/managed_option.rs
index ddedbbdb8d..e433913835 100644
--- a/framework/base/src/types/managed/wrapped/managed_option.rs
+++ b/framework/base/src/types/managed/wrapped/managed_option.rs
@@ -143,7 +143,7 @@ where
         F: FnOnce(Context, &T) -> R,
     {
         if self.is_some() {
-            f(context, &T::from_handle(self.handle.clone()))
+            f(context, unsafe { &T::from_handle(self.handle.clone()) })
         } else {
             default(context)
         }
@@ -158,7 +158,7 @@ where
     #[allow(clippy::redundant_clone)] // the clone is not redundant
     fn clone(&self) -> Self {
         if self.is_some() {
-            Self::some(T::from_handle(self.handle.clone()).clone())
+            Self::some(unsafe { T::from_handle(self.handle.clone()) }.clone())
         } else {
             Self::none()
         }
@@ -177,7 +177,10 @@ where
             return true;
         }
         if self.is_some() && other.is_some() {
-            return T::from_handle(self.handle.clone()) == T::from_handle(other.handle.clone());
+            unsafe {
+                return ManagedRef::<'_, _, T>::wrap_handle(self.handle.clone())
+                    == ManagedRef::<'_, _, T>::wrap_handle(other.handle.clone());
+            }
         }
         false
     }
@@ -210,8 +213,8 @@ where
         Self::from_byte_reader(reader)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-        <T::OwnHandle as ManagedVecItem>::to_byte_writer(&self.handle.clone(), writer)
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        <T::OwnHandle as ManagedVecItem>::into_byte_writer(self.handle, writer)
     }
 }
 
@@ -308,7 +311,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) {
@@ -324,7 +330,7 @@ where
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         if self.is_some() {
             f.debug_tuple("ManagedOption::Some")
-                .field(&T::from_handle(self.handle.clone()))
+                .field(unsafe { &T::from_handle(self.handle.clone()) })
                 .finish()
         } else {
             f.write_str("ManagedOption::None")
diff --git a/framework/base/src/types/managed/wrapped/managed_ref.rs b/framework/base/src/types/managed/wrapped/managed_ref.rs
index 143d79e1d4..ef0e20fb9f 100644
--- a/framework/base/src/types/managed/wrapped/managed_ref.rs
+++ b/framework/base/src/types/managed/wrapped/managed_ref.rs
@@ -34,7 +34,7 @@ where
 
     /// Will completely disregard lifetimes, use with care.
     #[doc(hidden)]
-    pub(crate) unsafe fn wrap_handle(handle: T::OwnHandle) -> Self {
+    pub unsafe fn wrap_handle(handle: T::OwnHandle) -> Self {
         Self {
             _phantom_m: PhantomData,
             _phantom_t: PhantomData,
diff --git a/framework/base/src/types/managed/wrapped/managed_ref_mut.rs b/framework/base/src/types/managed/wrapped/managed_ref_mut.rs
new file mode 100644
index 0000000000..81315b89b2
--- /dev/null
+++ b/framework/base/src/types/managed/wrapped/managed_ref_mut.rs
@@ -0,0 +1,174 @@
+use core::ops::DerefMut;
+use core::{borrow::Borrow, marker::PhantomData, ops::Deref};
+
+use crate::codec::{
+    EncodeErrorHandler, NestedEncode, NestedEncodeOutput, TopEncode, TopEncodeOutput,
+};
+
+use crate::{api::ManagedTypeApi, types::ManagedType};
+
+/// A very efficient mutable reference to a managed type.
+///
+/// It can be dereferenced mutably (DerefMut).
+pub struct ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    pub(super) _phantom_m: PhantomData<M>,
+    pub(super) _phantom_t: PhantomData<&'a mut T>,
+    pub(super) handle: T::OwnHandle,
+}
+
+impl<'a, M, T> ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    pub fn new(value: &'a mut T) -> Self {
+        Self {
+            _phantom_m: PhantomData,
+            _phantom_t: PhantomData,
+            handle: value.get_handle(),
+        }
+    }
+
+    /// Will completely disregard lifetimes, use with care.
+    #[doc(hidden)]
+    pub(crate) unsafe fn wrap_handle(handle: T::OwnHandle) -> Self {
+        Self {
+            _phantom_m: PhantomData,
+            _phantom_t: PhantomData,
+            handle,
+        }
+    }
+}
+
+impl<'a, M, T> ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + Clone,
+{
+    /// Syntactic sugar for dereferencing and cloning the object.
+    pub fn clone_value(&self) -> T {
+        self.deref().clone()
+    }
+}
+
+impl<'a, M, T> Clone for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    #[inline]
+    fn clone(&self) -> Self {
+        Self {
+            _phantom_m: PhantomData,
+            _phantom_t: PhantomData,
+            handle: self.handle.clone(),
+        }
+    }
+}
+
+impl<'a, M, T> Deref for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    type Target = T;
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        Self::Target::transmute_from_handle_ref(&self.handle)
+    }
+}
+
+impl<'a, M, T> DerefMut for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        Self::Target::transmute_from_handle_ref_mut(&mut self.handle)
+    }
+}
+
+impl<'a, M, T> Borrow<T> for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    #[inline]
+    fn borrow(&self) -> &T {
+        self.deref()
+    }
+}
+
+impl<'a, M, T> From<&'a mut T> for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M>,
+{
+    #[inline]
+    fn from(value_ref: &'a mut T) -> Self {
+        Self::new(value_ref)
+    }
+}
+
+impl<'a, M, T> PartialEq for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + PartialEq,
+{
+    #[inline]
+    fn eq(&self, other: &Self) -> bool {
+        self.deref() == other.deref()
+    }
+}
+
+impl<'a, M, T> Eq for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + PartialEq,
+{
+}
+
+impl<'a, M, T> TopEncode for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + TopEncode,
+{
+    #[inline]
+    fn top_encode_or_handle_err<O, H>(&self, output: O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: TopEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.deref().top_encode_or_handle_err(output, h)
+    }
+}
+
+impl<'a, M, T> NestedEncode for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + NestedEncode,
+{
+    #[inline]
+    fn dep_encode_or_handle_err<O, H>(&self, dest: &mut O, h: H) -> Result<(), H::HandledErr>
+    where
+        O: NestedEncodeOutput,
+        H: EncodeErrorHandler,
+    {
+        self.deref().dep_encode_or_handle_err(dest, h)
+    }
+}
+
+impl<'a, M, T> core::fmt::Debug for ManagedRefMut<'a, M, T>
+where
+    M: ManagedTypeApi,
+    T: ManagedType<M> + core::fmt::Debug,
+{
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        f.debug_tuple("ManagedRefMut").field(self.deref()).finish()
+    }
+}
diff --git a/framework/base/src/types/managed/wrapped/managed_vec.rs b/framework/base/src/types/managed/wrapped/managed_vec.rs
index e37dd872d5..582054e6ec 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec.rs
@@ -45,7 +45,7 @@ where
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         ManagedVec {
             buffer: ManagedBuffer::from_handle(handle),
             _phantom: PhantomData,
@@ -59,6 +59,10 @@ where
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M, T> ManagedVec<M, T>
@@ -190,9 +194,9 @@ where
         }
     }
 
-    pub fn set(&mut self, index: usize, item: &T) -> Result<(), InvalidSliceError> {
+    pub fn set(&mut self, index: usize, item: T) -> Result<(), InvalidSliceError> {
         let byte_index = index * T::payload_size();
-        item.to_byte_writer(|slice| self.buffer.set_slice(byte_index, slice))
+        item.into_byte_writer(|slice| self.buffer.set_slice(byte_index, slice))
     }
 
     /// Returns a new `ManagedVec`, containing the [start_index, end_index) range of elements.
@@ -205,7 +209,7 @@ where
     }
 
     pub fn push(&mut self, item: T) {
-        item.to_byte_writer(|bytes| {
+        item.into_byte_writer(|bytes| {
             self.buffer.append_bytes(bytes);
         });
     }
@@ -233,7 +237,7 @@ where
             ManagedVec::new()
         };
 
-        self.buffer = part_before.buffer;
+        *self = part_before;
         self.buffer.append(&part_after.buffer);
     }
 
@@ -251,7 +255,7 @@ where
     }
 
     pub fn overwrite_with_single_item(&mut self, item: T) {
-        item.to_byte_writer(|bytes| {
+        item.into_byte_writer(|bytes| {
             self.buffer.overwrite(bytes);
         });
     }
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..8e88624d75 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_item.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_item.rs
@@ -1,5 +1,7 @@
 use core::borrow::Borrow;
 
+use multiversx_chain_core::types::{EsdtLocalRole, EsdtTokenType};
+
 use crate::{
     api::ManagedTypeApi,
     types::{
@@ -31,6 +33,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>;
 
@@ -50,7 +53,16 @@ pub trait ManagedVecItem: 'static {
         reader: Reader,
     ) -> Self::Ref<'a>;
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R;
+    /// Converts the object into bytes.
+    ///
+    /// The output is processed by the `writer` lambda.
+    /// The writer is provided by the caller.
+    /// The callee will use it to pass on the bytes.
+    ///
+    /// The method is used when instering (push, overwrite) into a ManagedVec.
+    ///
+    /// Note that a destructor should not be called at this moment, since the ManagedVec will take ownership of the item.
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R;
 }
 
 macro_rules! impl_int {
@@ -70,7 +82,7 @@ macro_rules! impl_int {
                 Self::from_byte_reader(reader)
             }
 
-            fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+            fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
                 let bytes = self.to_be_bytes();
                 writer(&bytes)
             }
@@ -101,8 +113,8 @@ impl ManagedVecItem for usize {
         Self::from_byte_reader(reader)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
-        let bytes = (*self as u32).to_be_bytes();
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
+        let bytes = (self as u32).to_be_bytes();
         writer(&bytes)
     }
 }
@@ -122,11 +134,11 @@ impl ManagedVecItem for bool {
         Self::from_byte_reader(reader)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
         // true -> 1u8
         // false -> 0u8
-        let u8_value = u8::from(*self);
-        <u8 as ManagedVecItem>::to_byte_writer(&u8_value, writer)
+        let u8_value = u8::from(self);
+        <u8 as ManagedVecItem>::into_byte_writer(u8_value, writer)
     }
 }
 
@@ -158,12 +170,12 @@ where
         Self::from_byte_reader(reader)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
         let mut payload = Self::PAYLOAD::new_buffer();
         let slice = payload.payload_slice_mut();
         if let Some(t) = self {
             slice[0] = 1;
-            T::to_byte_writer(t, |bytes| {
+            T::into_byte_writer(t, |bytes| {
                 slice[1..].copy_from_slice(bytes);
             });
         }
@@ -180,7 +192,7 @@ macro_rules! impl_managed_type {
 
             fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self {
                 let handle = <$ty<M> as ManagedType<M>>::OwnHandle::from_byte_reader(reader);
-                $ty::from_handle(handle)
+                unsafe { $ty::from_handle(handle) }
             }
 
             unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
@@ -190,8 +202,8 @@ macro_rules! impl_managed_type {
                 ManagedRef::wrap_handle(handle)
             }
 
-            fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-                <$ty<M> as ManagedType<M>>::OwnHandle::to_byte_writer(&self.get_handle(), writer)
+            fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+                <$ty<M> as ManagedType<M>>::OwnHandle::into_byte_writer(self.get_handle(), writer)
             }
         }
     };
@@ -214,7 +226,7 @@ where
 
     fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self {
         let handle = <Self as ManagedType<M>>::OwnHandle::from_byte_reader(reader);
-        Self::from_handle(handle)
+        unsafe { Self::from_handle(handle) }
     }
 
     unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
@@ -224,9 +236,9 @@ where
         ManagedRef::wrap_handle(handle)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-        <<Self as ManagedType<M>>::OwnHandle as ManagedVecItem>::to_byte_writer(
-            &self.get_handle(),
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        <<Self as ManagedType<M>>::OwnHandle as ManagedVecItem>::into_byte_writer(
+            self.get_handle(),
             writer,
         )
     }
@@ -243,7 +255,7 @@ where
 
     fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self {
         let handle = M::ManagedBufferHandle::from_byte_reader(reader);
-        Self::from_handle(handle)
+        unsafe { Self::from_handle(handle) }
     }
 
     unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
@@ -253,7 +265,49 @@ where
         ManagedRef::wrap_handle(handle)
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-        <M::ManagedBufferHandle as ManagedVecItem>::to_byte_writer(&self.get_handle(), writer)
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        <M::ManagedBufferHandle as ManagedVecItem>::into_byte_writer(self.get_handle(), writer)
+    }
+}
+
+impl ManagedVecItem for EsdtTokenType {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<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[..]);
+        arr[0].into()
+    }
+
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
+        writer(&[self.as_u8()])
+    }
+}
+
+impl ManagedVecItem for EsdtLocalRole {
+    type PAYLOAD = ManagedVecItemPayloadBuffer<1>;
+    const SKIPS_RESERIALIZATION: bool = false; // TODO: might be ok to be true, but needs testing
+    type Ref<'a> = Self;
+
+    fn from_byte_reader<Reader: FnMut(&mut [u8])>(reader: Reader) -> Self {
+        u16::from_byte_reader(reader).into()
+    }
+
+    unsafe fn from_byte_reader_as_borrow<'a, Reader: FnMut(&mut [u8])>(
+        reader: Reader,
+    ) -> Self::Ref<'a> {
+        Self::from_byte_reader(reader)
+    }
+
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        <u16 as ManagedVecItem>::into_byte_writer(self.as_u16(), writer)
     }
 }
diff --git a/framework/base/src/types/managed/wrapped/managed_vec_ref.rs b/framework/base/src/types/managed/wrapped/managed_vec_ref.rs
index dc2b722fbd..b339d1cdaf 100644
--- a/framework/base/src/types/managed/wrapped/managed_vec_ref.rs
+++ b/framework/base/src/types/managed/wrapped/managed_vec_ref.rs
@@ -1,12 +1,15 @@
 use crate::{
     api::ManagedTypeApi,
-    types::{ManagedType, ManagedVec, ManagedVecItem},
+    types::{ManagedVec, ManagedVecItem},
 };
 use core::{
     marker::PhantomData,
+    mem::ManuallyDrop,
     ops::{Deref, DerefMut},
 };
 
+use super::{ManagedRef, ManagedRefMut};
+
 pub struct ManagedVecRef<'a, M, T>
 where
     M: ManagedTypeApi,
@@ -16,7 +19,7 @@ where
     _phantom_t: PhantomData<&'a mut T>, // needed for the lifetime, even though T is present
     managed_vec_handle: M::ManagedBufferHandle,
     item_index: usize,
-    item: T,
+    item: ManuallyDrop<T>,
 }
 
 impl<'a, M, T> ManagedVecRef<'a, M, T>
@@ -25,8 +28,10 @@ where
     T: ManagedVecItem,
 {
     #[inline]
-    fn wrap_as_managed_vec(managed_vec_handle: M::ManagedBufferHandle) -> ManagedVec<M, T> {
-        ManagedVec::from_handle(managed_vec_handle)
+    unsafe fn wrap_as_managed_vec(
+        managed_vec_handle: M::ManagedBufferHandle,
+    ) -> ManagedRef<'static, M, ManagedVec<M, T>> {
+        ManagedRef::wrap_handle(managed_vec_handle)
     }
 
     pub(super) fn new(managed_vec_handle: M::ManagedBufferHandle, item_index: usize) -> Self {
@@ -37,7 +42,7 @@ where
             _phantom_t: PhantomData,
             managed_vec_handle,
             item_index,
-            item,
+            item: ManuallyDrop::new(item),
         }
     }
 }
@@ -48,8 +53,13 @@ where
     T: ManagedVecItem,
 {
     fn drop(&mut self) {
-        let _ = Self::wrap_as_managed_vec(self.managed_vec_handle.clone())
-            .set(self.item_index, &self.item);
+        let item = unsafe { ManuallyDrop::take(&mut self.item) };
+        unsafe {
+            let _ =
+                ManagedRefMut::<M, ManagedVec<M, T>>::wrap_handle(self.managed_vec_handle.clone())
+                    .set(self.item_index, item);
+        }
+        // core::mem::forget(item);
     }
 }
 
diff --git a/framework/base/src/types/managed/wrapped/mod.rs b/framework/base/src/types/managed/wrapped/mod.rs
index 3a45b7c151..37849e0b6c 100644
--- a/framework/base/src/types/managed/wrapped/mod.rs
+++ b/framework/base/src/types/managed/wrapped/mod.rs
@@ -9,10 +9,12 @@ 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_option;
 mod managed_ref;
+mod managed_ref_mut;
 mod managed_vec;
 mod managed_vec_item;
 mod managed_vec_item_nested_tuple;
@@ -34,6 +36,7 @@ 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::{
@@ -41,6 +44,7 @@ pub use managed_decimal::{
 };
 pub use managed_option::ManagedOption;
 pub use managed_ref::ManagedRef;
+pub use managed_ref_mut::ManagedRefMut;
 pub use managed_vec::ManagedVec;
 pub use managed_vec_item::ManagedVecItem;
 pub use managed_vec_item_nested_tuple::ManagedVecItemNestedTuple;
diff --git a/framework/base/src/types/managed/wrapped/token_identifier.rs b/framework/base/src/types/managed/wrapped/token_identifier.rs
index 1e66615199..10c92475a3 100644
--- a/framework/base/src/types/managed/wrapped/token_identifier.rs
+++ b/framework/base/src/types/managed/wrapped/token_identifier.rs
@@ -9,7 +9,7 @@ use crate::{
     types::{ManagedBuffer, ManagedType},
 };
 
-use super::EgldOrEsdtTokenIdentifier;
+use super::{EgldOrEsdtTokenIdentifier, ManagedRef};
 
 /// Specialized type for handling token identifiers.
 /// It wraps a BoxedBytes with the full ASCII name of the token.
@@ -26,7 +26,7 @@ impl<M: ManagedTypeApi> ManagedType<M> for TokenIdentifier<M> {
     type OwnHandle = M::ManagedBufferHandle;
 
     #[inline]
-    fn from_handle(handle: M::ManagedBufferHandle) -> Self {
+    unsafe fn from_handle(handle: M::ManagedBufferHandle) -> Self {
         TokenIdentifier {
             buffer: ManagedBuffer::from_handle(handle),
         }
@@ -39,6 +39,10 @@ impl<M: ManagedTypeApi> ManagedType<M> for TokenIdentifier<M> {
     fn transmute_from_handle_ref(handle_ref: &M::ManagedBufferHandle) -> &Self {
         unsafe { core::mem::transmute(handle_ref) }
     }
+
+    fn transmute_from_handle_ref_mut(handle_ref: &mut M::ManagedBufferHandle) -> &mut Self {
+        unsafe { core::mem::transmute(handle_ref) }
+    }
 }
 
 impl<M: ManagedTypeApi> TokenIdentifier<M> {
@@ -190,17 +194,17 @@ impl<M: ManagedTypeApi> TypeAbi for TokenIdentifier<M> {
 
 impl<M: ManagedTypeApi> SCDisplay for TokenIdentifier<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        f.append_managed_buffer(&ManagedBuffer::from_handle(
-            self.buffer.get_handle().cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = self.buffer.get_handle().cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer(&wrap_cast);
     }
 }
 
 impl<M: ManagedTypeApi> SCLowerHex for TokenIdentifier<M> {
     fn fmt<F: FormatByteReceiver>(&self, f: &mut F) {
-        f.append_managed_buffer_lower_hex(&ManagedBuffer::from_handle(
-            self.buffer.get_handle().cast_or_signal_error::<M, _>(),
-        ));
+        let cast_handle = self.buffer.get_handle().cast_or_signal_error::<M, _>();
+        let wrap_cast = unsafe { ManagedRef::wrap_handle(cast_handle) };
+        f.append_managed_buffer_lower_hex(&wrap_cast);
     }
 }
 
diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml
index 8614624e7c..82d90584d0 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.54.1"
 edition = "2021"
 
 authors = ["Andrei Marinica <andrei.marinica@multiversx.com>", "MultiversX <contact@multiversx.com>"]
@@ -15,8 +15,8 @@ categories = ["cryptography::cryptocurrencies", "development-tools::procedural-m
 
 [dependencies]
 proc-macro2 = "=1.0.86"
-quote = "=1.0.36"
-syn = "=2.0.68"
+quote = "=1.0.37"
+syn = "=2.0.77"
 hex = "=0.4.3"
 radix_trie = "=0.2.1"
 
diff --git a/framework/derive/src/generate/abi_gen.rs b/framework/derive/src/generate/abi_gen.rs
index 5d5a73934c..0aa70fbc06 100644
--- a/framework/derive/src/generate/abi_gen.rs
+++ b/framework/derive/src/generate/abi_gen.rs
@@ -15,6 +15,27 @@ fn generate_endpoint_snippet(
 ) -> proc_macro2::TokenStream {
     let endpoint_docs = &m.docs;
     let rust_method_name = m.name.to_string();
+    let title_tokens = m
+        .title
+        .as_ref()
+        .map(|title| quote! { .with_title(#title) })
+        .unwrap_or_default();
+    let only_owner_tokens = if only_owner {
+        quote! { .with_only_owner() }
+    } else {
+        quote! {}
+    };
+    let only_admin_tokens = if only_admin {
+        quote! { .with_only_admin() }
+    } else {
+        quote! {}
+    };
+    let allow_multiple_var_args_tokens = if allow_multiple_var_args {
+        quote! { .with_allow_multiple_var_args() }
+    } else {
+        quote! {}
+    };
+
     let payable_in_tokens = m.payable_metadata().abi_strings();
 
     let input_snippets: Vec<proc_macro2::TokenStream> = m
@@ -55,17 +76,20 @@ fn generate_endpoint_snippet(
 
     quote! {
         let mut endpoint_abi = multiversx_sc::abi::EndpointAbi::new(
-            &[ #(#endpoint_docs),* ],
             #endpoint_name,
             #rust_method_name,
-            #only_owner,
-            #only_admin,
             #mutability_tokens,
             #endpoint_type_tokens,
-            &[ #(#payable_in_tokens),* ],
-            &[ #(#label_names),* ],
-            #allow_multiple_var_args,
-        );
+        )
+        #(.with_docs(#endpoint_docs))*
+        #title_tokens
+        #only_owner_tokens
+        #only_admin_tokens
+        #(.with_label(#label_names))*
+        #(.with_payable_token(#payable_in_tokens))*
+        #allow_multiple_var_args_tokens
+        ;
+
         #(#input_snippets)*
         #output_snippet
     }
diff --git a/framework/derive/src/managed_vec_item_derive.rs b/framework/derive/src/managed_vec_item_derive.rs
index 1755182f34..17c07f21a4 100644
--- a/framework/derive/src/managed_vec_item_derive.rs
+++ b/framework/derive/src/managed_vec_item_derive.rs
@@ -75,7 +75,7 @@ fn generate_to_byte_writer_snippets(fields: &syn::Fields) -> Vec<proc_macro2::To
                 let field_ident = &field.ident;
                 let type_name = &field.ty;
                 quote! {
-                    multiversx_sc::types::ManagedVecItem::to_byte_writer(&self.#field_ident, |bytes| {
+                    multiversx_sc::types::ManagedVecItem::into_byte_writer(self.#field_ident, |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;
@@ -137,7 +137,7 @@ fn enum_derive(data_enum: &syn::DataEnum, ast: &syn::DeriveInput) -> TokenStream
                 Self::from_byte_reader(reader)
             }
 
-            fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+            fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
                 let mut arr: [u8; 1] = [0u8; 1];
                 arr[0] = match self {
                     #(#writer_match_arms)*
@@ -180,7 +180,7 @@ fn struct_derive(data_struct: &syn::DataStruct, ast: &syn::DeriveInput) -> Token
                 Self::from_byte_reader(reader)
             }
 
-            fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, mut writer: Writer) -> R {
+            fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, mut writer: Writer) -> R {
                 #payload_buffer_snippet
                 let mut index = 0;
 
diff --git a/framework/derive/src/model/method.rs b/framework/derive/src/model/method.rs
index 22acf8eb78..8a4e8ec5eb 100644
--- a/framework/derive/src/model/method.rs
+++ b/framework/derive/src/model/method.rs
@@ -40,6 +40,7 @@ pub struct Method {
     pub generics: syn::Generics,
     pub unprocessed_attributes: Vec<syn::Attribute>,
     pub method_args: Vec<MethodArgument>,
+    pub title: Option<String>,
     pub output_names: Vec<String>,
     pub label_names: Vec<String>,
     pub return_type: syn::ReturnType,
diff --git a/framework/derive/src/parse/attributes/mod.rs b/framework/derive/src/parse/attributes.rs
similarity index 93%
rename from framework/derive/src/parse/attributes/mod.rs
rename to framework/derive/src/parse/attributes.rs
index e58c1a912e..a5f9906db9 100644
--- a/framework/derive/src/parse/attributes/mod.rs
+++ b/framework/derive/src/parse/attributes.rs
@@ -11,7 +11,7 @@ mod trait_prop_names;
 mod util;
 
 pub use argument_attr::*;
-pub use doc_attr::{extract_doc, extract_macro_attributes, OutputNameAttribute};
+pub use doc_attr::{extract_doc, extract_macro_attributes, OutputNameAttribute, TitleAttribute};
 pub use endpoint_attr::*;
 pub use event_attr::*;
 pub use label_attr::*;
diff --git a/framework/derive/src/parse/attributes/attr_names.rs b/framework/derive/src/parse/attributes/attr_names.rs
index 29784fc1c3..5a976e185c 100644
--- a/framework/derive/src/parse/attributes/attr_names.rs
+++ b/framework/derive/src/parse/attributes/attr_names.rs
@@ -2,6 +2,7 @@ pub(super) static ATTR_PAYABLE: &str = "payable";
 pub(super) static ATTR_ONLY_OWNER: &str = "only_owner";
 pub(super) static ATTR_ONLY_ADMIN: &str = "only_admin";
 pub(super) static ATTR_ONLY_USER_ACCOUNT: &str = "only_user_account";
+pub(super) static ATTR_TITLE: &str = "title";
 pub(super) static ATTR_OUTPUT_NAME: &str = "output_name";
 pub(super) static ATTR_PAYMENT: &str = "payment"; // synonymous with `payment_amount`
 pub(super) static ATTR_PAYMENT_AMOUNT: &str = "payment_amount";
diff --git a/framework/derive/src/parse/attributes/doc_attr.rs b/framework/derive/src/parse/attributes/doc_attr.rs
index 5c5ed4d41b..e9485d6368 100644
--- a/framework/derive/src/parse/attributes/doc_attr.rs
+++ b/framework/derive/src/parse/attributes/doc_attr.rs
@@ -81,3 +81,13 @@ impl OutputNameAttribute {
         })
     }
 }
+
+pub struct TitleAttribute {
+    pub title: String,
+}
+
+impl TitleAttribute {
+    pub fn parse(attr: &syn::Attribute) -> Option<Self> {
+        is_attr_one_string_arg(attr, ATTR_TITLE).map(|arg_str| TitleAttribute { title: arg_str })
+    }
+}
diff --git a/framework/derive/src/parse/endpoint_parse.rs b/framework/derive/src/parse/endpoint_parse.rs
index 5edc30ad08..26fb612ea6 100644
--- a/framework/derive/src/parse/endpoint_parse.rs
+++ b/framework/derive/src/parse/endpoint_parse.rs
@@ -8,7 +8,7 @@ use super::{
         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,
+        TitleAttribute, ViewAttribute,
     },
     MethodAttributesPass1,
 };
@@ -224,6 +224,18 @@ pub fn process_output_names_attribute(attr: &syn::Attribute, method: &mut Method
         .is_some()
 }
 
+pub fn process_title_attribute(attr: &syn::Attribute, method: &mut Method) -> bool {
+    TitleAttribute::parse(attr)
+        .map(|title_attr| {
+            assert!(
+                method.title.is_none(),
+                "only one title attribute allowed per method"
+            );
+            method.title = Some(title_attr.title);
+        })
+        .is_some()
+}
+
 pub fn process_label_names_attribute(attr: &syn::Attribute, method: &mut Method) -> bool {
     LabelAttribute::parse(attr)
         .map(|label_attr| {
diff --git a/framework/derive/src/parse/method_parse.rs b/framework/derive/src/parse/method_parse.rs
index 481638068a..e299912cdd 100644
--- a/framework/derive/src/parse/method_parse.rs
+++ b/framework/derive/src/parse/method_parse.rs
@@ -13,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_upgrade_attribute, process_view_attribute,
+    process_title_attribute, process_upgrade_attribute, process_view_attribute,
 };
 pub struct MethodAttributesPass1 {
     pub method_name: String,
@@ -56,6 +56,7 @@ pub fn process_method(m: &syn::TraitItemFn, trait_attributes: &TraitProperties)
         generics: m.sig.generics.clone(),
         unprocessed_attributes: Vec::new(),
         method_args,
+        title: None,
         output_names: Vec::new(),
         label_names: Vec::new(),
         return_type: m.sig.output.clone(),
@@ -131,6 +132,7 @@ fn process_attribute_second_pass(
         || process_storage_mapper_from_address_attribute(attr, method)
         || process_storage_is_empty_attribute(attr, method)
         || process_storage_clear_attribute(attr, method)
+        || process_title_attribute(attr, method)
         || process_output_names_attribute(attr, method)
         || process_label_names_attribute(attr, method)
 }
diff --git a/framework/derive/src/preprocessing/substitution_list.rs b/framework/derive/src/preprocessing/substitution_list.rs
index 62fdb11823..a04da2a4c1 100644
--- a/framework/derive/src/preprocessing/substitution_list.rs
+++ b/framework/derive/src/preprocessing/substitution_list.rs
@@ -61,6 +61,7 @@ fn add_managed_types(substitutions: &mut SubstitutionsMap) {
     add_managed_type_with_generics(substitutions, &quote!(ManagedVarArgs));
     add_managed_type_with_generics(substitutions, &quote!(ManagedMultiResultVec));
     add_managed_type_with_generics(substitutions, &quote!(MultiValueManagedVecCounted));
+    add_managed_type_with_generics(substitutions, &quote!(MultiValueEncodedCounted));
     add_managed_type_with_generics(substitutions, &quote!(ManagedCountedVarArgs));
     add_managed_type_with_generics(substitutions, &quote!(ManagedCountedMultiResultVec));
     add_managed_type_with_generics(substitutions, &quote!(MultiValueManagedVec));
@@ -109,6 +110,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));
diff --git a/framework/meta-lib/Cargo.toml b/framework/meta-lib/Cargo.toml
index 6515883af0..23716ac182 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.54.1"
 edition = "2021"
 
 authors = [
@@ -26,11 +26,12 @@ colored = "2.0"
 lazy_static = "1.4.0"
 convert_case = "0.6.0"
 hex = "0.4"
-wasmparser = "0.212"
-wasmprinter = "0.212"
+wasmparser = "0.216"
+wasmprinter = "0.216"
 semver = "1.0.20"
+wat = "1.217.0"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
diff --git a/framework/meta-lib/src/abi_json/endpoint_abi_json.rs b/framework/meta-lib/src/abi_json/endpoint_abi_json.rs
index b6bd041713..0537718e4a 100644
--- a/framework/meta-lib/src/abi_json/endpoint_abi_json.rs
+++ b/framework/meta-lib/src/abi_json/endpoint_abi_json.rs
@@ -93,6 +93,10 @@ pub struct EndpointAbiJson {
     pub docs: Vec<String>,
     pub name: String,
 
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub title: Option<String>,
+
     #[serde(rename = "onlyOwner")]
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -128,6 +132,7 @@ impl From<&EndpointAbi> for EndpointAbiJson {
         EndpointAbiJson {
             docs: abi.docs.iter().map(|d| d.to_string()).collect(),
             name: abi.name.to_string(),
+            title: abi.title.clone(),
             only_owner: if abi.only_owner { Some(true) } else { None },
             only_admin: if abi.only_admin { Some(true) } else { None },
             mutability: match abi.mutability {
diff --git a/framework/meta-lib/src/cargo_toml.rs b/framework/meta-lib/src/cargo_toml.rs
new file mode 100644
index 0000000000..898d1932be
--- /dev/null
+++ b/framework/meta-lib/src/cargo_toml.rs
@@ -0,0 +1,12 @@
+mod cargo_toml_contents;
+mod cargo_toml_deps;
+mod cargo_toml_deps_raw;
+mod version_req;
+
+pub use cargo_toml_contents::{
+    change_from_base_to_adapter_path, CargoTomlContents, CARGO_TOML_DEPENDENCIES,
+    CARGO_TOML_DEV_DEPENDENCIES,
+};
+pub use cargo_toml_deps::{DependencyReference, GitCommitReference};
+pub use cargo_toml_deps_raw::DependencyRawValue;
+pub use version_req::VersionReq;
diff --git a/framework/meta-lib/src/cargo_toml_contents.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs
similarity index 57%
rename from framework/meta-lib/src/cargo_toml_contents.rs
rename to framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs
index 49721f5cec..e78092a844 100644
--- a/framework/meta-lib/src/cargo_toml_contents.rs
+++ b/framework/meta-lib/src/cargo_toml/cargo_toml_contents.rs
@@ -8,8 +8,12 @@ use toml::{value::Table, Value};
 
 use crate::contract::sc_config::ContractVariantProfile;
 
+use super::DependencyRawValue;
+
 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 AUTO_GENERATED: &str = "# Code generated by the multiversx-sc build system. DO NOT EDIT.
 
 # ##########################################
@@ -32,24 +36,26 @@ pub struct CargoTomlContents {
 }
 
 impl CargoTomlContents {
+    pub fn parse_string(raw_str: &str, path: &Path) -> Self {
+        let toml_value = raw_str.parse::<toml::Value>().unwrap_or_else(|e| {
+            panic!(
+                "failed to parse Cargo.toml toml format, path:{}, error: {e}",
+                path.display()
+            )
+        });
+        CargoTomlContents {
+            path: path.to_owned(),
+            toml_value,
+            prepend_auto_generated_comment: false,
+        }
+    }
+
     pub fn load_from_file<P: AsRef<Path>>(path: P) -> Self {
         let path_ref = path.as_ref();
         let cargo_toml_content = fs::read(path_ref).expect("failed to open Cargo.toml file");
         let cargo_toml_content_str =
             String::from_utf8(cargo_toml_content).expect("error decoding Cargo.toml utf-8");
-        let toml_value = cargo_toml_content_str
-            .parse::<toml::Value>()
-            .unwrap_or_else(|e| {
-                panic!(
-                    "failed to parse Cargo.toml toml format, path:{}, error: {e}",
-                    path_ref.display()
-                )
-            });
-        CargoTomlContents {
-            path: path_ref.to_owned(),
-            toml_value,
-            prepend_auto_generated_comment: false,
-        }
+        Self::parse_string(&cargo_toml_content_str, path_ref)
     }
 
     pub fn new() -> Self {
@@ -69,7 +75,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 +86,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")
@@ -89,27 +95,15 @@ impl CargoTomlContents {
             .to_string()
     }
 
-    pub fn dependency_version(&self, crate_name: &str) -> String {
-        let toml_value = self.dependency(crate_name).unwrap().to_owned();
-
-        if let Value::Table(table) = toml_value {
-            if let Some(version) = table.get("version") {
-                return remove_quotes(version);
-            }
-        }
-        panic!("could not find multiversx-sc dependency version in cargo toml")
+    /// Interprets the dependency value and organizes values in a struct.
+    pub fn dependency_raw_value(&self, crate_name: &str) -> Option<DependencyRawValue> {
+        self.dependency(crate_name)
+            .map(DependencyRawValue::parse_toml_value)
     }
 
-    pub fn dependency_path(&self, crate_name: &str) -> Option<String> {
-        let toml_value = self.dependency(crate_name).unwrap().to_owned();
-
-        if let Value::Table(table) = toml_value {
-            if let Some(path) = table.get("path") {
-                return Option::Some(remove_quotes(path));
-            }
-        }
-
-        Option::None
+    pub fn insert_dependency_raw_value(&mut self, crate_name: &str, raw_value: DependencyRawValue) {
+        self.dependencies_mut()
+            .insert(crate_name.to_owned(), raw_value.into_toml_value());
     }
 
     /// Assumes that a package section already exists.
@@ -148,8 +142,10 @@ impl CargoTomlContents {
 
     pub fn dependencies_mut(&mut self) -> &mut Table {
         self.toml_value
-            .get_mut(CARGO_TOML_DEPENDENCIES)
-            .unwrap_or_else(|| panic!("no dependencies found in crate {}", self.path.display()))
+            .as_table_mut()
+            .expect("add deps cargo toml error wasm adapter")
+            .entry(CARGO_TOML_DEPENDENCIES)
+            .or_insert(toml::Value::Table(toml::map::Map::new()))
             .as_table_mut()
             .expect("malformed crate Cargo.toml")
     }
@@ -158,6 +154,24 @@ impl CargoTomlContents {
         self.toml_value.get(CARGO_TOML_DEV_DEPENDENCIES).is_some()
     }
 
+    pub fn change_author(&mut self, authors: String) -> 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);
+
+        package.insert(
+            AUTHORS.to_owned(),
+            toml::Value::Array(vec![toml::Value::String(authors)]),
+        );
+
+        true
+    }
+
     pub fn dev_dependencies_mut(&mut self) -> &mut Table {
         self.toml_value
             .get_mut(CARGO_TOML_DEV_DEPENDENCIES)
@@ -268,7 +282,11 @@ impl CargoTomlContents {
         result
     }
 
-    pub fn change_features_for_parent_crate_dep(&mut self, features: &[String]) {
+    pub fn change_features_for_parent_crate_dep(
+        &mut self,
+        features: &[String],
+        default_features: Option<bool>,
+    ) {
         let deps_mut = self.dependencies_mut();
         for (_, dep) in deps_mut {
             if is_dep_path_above(dep) {
@@ -276,9 +294,14 @@ impl CargoTomlContents {
                     .iter()
                     .map(|feature| Value::String(feature.clone()))
                     .collect();
-                dep.as_table_mut()
-                    .expect("malformed crate Cargo.toml")
-                    .insert("features".to_string(), Value::Array(feature_values));
+                let deps_table = dep.as_table_mut().expect("malformed crate Cargo.toml");
+                deps_table.insert("features".to_string(), Value::Array(feature_values));
+                if let Some(default_features_value) = default_features {
+                    deps_table.insert(
+                        "default-features".to_string(),
+                        Value::Boolean(default_features_value),
+                    );
+                }
             }
         }
     }
@@ -312,11 +335,16 @@ pub fn change_from_base_to_adapter_path(base_path: &str) -> String {
     )
 }
 
+/// TODO: still useful?
+#[allow(unused)]
 fn remove_quotes(var: &Value) -> String {
     var.to_string().replace('\"', "")
 }
 
+#[cfg(test)]
 mod tests {
+    use super::*;
+    use crate::cargo_toml::{DependencyReference, GitCommitReference, VersionReq};
 
     #[test]
     fn test_change_from_base_to_adapter_path() {
@@ -327,4 +355,154 @@ mod tests {
             adapter_path
         );
     }
+
+    const CARGO_TOML_RAW: &str = r#"
+[dependencies.by-version-1]
+version = "1.2.30"
+
+[dependencies.by-version-1-strict]
+version = "=1.2.31"
+
+[dependencies.by-git-commit-1]
+git = "https://github.com/multiversx/repo1"
+rev = "85c31b9ce730bd5ffe41589c353d935a14baaa96"
+
+[dependencies.by-path-1]
+path = "a/b/c"
+
+[dependencies]
+by-version-2 = "4.5.60"
+by-version-2-strict = "=4.5.61"
+by-path-2 = { path = "d/e/f" }
+by-git-commit-2 = { git = "https://github.com/multiversx/repo2", rev = "e990be823f26d1e7f59c71536d337b7240dc3fa2" }
+    "#;
+
+    #[test]
+    fn test_dependency_value() {
+        let cargo_toml = CargoTomlContents::parse_string(CARGO_TOML_RAW, "/test".as_ref());
+
+        // version
+        let raw_value = cargo_toml.dependency_raw_value("by-version-1").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                version: Some("1.2.30".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Version(VersionReq::from_version_str("1.2.30")),
+        );
+
+        // version, strict
+        let raw_value = cargo_toml
+            .dependency_raw_value("by-version-1-strict")
+            .unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                version: Some("=1.2.31".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Version(VersionReq::from_version_str("1.2.31").strict()),
+        );
+
+        // version, compact
+        let raw_value = cargo_toml.dependency_raw_value("by-version-2").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                version: Some("4.5.60".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Version(VersionReq::from_version_str("4.5.60")),
+        );
+
+        // version, compact, strict
+        let raw_value = cargo_toml
+            .dependency_raw_value("by-version-2-strict")
+            .unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                version: Some("=4.5.61".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Version(VersionReq::from_version_str("4.5.61").strict()),
+        );
+
+        // git
+        let raw_value = cargo_toml.dependency_raw_value("by-git-commit-1").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                git: Some("https://github.com/multiversx/repo1".to_owned()),
+                rev: Some("85c31b9ce730bd5ffe41589c353d935a14baaa96".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::GitCommit(GitCommitReference {
+                git: "https://github.com/multiversx/repo1".to_owned(),
+                rev: "85c31b9ce730bd5ffe41589c353d935a14baaa96".to_owned(),
+            })
+        );
+
+        // git, compact
+        let raw_value = cargo_toml.dependency_raw_value("by-git-commit-2").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                git: Some("https://github.com/multiversx/repo2".to_owned()),
+                rev: Some("e990be823f26d1e7f59c71536d337b7240dc3fa2".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::GitCommit(GitCommitReference {
+                git: "https://github.com/multiversx/repo2".to_owned(),
+                rev: "e990be823f26d1e7f59c71536d337b7240dc3fa2".to_owned(),
+            })
+        );
+
+        // path
+        let raw_value = cargo_toml.dependency_raw_value("by-path-1").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                path: Some("a/b/c".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Path("a/b/c".to_owned()),
+        );
+
+        // path, compact
+        let raw_value = cargo_toml.dependency_raw_value("by-path-2").unwrap();
+        assert_eq!(
+            raw_value,
+            DependencyRawValue {
+                path: Some("d/e/f".to_owned()),
+                ..Default::default()
+            },
+        );
+        assert_eq!(
+            raw_value.interpret(),
+            DependencyReference::Path("d/e/f".to_owned()),
+        );
+    }
 }
diff --git a/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs
new file mode 100644
index 0000000000..442ad6edb9
--- /dev/null
+++ b/framework/meta-lib/src/cargo_toml/cargo_toml_deps.rs
@@ -0,0 +1,85 @@
+use crate::version::FrameworkVersion;
+
+use super::{DependencyRawValue, VersionReq};
+
+/// A dependency reference to a git commit. We mostly use git commits when referencing git.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct GitCommitReference {
+    pub git: String,
+    pub rev: String,
+}
+
+/// A dependency reference to a git branch.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct GitBranchReference {
+    pub git: String,
+    pub branch: String,
+}
+
+/// A dependency reference to a git tag.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct GitTagReference {
+    pub git: String,
+    pub tag: String,
+}
+
+/// Models how a dependency is expressed in Cargo.toml.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum DependencyReference {
+    Version(VersionReq),
+    GitCommit(GitCommitReference),
+    GitBranch(GitBranchReference),
+    GitTag(GitTagReference),
+    Path(String),
+    Unsupported(&'static str),
+}
+
+impl DependencyReference {
+    pub fn is_framework_version(&self, version: &FrameworkVersion) -> bool {
+        if let DependencyReference::Version(version_req) = self {
+            &version_req.semver == version
+        } else {
+            false
+        }
+    }
+}
+
+impl DependencyRawValue {
+    /// Interprets the raw dependency value as one of several possible formats.
+    pub fn interpret(self) -> DependencyReference {
+        // path is top priority
+        if let Some(path) = self.path {
+            return DependencyReference::Path(path);
+        }
+
+        if let Some(git) = self.git {
+            return match (self.rev, self.branch, self.tag) {
+                (Some(rev), None, None) => {
+                    DependencyReference::GitCommit(GitCommitReference { git, rev })
+                },
+                (None, Some(branch), None) => {
+                    DependencyReference::GitBranch(GitBranchReference { git, branch })
+                },
+
+                (None, None, Some(tag)) => {
+                    DependencyReference::GitTag(GitTagReference { git, tag })
+                },
+
+                (None, None, None) => DependencyReference::Unsupported(
+                    "need at least one of: git commit, git brach, or git tag",
+                ),
+                _ => DependencyReference::Unsupported(
+                    "can only have one of: git commit, git brach, or git tag",
+                ),
+            };
+        }
+
+        // explicit version = "..."
+        // handled last, because it has the lowest priority, both path and git fields override it
+        if let Some(version) = self.version {
+            return DependencyReference::Version(VersionReq::from_version_str(&version));
+        }
+
+        DependencyReference::Unsupported("expected at least one of: version, git, path")
+    }
+}
diff --git a/framework/meta-lib/src/cargo_toml/cargo_toml_deps_raw.rs b/framework/meta-lib/src/cargo_toml/cargo_toml_deps_raw.rs
new file mode 100644
index 0000000000..6d7a581a88
--- /dev/null
+++ b/framework/meta-lib/src/cargo_toml/cargo_toml_deps_raw.rs
@@ -0,0 +1,77 @@
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
+pub struct DependencyRawValue {
+    pub version: Option<String>,
+    pub git: Option<String>,
+    pub rev: Option<String>,
+    pub branch: Option<String>,
+    pub tag: Option<String>,
+    pub path: Option<String>,
+}
+
+impl DependencyRawValue {
+    pub fn from_version(version: &str) -> Self {
+        Self {
+            version: Some(version.to_owned()),
+            ..Default::default()
+        }
+    }
+
+    pub fn parse_toml_value(toml_value: &toml::Value) -> Self {
+        match toml_value {
+            toml::Value::String(version) => DependencyRawValue::from_version(version),
+            toml::Value::Table(table) => {
+                let mut result = DependencyRawValue::default();
+                if let Some(toml::Value::String(version)) = table.get("version") {
+                    result.version = Some(version.to_owned());
+                }
+                if let Some(toml::Value::String(path)) = table.get("path") {
+                    result.path = Some(path.to_owned());
+                }
+                if let Some(toml::Value::String(git)) = table.get("git") {
+                    result.git = Some(git.to_owned());
+                }
+                if let Some(toml::Value::String(rev)) = table.get("rev") {
+                    result.rev = Some(rev.to_owned());
+                }
+                if let Some(toml::Value::String(branch)) = table.get("branch") {
+                    result.branch = Some(branch.to_owned());
+                }
+                if let Some(toml::Value::String(tag)) = table.get("tag") {
+                    result.tag = Some(tag.to_owned());
+                }
+                result
+            },
+            _ => panic!("Unsupported dependency value"),
+        }
+    }
+
+    pub fn into_toml_value(self) -> toml::Value {
+        let mut table = toml::map::Map::new();
+
+        if let Some(version) = self.version {
+            table.insert("version".to_string(), toml::Value::String(version));
+        }
+
+        if let Some(git) = self.git {
+            table.insert("git".to_string(), toml::Value::String(git));
+        }
+
+        if let Some(rev) = self.rev {
+            table.insert("rev".to_string(), toml::Value::String(rev));
+        }
+
+        if let Some(branch) = self.branch {
+            table.insert("branch".to_string(), toml::Value::String(branch));
+        }
+
+        if let Some(tag) = self.tag {
+            table.insert("tag".to_string(), toml::Value::String(tag));
+        }
+
+        if let Some(path) = self.path {
+            table.insert("path".to_string(), toml::Value::String(path));
+        }
+
+        toml::Value::Table(table)
+    }
+}
diff --git a/framework/meta/src/folder_structure/version_req.rs b/framework/meta-lib/src/cargo_toml/version_req.rs
similarity index 75%
rename from framework/meta/src/folder_structure/version_req.rs
rename to framework/meta-lib/src/cargo_toml/version_req.rs
index bbfa752a12..1e834dade5 100644
--- a/framework/meta/src/folder_structure/version_req.rs
+++ b/framework/meta-lib/src/cargo_toml/version_req.rs
@@ -6,13 +6,13 @@ use crate::{
 /// Crate version requirements, as expressed in Cargo.toml. A very crude version.
 ///
 /// TODO: replace with semver::VersionReq at some point.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct VersionReq {
     pub semver: FrameworkVersion,
     pub is_strict: bool,
 }
 impl VersionReq {
-    pub fn from_string(raw: String) -> Self {
+    pub fn from_version_str(raw: &str) -> Self {
         if let Some(stripped_version) = raw.strip_prefix('=') {
             VersionReq {
                 semver: find_version_by_str(stripped_version)
@@ -22,12 +22,19 @@ impl VersionReq {
             }
         } else {
             VersionReq {
-                semver: find_version_by_str(&raw).unwrap_or(&LAST_VERSION).clone(),
+                semver: find_version_by_str(raw).unwrap_or(&LAST_VERSION).clone(),
                 is_strict: false,
             }
         }
     }
 
+    pub fn strict(self) -> Self {
+        Self {
+            semver: self.semver,
+            is_strict: true,
+        }
+    }
+
     pub fn into_string(self) -> String {
         if self.is_strict {
             format!("={}", self.semver)
diff --git a/framework/meta-lib/src/code_report_json.rs b/framework/meta-lib/src/code_report_json.rs
index a0b997bb6e..b1ec390436 100644
--- a/framework/meta-lib/src/code_report_json.rs
+++ b/framework/meta-lib/src/code_report_json.rs
@@ -24,7 +24,7 @@ impl CodeReportJson {
             path: report.path.clone(),
             size,
             has_allocator: report.has_allocator,
-            has_panic: report.has_panic.clone(),
+            has_panic: report.has_panic.to_string(),
         }
     }
 }
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..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
@@ -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);
         }
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 0b9d9485e1..d92ec69aeb 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
@@ -8,6 +8,8 @@ use crate::version_history;
 
 static SNIPPETS_SOURCE_FILE_NAME: &str = "interactor_main.rs";
 static SC_CONFIG_PATH: &str = "../sc-config.toml";
+static CONFIG_TOML_PATH: &str = "config.toml";
+static CONFIG_SOURCE_FILE_NAME: &str = "config.rs";
 static FULL_PROXY_ENTRY: &str = r#"[[proxy]]
 path = "interactor/src/proxy.rs"
  "#;
@@ -89,7 +91,9 @@ clap = {{ version = "4.4.7", features = ["derive"] }}
 serde = {{ version = "1.0", features = ["derive"] }}
 toml = "0.8.6"
 
-# [workspace]
+# uncomment when using chain simulator
+# [features]
+# chain-simulator-tests = []
 "#
     )
     .unwrap();
@@ -144,6 +148,29 @@ pub(crate) fn create_sc_config_file(overwrite: bool) {
     writeln!(&mut file, "\n{FULL_PROXY_ENTRY}").unwrap();
 }
 
+pub(crate) fn create_config_toml_file(snippets_folder_path: &str) {
+    let config_path = format!("{snippets_folder_path}/{CONFIG_TOML_PATH}");
+    let mut file = File::create(config_path).unwrap();
+
+    writeln!(
+        &mut file,
+        r#"
+# chain_type = 'simulator'
+# gateway_uri = 'http://localhost:8085'
+
+chain_type = 'real'
+gateway_uri = 'https://devnet-gateway.multiversx.com'
+"#
+    )
+    .unwrap();
+}
+
+pub(crate) fn create_config_rust_file(snippets_folder_path: &str) -> File {
+    let lib_path = format!("{snippets_folder_path}/src/{CONFIG_SOURCE_FILE_NAME}");
+
+    File::create(lib_path).unwrap()
+}
+
 fn file_exists(path: &str) -> bool {
     fs::metadata(path).is_ok()
 }
diff --git a/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs b/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
index 919420f485..c566dd49b6 100644
--- a/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
+++ b/framework/meta-lib/src/contract/generate_snippets/snippet_gen_main.rs
@@ -7,13 +7,16 @@ use crate::cli::GenerateSnippetsArgs;
 use super::{
     super::meta_config::MetaConfig,
     snippet_crate_gen::{
-        create_and_get_lib_file, create_sc_config_file, create_snippets_cargo_toml,
-        create_snippets_folder, create_snippets_gitignore, create_src_folder,
+        create_and_get_lib_file, create_config_rust_file, create_config_toml_file,
+        create_sc_config_file, create_snippets_cargo_toml, create_snippets_folder,
+        create_snippets_gitignore, create_src_folder,
     },
     snippet_sc_functions_gen::write_interact_struct_impl,
     snippet_template_gen::{
-        write_interact_struct_declaration, write_snippet_constants, write_snippet_imports,
-        write_snippet_main_function, write_snippet_state_impl, write_state_struct_declaration,
+        write_config_constants, write_config_imports, write_config_struct_declaration,
+        write_config_struct_impl, write_interact_struct_declaration, write_snippet_constants,
+        write_snippet_imports, write_snippet_main_function, write_snippet_state_impl,
+        write_state_struct_declaration,
     },
 };
 
@@ -21,14 +24,11 @@ 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 wasm_output_file_path_expr = format!("\"mxsc:../output/{crate_name}.mxsc.json\"");
-        let file =
+        let mut file =
             create_snippets_crate_and_get_lib_file(&self.snippets_dir, crate_name, args.overwrite);
-        write_snippets_to_file(
-            file,
-            &self.original_contract_abi,
-            &wasm_output_file_path_expr,
-        );
+        write_snippets_to_file(&mut file, &self.original_contract_abi, crate_name);
+        let mut config_file = create_config_and_get_file(&self.snippets_dir);
+        write_config_to_file(&mut config_file);
     }
 }
 
@@ -46,12 +46,25 @@ fn create_snippets_crate_and_get_lib_file(
     create_and_get_lib_file(snippets_folder_path, overwrite)
 }
 
-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_snippet_main_function(&mut file, abi);
-    write_state_struct_declaration(&mut file);
-    write_snippet_state_impl(&mut file);
-    write_interact_struct_declaration(&mut file);
-    write_interact_struct_impl(&mut file, abi, wasm_output_file_path_expr);
+#[must_use]
+fn create_config_and_get_file(snippets_folder_path: &str) -> File {
+    create_config_toml_file(snippets_folder_path);
+    create_config_rust_file(snippets_folder_path)
+}
+
+fn write_snippets_to_file(file: &mut File, abi: &ContractAbi, crate_name: &str) {
+    write_snippet_imports(file);
+    write_snippet_constants(file);
+    write_snippet_main_function(file, abi);
+    write_state_struct_declaration(file);
+    write_snippet_state_impl(file);
+    write_interact_struct_declaration(file);
+    write_interact_struct_impl(file, abi, crate_name);
+}
+
+fn write_config_to_file(file: &mut File) {
+    write_config_imports(file);
+    write_config_constants(file);
+    write_config_struct_declaration(file);
+    write_config_struct_impl(file);
 }
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 d450decd82..b5789c9645 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
@@ -6,17 +6,18 @@ use super::{snippet_gen_common::write_newline, snippet_type_map::map_abi_type_to
 
 const DEFAULT_GAS: &str = "30_000_000u64";
 
-pub(crate) fn write_interact_struct_impl(
-    file: &mut File,
-    abi: &ContractAbi,
-    wasm_output_file_path_expr: &str,
-) {
+pub(crate) fn write_interact_struct_impl(file: &mut File, abi: &ContractAbi, crate_name: &str) {
+    let wasm_output_file_path_expr = format!("\"mxsc:../output/{crate_name}.mxsc.json\"");
+
     writeln!(
         file,
         r#"impl ContractInteract {{
     async fn new() -> Self {{
-        let mut interactor = Interactor::new(GATEWAY).await;
-        let wallet_address = interactor.register_wallet(test_wallets::alice());
+        let config = Config::new();
+        let mut interactor = Interactor::new(config.gateway_uri(), config.use_chain_simulator()).await;
+        interactor.set_current_dir_from_workspace("{}");
+
+        let wallet_address = interactor.register_wallet(test_wallets::alice()).await;
         
         let contract_code = BytesValue::interpret_from(
             {},
@@ -31,10 +32,9 @@ pub(crate) fn write_interact_struct_impl(
         }}
     }}
 "#,
-        wasm_output_file_path_expr,
+        crate_name, wasm_output_file_path_expr,
     )
     .unwrap();
-
     write_deploy_method_impl(file, &abi.constructors[0], &abi.name);
 
     for upgrade_abi in &abi.upgrade_constructors {
@@ -65,7 +65,7 @@ fn write_deploy_method_impl(file: &mut File, init_abi: &EndpointAbi, name: &Stri
             .init({})
             .code(&self.contract_code)
             .returns(ReturnsNewAddress)
-            .prepare_async()
+            
             .run()
             .await;
         let new_address_bech32 = bech32::encode(&new_address);
@@ -101,7 +101,7 @@ fn write_upgrade_endpoint_impl(file: &mut File, upgrade_abi: &EndpointAbi, name:
             .code(&self.contract_code)
             .code_metadata(CodeMetadata::UPGRADEABLE)
             .returns(ReturnsNewAddress)
-            .prepare_async()
+            
             .run()
             .await;
 
@@ -214,7 +214,7 @@ fn write_contract_call(file: &mut File, endpoint_abi: &EndpointAbi, name: &Strin
             .typed(proxy::{}Proxy)
             .{}({}){}
             .returns(ReturnsResultUnmanaged)
-            .prepare_async()
+            
             .run()
             .await;
 
@@ -237,7 +237,7 @@ fn write_contract_query(file: &mut File, endpoint_abi: &EndpointAbi, name: &Stri
             .typed(proxy::{}Proxy)
             .{}({})
             .returns(ReturnsResultUnmanaged)
-            .prepare_async()
+            
             .run()
             .await;
 
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 a7e7a41f1d..95ecbd64df 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
@@ -10,9 +10,10 @@ pub(crate) fn write_snippet_imports(file: &mut File) {
         "#![allow(non_snake_case)]
 
 mod proxy;
+mod config;
 
+use config::Config;
 use multiversx_sc_snippets::imports::*;
-use multiversx_sc_snippets::sdk;
 use serde::{{Deserialize, Serialize}};
 use std::{{
     io::{{Read, Write}},
@@ -26,13 +27,7 @@ use std::{{
 }
 
 pub(crate) fn write_snippet_constants(file: &mut File) {
-    writeln!(
-        file,
-        "const GATEWAY: &str = sdk::gateway::DEVNET_GATEWAY;
-const STATE_FILE: &str = \"state.toml\";
-"
-    )
-    .unwrap();
+    writeln!(file, "const STATE_FILE: &str = \"state.toml\";").unwrap();
 
     write_newline(file);
 }
@@ -156,3 +151,91 @@ pub(crate) fn write_snippet_state_impl(file: &mut File) {
 
     write_newline(file);
 }
+
+pub(crate) fn write_config_imports(file: &mut File) {
+    writeln!(
+        file,
+        "#![allow(unused)]
+
+use serde::Deserialize;
+use std::io::Read;
+"
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+pub(crate) fn write_config_constants(file: &mut File) {
+    writeln!(
+        file,
+        "/// Config file
+const CONFIG_FILE: &str = \"config.toml\";
+"
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+pub(crate) fn write_config_struct_declaration(file: &mut File) {
+    writeln!(
+        file,
+        r#"#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {{
+    Real,
+    Simulator,
+    }}
+
+/// Contract Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {{
+    pub gateway_uri: String,
+    pub chain_type: ChainType,
+    }}
+"#
+    )
+    .unwrap();
+
+    write_newline(file);
+}
+
+pub(crate) fn write_config_struct_impl(file: &mut File) {
+    writeln!(
+        file,
+        r#"impl Config {{
+    // Deserializes config from file
+    pub fn new() -> 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()
+    }}
+
+    pub fn chain_simulator_config() -> Self {{
+        Config {{
+            gateway_uri: "http://localhost:8085".to_owned(),
+            chain_type: ChainType::Simulator,
+    }}
+    }}
+
+    // Returns the gateway URI
+    pub fn gateway_uri(&self) -> &str {{
+        &self.gateway_uri
+    }}
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {{
+        match self.chain_type {{
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+    }}
+    }}
+    }}
+"#
+    )
+    .unwrap();
+
+    write_newline(file);
+}
diff --git a/framework/meta-lib/src/contract/meta_config.rs b/framework/meta-lib/src/contract/meta_config.rs
index b69a11a16a..3ed6495f53 100644
--- a/framework/meta-lib/src/contract/meta_config.rs
+++ b/framework/meta-lib/src/contract/meta_config.rs
@@ -3,7 +3,7 @@ use std::fs;
 use multiversx_sc::abi::ContractAbi;
 
 use crate::{
-    cargo_toml_contents::CargoTomlContents, cli::BuildArgs, print_util::print_workspace_target_dir,
+    cargo_toml::CargoTomlContents, cli::BuildArgs, print_util::print_workspace_target_dir,
     tools::check_tools_installed, tools::find_current_workspace,
 };
 
@@ -70,9 +70,11 @@ impl MetaConfig {
                 name: contract.wasm_crate_name.clone(),
                 edition: main_cargo_toml_contents.package_edition(),
                 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),
+                framework_dependency: main_cargo_toml_contents
+                    .dependency_raw_value(FRAMEWORK_NAME_BASE)
+                    .expect("missing framework dependency in Cargo.toml"),
                 contract_features: contract.settings.features.clone(),
+                contract_default_features: contract.settings.default_features,
             };
             generate_wasm_cargo_toml(&cargo_toml_data, crate_name.as_str())
                 .save_to_file(contract.cargo_toml_path());
@@ -179,7 +181,7 @@ fn copy_to_wasm_unmanaged_ei() {
 
 #[cfg(test)]
 mod tests {
-    use crate::contract::sc_config::ContractVariantProfile;
+    use crate::{cargo_toml::DependencyRawValue, contract::sc_config::ContractVariantProfile};
 
     const EXPECTED_CARGO_TOML_CONTENTS: &str =
         "# Code generated by the multiversx-sc build system. DO NOT EDIT.
@@ -225,9 +227,13 @@ members = [\".\"]
             name: "test".to_string(),
             edition: "2021".to_string(),
             profile: ContractVariantProfile::default(),
-            framework_version: "x.y.z".to_string(),
-            framework_path: Option::Some("../../../framework/base".to_string()),
+            framework_dependency: DependencyRawValue {
+                version: Some("x.y.z".to_owned()),
+                path: Option::Some("../../../framework/base".to_owned()),
+                ..Default::default()
+            },
             contract_features: Vec::<String>::new(),
+            contract_default_features: None,
         };
         let crate_name = "test-crate-name".to_string();
         let generated_contents =
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 8bf9793f39..6564bdea65 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
@@ -78,6 +78,7 @@ impl ContractVariantBuilder {
                     allocator: parse_allocator(&cms.allocator),
                     stack_size: parse_stack_size(&cms.stack_size),
                     features: cms.features.clone(),
+                    default_features: cms.default_features,
                     kill_legacy_callback: cms.kill_legacy_callback,
                     profile: ContractVariantProfile::from_serde(&cms.profile),
                 },
diff --git a/framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs b/framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs
index b0af57deef..660604bd37 100644
--- a/framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs
+++ b/framework/meta-lib/src/contract/sc_config/contract_variant_settings.rs
@@ -29,6 +29,9 @@ pub struct ContractVariantSettings {
     /// Features that are activated on the contract crate, from wasm.
     pub features: Vec<String>,
 
+    /// Allows disabling default features in the contract crate, from wasm.
+    pub default_features: Option<bool>,
+
     /// Forcibly remove the original contrct legacy callback.
     pub kill_legacy_callback: bool,
 
@@ -44,6 +47,7 @@ impl Default for ContractVariantSettings {
             allocator: Default::default(),
             stack_size: DEFAULT_STACK_SIZE,
             features: Default::default(),
+            default_features: None,
             kill_legacy_callback: false,
             profile: Default::default(),
         }
diff --git a/framework/meta-lib/src/contract/sc_config/sc_config_serde.rs b/framework/meta-lib/src/contract/sc_config/sc_config_serde.rs
index c3c6b94d30..fbe4543e5a 100644
--- a/framework/meta-lib/src/contract/sc_config/sc_config_serde.rs
+++ b/framework/meta-lib/src/contract/sc_config/sc_config_serde.rs
@@ -55,6 +55,10 @@ pub struct ContractVariantSerde {
     #[serde(default)]
     pub features: Vec<String>,
 
+    #[serde(default)]
+    #[serde(rename = "default-features")]
+    pub default_features: Option<bool>,
+
     #[serde(default)]
     pub kill_legacy_callback: bool,
 
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 5b318da9a0..17312dbb04 100644
--- a/framework/meta-lib/src/contract/sc_config/wasm_build.rs
+++ b/framework/meta-lib/src/contract/sc_config/wasm_build.rs
@@ -130,13 +130,21 @@ impl ContractVariant {
     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));
 
+        let abi = ContractAbiJson::from(&self.abi);
+        let mut view_endpoints: Vec<&str> = Vec::new();
+        for endpoint in &abi.endpoints {
+            if let crate::abi_json::EndpointMutabilityAbiJson::Readonly = endpoint.mutability {
+                view_endpoints.push(&endpoint.name);
+            }
+        }
+
         if !build_args.extract_imports {
             return WasmInfo::extract_wasm_info(
                 &output_wasm_path,
                 build_args.extract_imports,
                 &self.settings.check_ei,
-            )
-            .expect("error occured while extracting imports from .wasm ");
+                view_endpoints,
+            );
         }
 
         let output_imports_json_path = format!(
@@ -146,9 +154,12 @@ impl ContractVariant {
         );
         print_extract_imports(&output_imports_json_path);
 
-        let wasm_data =
-            WasmInfo::extract_wasm_info(&output_wasm_path, true, &self.settings.check_ei)
-                .expect("error occured while extracting imports from .wasm ");
+        let wasm_data = WasmInfo::extract_wasm_info(
+            &output_wasm_path,
+            true,
+            &self.settings.check_ei,
+            view_endpoints,
+        );
 
         write_imports_output(
             output_imports_json_path.as_str(),
diff --git a/framework/meta-lib/src/contract/wasm_cargo_toml_data.rs b/framework/meta-lib/src/contract/wasm_cargo_toml_data.rs
index 0cfaa89f8a..66f48d8e4a 100644
--- a/framework/meta-lib/src/contract/wasm_cargo_toml_data.rs
+++ b/framework/meta-lib/src/contract/wasm_cargo_toml_data.rs
@@ -1,3 +1,5 @@
+use crate::cargo_toml::DependencyRawValue;
+
 use super::sc_config::ContractVariantProfile;
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
@@ -5,7 +7,7 @@ pub struct WasmCargoTomlData {
     pub name: String,
     pub edition: String,
     pub profile: ContractVariantProfile,
-    pub framework_version: String,
-    pub framework_path: Option<String>,
+    pub framework_dependency: DependencyRawValue,
     pub contract_features: Vec<String>,
+    pub contract_default_features: Option<bool>,
 }
diff --git a/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
index 90b33229be..598ea44ca4 100644
--- a/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
+++ b/framework/meta-lib/src/contract/wasm_cargo_toml_generate.rs
@@ -1,7 +1,5 @@
 use super::wasm_cargo_toml_data::WasmCargoTomlData;
-use crate::{
-    cargo_toml_contents::change_from_base_to_adapter_path, cargo_toml_contents::CargoTomlContents,
-};
+use crate::cargo_toml::{change_from_base_to_adapter_path, CargoTomlContents, DependencyRawValue};
 
 const WASM_ADAPTER: &str = "multiversx-sc-wasm-adapter";
 const CDYLIB_CRATE_TYPE: &str = "cdylib";
@@ -33,14 +31,15 @@ pub fn generate_wasm_cargo_toml(
     add_wasm_crate_deps(
         &mut new_cargo,
         crate_name,
-        cargo_toml_data.framework_version.as_str(),
-        &cargo_toml_data.framework_path,
+        &cargo_toml_data.framework_dependency,
     );
 
     //check features
     if !cargo_toml_data.contract_features.is_empty() {
-        new_cargo
-            .change_features_for_parent_crate_dep(cargo_toml_data.contract_features.as_slice());
+        new_cargo.change_features_for_parent_crate_dep(
+            cargo_toml_data.contract_features.as_slice(),
+            cargo_toml_data.contract_default_features,
+        );
     }
 
     //insert default workspace
@@ -52,41 +51,20 @@ pub fn generate_wasm_cargo_toml(
 fn add_wasm_crate_deps(
     cargo_toml_contents: &mut CargoTomlContents,
     crate_name: &str,
-    adapter_version: &str,
-    adapter_path: &Option<String>,
+    framework_dependency: &DependencyRawValue,
 ) {
-    let mut crate_deps = toml::map::Map::new();
-    crate_deps.insert("path".to_string(), toml::Value::String("..".to_string()));
-
-    let mut adapter_deps = toml::map::Map::new();
-    adapter_deps.insert(
-        "version".to_string(),
-        toml::Value::String(adapter_version.to_string()),
-    );
-
-    if adapter_path.is_some() {
-        adapter_deps.insert(
-            "path".to_string(),
-            toml::Value::String(change_from_base_to_adapter_path(
-                adapter_path.to_owned().unwrap().as_str(),
-            )),
-        );
+    let mut wasm_adapter_dep = framework_dependency.clone();
+    if let Some(path) = &mut wasm_adapter_dep.path {
+        *path = change_from_base_to_adapter_path(path);
     }
 
-    let mut toml_table_adapter = toml::map::Map::new();
-    toml_table_adapter.insert(WASM_ADAPTER.to_string(), toml::Value::Table(adapter_deps));
-
-    let mut toml_table_crate = toml::map::Map::new();
-    toml_table_crate.insert(crate_name.to_string(), toml::Value::Table(crate_deps));
-
-    toml_table_crate.extend(toml_table_adapter);
+    cargo_toml_contents.insert_dependency_raw_value(
+        crate_name,
+        DependencyRawValue {
+            path: Some("..".to_owned()),
+            ..Default::default()
+        },
+    );
 
-    cargo_toml_contents
-        .toml_value
-        .as_table_mut()
-        .expect("add deps cargo toml error wasm adapter")
-        .insert(
-            "dependencies".to_string(),
-            toml::Value::Table(toml_table_crate),
-        );
+    cargo_toml_contents.insert_dependency_raw_value(WASM_ADAPTER, wasm_adapter_dep);
 }
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/src/lib.rs b/framework/meta-lib/src/lib.rs
index e33c2cfb7b..b01cb48139 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 cargo_toml;
 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-lib/src/tools.rs b/framework/meta-lib/src/tools.rs
index e0a8962d9b..9437133224 100644
--- a/framework/meta-lib/src/tools.rs
+++ b/framework/meta-lib/src/tools.rs
@@ -1,8 +1,10 @@
 mod find_workspace;
 mod git_describe;
+pub(crate) mod panic_report;
 pub(crate) mod report_creator;
 pub mod twiggy;
 mod wasm_extractor;
+mod wasm_extractor_test;
 mod wasm_opt;
 mod wasm_to_wat;
 
diff --git a/framework/meta-lib/src/tools/panic_report.rs b/framework/meta-lib/src/tools/panic_report.rs
new file mode 100644
index 0000000000..84ad687447
--- /dev/null
+++ b/framework/meta-lib/src/tools/panic_report.rs
@@ -0,0 +1,79 @@
+use std::fmt::Display;
+
+use wasmparser::DataSectionReader;
+const PANIC_WITH_MESSAGE: &[u8; 16] = b"panic occurred: ";
+const PANIC_WITHOUT_MESSAGE: &[u8; 14] = b"panic occurred";
+
+#[derive(Default, PartialEq, Clone)]
+pub enum PanicReport {
+    #[default]
+    None,
+    WithoutMessage,
+    WithMessage,
+}
+
+impl Display for PanicReport {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let panic_status = match self {
+            PanicReport::None => "None",
+            PanicReport::WithoutMessage => "without message",
+            PanicReport::WithMessage => "with message",
+        };
+        write!(f, "{}", panic_status)
+    }
+}
+
+impl PanicReport {
+    pub fn data_section_severity(&self, data_section: DataSectionReader) -> Self {
+        if is_panic_with_message_triggered(data_section.clone()) {
+            return Self::WithMessage;
+        }
+
+        if is_panic_without_message_triggered(data_section) {
+            return Self::WithoutMessage;
+        }
+
+        Self::None
+    }
+
+    pub fn max_severity(&mut self, data_section: DataSectionReader) {
+        if *self == PanicReport::WithMessage {
+            return;
+        }
+
+        let panic_report = self.data_section_severity(data_section);
+        if panic_report == PanicReport::None {
+            return;
+        }
+
+        *self = panic_report;
+    }
+}
+
+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
+}
diff --git a/framework/meta-lib/src/tools/report_creator.rs b/framework/meta-lib/src/tools/report_creator.rs
index 37af10fa4e..c45739c594 100644
--- a/framework/meta-lib/src/tools/report_creator.rs
+++ b/framework/meta-lib/src/tools/report_creator.rs
@@ -1,10 +1,19 @@
-pub const WITH_MESSAGE: &str = "with message";
-pub const WITHOUT_MESSAGE: &str = "without message";
+use super::panic_report::PanicReport;
 
 pub struct ReportCreator {
     pub path: String,
     pub has_allocator: bool,
-    pub has_panic: String,
+    pub has_panic: PanicReport,
 }
 
 impl ReportCreator {}
+
+impl Default for ReportCreator {
+    fn default() -> Self {
+        ReportCreator {
+            path: String::new(),
+            has_allocator: false,
+            has_panic: PanicReport::None,
+        }
+    }
+}
diff --git a/framework/meta-lib/src/tools/wasm_extractor.rs b/framework/meta-lib/src/tools/wasm_extractor.rs
index 50d5b78aff..eba84b4ada 100644
--- a/framework/meta-lib/src/tools/wasm_extractor.rs
+++ b/framework/meta-lib/src/tools/wasm_extractor.rs
@@ -1,24 +1,38 @@
 use colored::Colorize;
-use std::fs;
+use std::{
+    collections::{HashMap, HashSet},
+    fs,
+};
 use wasmparser::{
-    BinaryReaderError, DataSectionReader, FunctionBody, ImportSectionReader, Parser, Payload,
+    BinaryReaderError, DataSectionReader, ExportSectionReader, FunctionBody, ImportSectionReader,
+    Operator, Parser, Payload,
 };
 
 use crate::ei::EIVersion;
 
-use super::report_creator::{ReportCreator, WITHOUT_MESSAGE, WITH_MESSAGE};
+use super::report_creator::ReportCreator;
+
+type CallGraph = HashMap<usize, HashSet<usize>>;
 
-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;
+const WRITE_OP: &[&str] = &[
+    "mBufferStorageStore",
+    "storageStore",
+    "int64storageStore",
+    "bigIntStorageStoreUnsigned",
+    "smallIntStorageStoreUnsigned",
+    "smallIntStorageStoreSigned",
+];
 
+#[derive(Default)]
 pub struct WasmInfo {
     pub imports: Vec<String>,
     pub ei_check: bool,
     pub memory_grow_flag: bool,
-    pub has_format: bool,
     pub report: ReportCreator,
+    pub call_graph: CallGraph,
+    pub write_index_functions: HashSet<usize>,
+    pub view_endpoints: HashMap<String, usize>,
 }
 
 impl WasmInfo {
@@ -26,65 +40,146 @@ impl WasmInfo {
         output_wasm_path: &str,
         extract_imports_enabled: bool,
         check_ei: &Option<EIVersion>,
-    ) -> Result<WasmInfo, BinaryReaderError> {
+        view_endpoints: Vec<&str>,
+    ) -> WasmInfo {
         let wasm_data = fs::read(output_wasm_path)
             .expect("error occured while extracting information from .wasm: file not found");
 
-        populate_wasm_info(
+        let wasm_info = populate_wasm_info(
             output_wasm_path.to_string(),
             wasm_data,
             extract_imports_enabled,
             check_ei,
-        )
+            view_endpoints,
+        );
+
+        wasm_info.expect("error occured while extracting information from .wasm file")
+    }
+
+    fn create_call_graph(&mut self, body: FunctionBody) {
+        let mut instructions_reader = body
+            .get_operators_reader()
+            .expect("Failed to get operators reader");
+
+        let mut call_functions = HashSet::new();
+        while let Ok(op) = instructions_reader.read() {
+            if let Operator::Call { function_index } = op {
+                let function_usize: usize = function_index.try_into().unwrap();
+                call_functions.insert(function_usize);
+            }
+        }
+
+        self.call_graph
+            .insert(self.call_graph.len(), call_functions);
+    }
+
+    pub fn process_imports(
+        &mut self,
+        import_section: ImportSectionReader,
+        import_extraction_enabled: bool,
+    ) {
+        for (index, import) in import_section.into_iter().flatten().enumerate() {
+            if import_extraction_enabled {
+                self.imports.push(import.name.to_string());
+            }
+            self.call_graph.insert(index, HashSet::new());
+            if WRITE_OP.contains(&import.name) {
+                self.write_index_functions.insert(index);
+            }
+        }
+
+        self.imports.sort();
+    }
+
+    pub fn detect_write_operations_in_views(&mut self) {
+        let mut visited: HashSet<usize> = HashSet::new();
+        for index in self.view_endpoints.values() {
+            mark_write(
+                *index,
+                &self.call_graph,
+                &mut self.write_index_functions,
+                &mut visited,
+            );
+        }
+
+        for (name, index) in &self.view_endpoints {
+            if self.write_index_functions.contains(index) {
+                println!(
+                    "{} {}",
+                    "Write storage operation in VIEW endpoint:"
+                        .to_string()
+                        .red()
+                        .bold(),
+                    name.red().bold()
+                );
+            }
+        }
+    }
+
+    fn parse_export_section(
+        &mut self,
+        export_section: ExportSectionReader,
+        view_endpoints: &[&str],
+    ) {
+        for export in export_section {
+            let export = export.expect("Failed to read export section");
+            if let wasmparser::ExternalKind::Func = export.kind {
+                if view_endpoints.contains(&export.name) {
+                    self.view_endpoints
+                        .insert(export.name.to_owned(), export.index.try_into().unwrap());
+                }
+            }
+        }
     }
 }
 
-fn populate_wasm_info(
+pub(crate) fn populate_wasm_info(
     path: String,
     wasm_data: Vec<u8>,
-    extract_imports_enabled: bool,
+    import_extraction_enabled: bool,
     check_ei: &Option<EIVersion>,
+    view_endpoints: Vec<&str>,
 ) -> Result<WasmInfo, BinaryReaderError> {
-    let mut imports = Vec::new();
-    let mut allocator_trigger = false;
-    let mut ei_check = false;
-    let mut memory_grow_flag = false;
-    let mut has_panic = "none";
+    let mut wasm_info = WasmInfo::default();
 
     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);
+                wasm_info.process_imports(import_section, import_extraction_enabled);
+                wasm_info.ei_check |= is_ei_valid(&wasm_info.imports, check_ei);
             },
             Payload::DataSection(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;
-                }
+                wasm_info.report.has_allocator |= is_fail_allocator_triggered(data_section.clone());
+                wasm_info.report.has_panic.max_severity(data_section);
             },
             Payload::CodeSectionEntry(code_section) => {
-                memory_grow_flag = is_mem_grow(code_section);
+                wasm_info.memory_grow_flag |= is_mem_grow(&code_section);
+                wasm_info.create_call_graph(code_section);
+            },
+            Payload::ExportSection(export_section) => {
+                wasm_info.parse_export_section(export_section, &view_endpoints);
             },
             _ => (),
         }
     }
 
+    wasm_info.detect_write_operations_in_views();
+
     let report = ReportCreator {
         path,
-        has_allocator: allocator_trigger,
-        has_panic: has_panic.to_string(),
+        has_allocator: wasm_info.report.has_allocator,
+        has_panic: wasm_info.report.has_panic,
     };
 
     Ok(WasmInfo {
-        imports,
-        ei_check,
-        memory_grow_flag,
-        has_format: true,
+        imports: wasm_info.imports,
+        ei_check: wasm_info.ei_check,
+        memory_grow_flag: wasm_info.memory_grow_flag,
+        call_graph: wasm_info.call_graph,
         report,
+        write_index_functions: wasm_info.write_index_functions,
+        view_endpoints: wasm_info.view_endpoints,
     })
 }
 
@@ -109,53 +204,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;
-        }
+fn mark_write(
+    func: usize,
+    call_graph: &CallGraph,
+    write_functions: &mut HashSet<usize>,
+    visited: &mut HashSet<usize>,
+) {
+    // Return early to prevent cycles.
+    if visited.contains(&func) {
+        return;
     }
 
-    false
-}
+    visited.insert(func);
 
-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;
+    if let Some(callees) = call_graph.get(&func) {
+        for &callee in callees {
+            if write_functions.contains(&callee) {
+                write_functions.insert(func);
+            } else {
+                mark_write(callee, call_graph, write_functions, visited);
+                if write_functions.contains(&callee) {
+                    write_functions.insert(func);
+                }
+            }
         }
     }
-
-    false
-}
-
-pub fn extract_imports(
-    import_section: ImportSectionReader,
-    import_extraction_enabled: bool,
-) -> Vec<String> {
-    if !import_extraction_enabled {
-        return Vec::new();
-    }
-
-    let mut import_names = Vec::new();
-    for import in import_section.into_iter().flatten() {
-        import_names.push(import.name.to_string());
-    }
-
-    import_names.sort();
-
-    import_names
 }
 
-fn is_ei_valid(imports: Vec<String>, check_ei: &Option<EIVersion>) -> bool {
+fn is_ei_valid(imports: &[String], check_ei: &Option<EIVersion>) -> bool {
     if let Some(ei) = check_ei {
         let mut num_errors = 0;
         for import in imports {
@@ -172,12 +248,16 @@ fn is_ei_valid(imports: Vec<String>, check_ei: &Option<EIVersion>) -> bool {
     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 {
+fn is_mem_grow(code_section: &FunctionBody) -> bool {
+    let mut instructions_reader = code_section
+        .get_operators_reader()
+        .expect("Failed to get operators reader");
+
+    while let Ok(op) = instructions_reader.read() {
+        if let Operator::MemoryGrow { mem: _ } = op {
             return true;
         }
     }
+
     false
 }
diff --git a/framework/meta-lib/src/tools/wasm_extractor_test.rs b/framework/meta-lib/src/tools/wasm_extractor_test.rs
new file mode 100644
index 0000000000..346d0d855e
--- /dev/null
+++ b/framework/meta-lib/src/tools/wasm_extractor_test.rs
@@ -0,0 +1,502 @@
+#[cfg(test)]
+pub mod tests {
+    use std::collections::{HashMap, HashSet};
+
+    use wat::Parser;
+
+    use crate::tools::{panic_report::PanicReport, wasm_extractor::populate_wasm_info};
+
+    const ADDER_WITH_ERR_IN_VIEW: &str = r#"
+(module $adder_wasm.wasm
+  (type (;0;) (func (param i32 i32)))
+  (type (;1;) (func (result i32)))
+  (type (;2;) (func (param i32 i32) (result i32)))
+  (type (;3;) (func (param i32 i32 i32) (result i32)))
+  (type (;4;) (func))
+  (type (;5;) (func (param i32)))
+  (type (;6;) (func (param i32 i32 i32)))
+  (type (;7;) (func (param i32) (result i32)))
+  (import "env" "bigIntGetUnsignedArgument" (func $bigIntGetUnsignedArgument (;0;) (type 0)))
+  (import "env" "getNumArguments" (func $getNumArguments (;1;) (type 1)))
+  (import "env" "signalError" (func $signalError (;2;) (type 0)))
+  (import "env" "mBufferFromBigIntUnsigned" (func $mBufferFromBigIntUnsigned (;3;) (type 2)))
+  (import "env" "mBufferStorageStore" (func $mBufferStorageStore (;4;) (type 2)))
+  (import "env" "mBufferStorageLoad" (func $mBufferStorageLoad (;5;) (type 2)))
+  (import "env" "mBufferToBigIntUnsigned" (func $mBufferToBigIntUnsigned (;6;) (type 2)))
+  (import "env" "mBufferSetBytes" (func $mBufferSetBytes (;7;) (type 3)))
+  (import "env" "checkNoPayment" (func $checkNoPayment (;8;) (type 4)))
+  (import "env" "bigIntFinishUnsigned" (func $bigIntFinishUnsigned (;9;) (type 5)))
+  (import "env" "bigIntAdd" (func $bigIntAdd (;10;) (type 6)))
+  (func $_ZN13multiversx_sc2io16arg_nested_tuple15load_single_arg17hcaef680f5560198bE (;11;) (type 1) (result i32)
+    (local i32)
+    i32.const 0
+    call $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E
+    local.tee 0
+    call $bigIntGetUnsignedArgument
+    local.get 0
+  )
+  (func $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E (;12;) (type 1) (result i32)
+    (local i32)
+    i32.const 0
+    i32.const 0
+    i32.load offset=131100
+    i32.const -1
+    i32.add
+    local.tee 0
+    i32.store offset=131100
+    local.get 0
+  )
+  (func $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17h8cbbe81aa680cf46E (;13;) (type 5) (param i32)
+    block ;; label = @1
+      call $getNumArguments
+      local.get 0
+      i32.ne
+      br_if 0 (;@1;)
+      return
+    end
+    i32.const 131072
+    i32.const 25
+    call $signalError
+    unreachable
+  )
+  (func $_ZN13multiversx_sc7storage7mappers19single_value_mapper31SingleValueMapper$LT$SA$C$T$GT$3set17h00fe05a7d5154b39E (;14;) (type 0) (param i32 i32)
+    (local i32)
+    call $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E
+    local.tee 2
+    local.get 1
+    call $mBufferFromBigIntUnsigned
+    drop
+    local.get 0
+    local.get 2
+    call $mBufferStorageStore
+    drop
+  )
+  (func $_ZN13multiversx_sc7storage7mappers19single_value_mapper35SingleValueMapper$LT$SA$C$T$C$A$GT$3get17hb9977d4c8d45f0d8E (;15;) (type 7) (param i32) (result i32)
+    (local i32)
+    local.get 0
+    call $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E
+    local.tee 1
+    call $mBufferStorageLoad
+    drop
+    local.get 1
+    call $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E
+    local.tee 0
+    call $mBufferToBigIntUnsigned
+    drop
+    local.get 0
+  )
+  (func $_ZN34_$LT$C$u20$as$u20$adder..Adder$GT$3sum17h7cc7cc0602a1f97fE (;16;) (type 1) (result i32)
+    (local i32)
+    call $_ZN26multiversx_sc_wasm_adapter3api13managed_types19static_var_api_node11next_handle17h315bf8f89178ffe1E
+    local.tee 0
+    i32.const 131097
+    i32.const 3
+    call $mBufferSetBytes
+    drop
+    local.get 0
+  )
+  (func $init (;17;) (type 4)
+    (local i32)
+    call $checkNoPayment
+    i32.const 1
+    call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17h8cbbe81aa680cf46E
+    call $_ZN13multiversx_sc2io16arg_nested_tuple15load_single_arg17hcaef680f5560198bE
+    local.set 0
+    call $_ZN34_$LT$C$u20$as$u20$adder..Adder$GT$3sum17h7cc7cc0602a1f97fE
+    local.get 0
+    call $_ZN13multiversx_sc7storage7mappers19single_value_mapper31SingleValueMapper$LT$SA$C$T$GT$3set17h00fe05a7d5154b39E
+  )
+  (func $getSum (;18;) (type 4)
+    call $checkNoPayment
+    i32.const 0
+    call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17h8cbbe81aa680cf46E
+    call $_ZN34_$LT$C$u20$as$u20$adder..Adder$GT$3sum17h7cc7cc0602a1f97fE
+    call $_ZN13multiversx_sc7storage7mappers19single_value_mapper35SingleValueMapper$LT$SA$C$T$C$A$GT$3get17hb9977d4c8d45f0d8E
+    call $bigIntFinishUnsigned
+  )
+  (func $add (;19;) (type 4)
+    (local i32 i32 i32)
+    call $checkNoPayment
+    i32.const 1
+    call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17h8cbbe81aa680cf46E
+    call $_ZN13multiversx_sc2io16arg_nested_tuple15load_single_arg17hcaef680f5560198bE
+    local.set 0
+    call $_ZN34_$LT$C$u20$as$u20$adder..Adder$GT$3sum17h7cc7cc0602a1f97fE
+    local.tee 1
+    call $_ZN13multiversx_sc7storage7mappers19single_value_mapper35SingleValueMapper$LT$SA$C$T$C$A$GT$3get17hb9977d4c8d45f0d8E
+    local.tee 2
+    local.get 2
+    local.get 0
+    call $bigIntAdd
+    local.get 1
+    local.get 2
+    call $_ZN13multiversx_sc7storage7mappers19single_value_mapper31SingleValueMapper$LT$SA$C$T$GT$3set17h00fe05a7d5154b39E
+  )
+  (func $callBack (;20;) (type 4))
+  (table (;0;) 1 1 funcref)
+  (memory (;0;) 3)
+  (global $__stack_pointer (;0;) (mut i32) i32.const 131072)
+  (global (;1;) i32 i32.const 131104)
+  (global (;2;) i32 i32.const 131104)
+  (export "memory" (memory 0))
+  (export "init" (func $init))
+  (export "getSum" (func $getSum))
+  (export "add" (func $add))
+  (export "callBack" (func $callBack))
+  (export "upgrade" (func $init))
+  (export "__data_end" (global 1))
+  (export "__heap_base" (global 2))
+  (data $.rodata (;0;) (i32.const 131072) "wrong number of argumentssum")
+  (data $.data (;1;) (i32.const 131100) "8\ff\ff\ff")
+  (@producers
+    (language "Rust" "")
+    (processed-by "rustc" "1.80.1 (3f5fd8dd4 2024-08-06)")
+  )
+  (@custom "target_features" (after data) "\02+\0fmutable-globals+\08sign-ext")
+)
+"#;
+
+    const EMPTY_WITH_FAIL_ALLOCATOR: &str = r#"
+(module $empty_wasm.wasm
+	(type (;0;) (func (result i32)))
+	(type (;1;) (func (param i32 i32)))
+	(type (;2;) (func))
+	(import "env" "getNumArguments" (func $getNumArguments (;0;) (type 0)))
+	(import "env" "signalError" (func $signalError (;1;) (type 1)))
+	(import "env" "checkNoPayment" (func $checkNoPayment (;2;) (type 2)))
+	(func $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE (;3;) (type 2)
+		block ;; label = @1
+			call $getNumArguments
+			br_if 0 (;@1;)
+			return
+		end
+		i32.const 131072
+		i32.const 25
+		call $signalError
+		unreachable
+	)
+	(func $__rust_alloc (;4;) (type 2)
+		call $_ZN122_$LT$multiversx_sc_wasm_adapter..wasm_alloc..fail_allocator..FailAllocator$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17hf044a79dd04bdcb1E
+		unreachable
+	)
+	(func $_ZN122_$LT$multiversx_sc_wasm_adapter..wasm_alloc..fail_allocator..FailAllocator$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17hf044a79dd04bdcb1E (;5;) (type 2)
+		call $_ZN26multiversx_sc_wasm_adapter10wasm_alloc14fail_allocator29signal_allocation_not_allowed17hb15b243b5f851b48E
+		unreachable
+	)
+	(func $init (;6;) (type 2)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+		i32.const 0
+		i32.load8_u offset=131124
+		drop
+		call $__rust_alloc
+		unreachable
+	)
+	(func $upgrade (;7;) (type 2)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+	)
+	(func $callBack (;8;) (type 2))
+	(func $_ZN26multiversx_sc_wasm_adapter10wasm_alloc14fail_allocator29signal_allocation_not_allowed17hb15b243b5f851b48E (;9;) (type 2)
+		i32.const 131097
+		i32.const 27
+		call $signalError
+		unreachable
+	)
+	(memory (;0;) 3)
+	(global $__stack_pointer (;0;) (mut i32) i32.const 131072)
+	(global (;1;) i32 i32.const 131125)
+	(global (;2;) i32 i32.const 131136)
+	(export "memory" (memory 0))
+	(export "init" (func $init))
+	(export "upgrade" (func $upgrade))
+	(export "callBack" (func $callBack))
+	(export "__data_end" (global 1))
+	(export "__heap_base" (global 2))
+	(data $.rodata (;0;) (i32.const 131072) "wrong number of argumentsmemory allocation forbidden")
+)
+"#;
+
+    const EMPTY_WITH_MEM_GROW: &str = r#"
+(module $empty_wasm.wasm
+	(type (;0;) (func (result i32)))
+	(type (;1;) (func (param i32 i32)))
+	(type (;2;) (func))
+	(type (;3;) (func (param i64)))
+	(import "env" "getNumArguments" (func $getNumArguments (;0;) (type 0)))
+	(import "env" "signalError" (func $signalError (;1;) (type 1)))
+	(import "env" "checkNoPayment" (func $checkNoPayment (;2;) (type 2)))
+	(import "env" "smallIntFinishUnsigned" (func $smallIntFinishUnsigned (;3;) (type 3)))
+	(func $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE (;4;) (type 2)
+		block ;; label = @1
+			call $getNumArguments
+			br_if 0 (;@1;)
+			return
+		end
+		i32.const 131072
+		i32.const 25
+		call $signalError
+		unreachable
+	)
+	(func $rust_begin_unwind (;5;) (type 2)
+		call $_ZN26multiversx_sc_wasm_adapter5panic9panic_fmt17he68b14ffa9b6b21eE
+		unreachable
+	)
+	(func $_ZN26multiversx_sc_wasm_adapter5panic9panic_fmt17he68b14ffa9b6b21eE (;6;) (type 2)
+		i32.const 131097
+		i32.const 14
+		call $signalError
+		unreachable
+	)
+	(func $init (;7;) (type 2)
+		(local i32 i32)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+		i32.const 0
+		i32.load8_u offset=131120
+		drop
+		block ;; label = @1
+			i32.const 0
+			i32.load offset=131112
+			local.tee 0
+			i32.const 3
+			i32.and
+			i32.eqz
+			br_if 0 (;@1;)
+			i32.const 0
+			local.get 0
+			i32.const -4
+			i32.and
+			i32.const 4
+			i32.add
+			local.tee 0
+			i32.store offset=131112
+		end
+		block ;; label = @1
+			local.get 0
+			i32.const 4
+			i32.add
+			local.tee 1
+			i32.const 0
+			i32.load offset=131116
+			i32.le_u
+			br_if 0 (;@1;)
+			i32.const 1
+			memory.grow
+			local.set 0
+			i32.const 0
+			i32.load offset=131116
+			local.set 1
+			i32.const 0
+			local.get 0
+			i32.const 16
+			i32.shl
+			local.tee 0
+			i32.const 65536
+			i32.add
+			i32.store offset=131116
+			i32.const 0
+			i32.load offset=131112
+			local.get 0
+			local.get 0
+			local.get 1
+			i32.eq
+			select
+			local.tee 0
+			i32.const 4
+			i32.add
+			local.set 1
+		end
+		i32.const 0
+		local.get 1
+		i32.store offset=131112
+		block ;; label = @1
+			local.get 0
+			i32.eqz
+			br_if 0 (;@1;)
+			local.get 0
+			i32.const 42
+			i32.store
+			i64.const 1
+			call $smallIntFinishUnsigned
+			return
+		end
+		call $_ZN5alloc5alloc18handle_alloc_error17he71533634a7a5ac5E
+		unreachable
+	)
+	(func $_ZN5alloc5alloc18handle_alloc_error17he71533634a7a5ac5E (;8;) (type 2)
+		call $__rust_alloc_error_handler
+		unreachable
+	)
+	(func $upgrade (;9;) (type 2)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+	)
+	(func $callBack (;10;) (type 2))
+	(func $__rust_alloc_error_handler (;11;) (type 2)
+		call $__rdl_oom
+		unreachable
+	)
+	(func $__rdl_oom (;12;) (type 2)
+		call $_ZN4core9panicking18panic_nounwind_fmt17h21a92179d680342aE
+		unreachable
+	)
+	(func $_ZN4core9panicking18panic_nounwind_fmt17h21a92179d680342aE (;13;) (type 2)
+		call $rust_begin_unwind
+		unreachable
+	)
+	(memory (;0;) 3)
+	(global $__stack_pointer (;0;) (mut i32) i32.const 131072)
+	(global (;1;) i32 i32.const 131121)
+	(global (;2;) i32 i32.const 131136)
+	(export "memory" (memory 0))
+	(export "init" (func $init))
+	(export "upgrade" (func $upgrade))
+	(export "callBack" (func $callBack))
+	(export "__data_end" (global 1))
+	(export "__heap_base" (global 2))
+	(data $.rodata (;0;) (i32.const 131072) "wrong number of argumentspanic occurred")
+)
+"#;
+
+    const EMPTY_DBG_WAT: &str = r#"
+(module $empty_wasm.wasm
+	(type (;0;) (func (result i32)))
+	(type (;1;) (func (param i32 i32)))
+	(type (;2;) (func))
+	(type (;3;) (func (param i64)))
+	(import "env" "getNumArguments" (func $getNumArguments (;0;) (type 0)))
+	(import "env" "signalError" (func $signalError (;1;) (type 1)))
+	(import "env" "checkNoPayment" (func $checkNoPayment (;2;) (type 2)))
+	(import "env" "smallIntFinishUnsigned" (func $smallIntFinishUnsigned (;3;) (type 3)))
+	(func $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE (;4;) (type 2)
+		block ;; label = @1
+			call $getNumArguments
+			br_if 0 (;@1;)
+			return
+		end
+		i32.const 131072
+		i32.const 25
+		call $signalError
+		unreachable
+	)
+	(func $init (;5;) (type 2)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+		i64.const 64
+		call $smallIntFinishUnsigned
+	)
+	(func $upgrade (;6;) (type 2)
+		call $checkNoPayment
+		call $_ZN13multiversx_sc2io16arg_nested_tuple22check_num_arguments_eq17hd731b4a37a0ab09aE
+	)
+	(func $callBack (;7;) (type 2))
+	(memory (;0;) 3)
+	(global $__stack_pointer (;0;) (mut i32) i32.const 131072)
+	(global (;1;) i32 i32.const 131097)
+	(global (;2;) i32 i32.const 131104)
+	(export "memory" (memory 0))
+	(export "init" (func $init))
+	(export "upgrade" (func $upgrade))
+	(export "callBack" (func $callBack))
+	(export "__data_end" (global 1))
+	(export "__heap_base" (global 2))
+	(data $.rodata (;0;) (i32.const 131072) "wrong number of arguments")
+)
+"#;
+
+    #[test]
+    fn test_empty() {
+        if let Ok(content) = Parser::new().parse_bytes(None, EMPTY_DBG_WAT.as_bytes()) {
+            let wasm_info =
+                populate_wasm_info(String::new(), content.to_vec(), false, &None, Vec::new())
+                    .expect("Unable to parse WASM content.");
+            assert!(!wasm_info.memory_grow_flag);
+            assert!(!wasm_info.report.has_allocator);
+            assert_eq!(
+                PanicReport::None.to_string(),
+                wasm_info.report.has_panic.to_string()
+            );
+        }
+    }
+
+    #[test]
+    fn test_empty_with_mem_grow() {
+        if let Ok(content) = Parser::new().parse_bytes(None, EMPTY_WITH_MEM_GROW.as_bytes()) {
+            let wasm_info =
+                populate_wasm_info(String::new(), content.to_vec(), false, &None, Vec::new())
+                    .expect("Unable to parse WASM content.");
+            assert!(wasm_info.memory_grow_flag);
+            assert!(!wasm_info.report.has_allocator);
+            assert_eq!(
+                PanicReport::WithoutMessage.to_string(),
+                wasm_info.report.has_panic.to_string()
+            );
+        }
+    }
+
+    #[test]
+    fn test_empty_with_fail_allocator() {
+        if let Ok(content) = Parser::new().parse_bytes(None, EMPTY_WITH_FAIL_ALLOCATOR.as_bytes()) {
+            let wasm_info =
+                populate_wasm_info(String::new(), content.to_vec(), false, &None, Vec::new())
+                    .expect("Unable to parse WASM content.");
+            assert!(!wasm_info.memory_grow_flag);
+            assert!(wasm_info.report.has_allocator);
+            assert_eq!(
+                PanicReport::None.to_string(),
+                wasm_info.report.has_panic.to_string()
+            );
+        }
+    }
+
+    #[test]
+    fn test_adder_with_write_op_in_view() {
+        let view_endpoints: Vec<&str> = Vec::from(["getSum", "add"]);
+
+        let expected_view_index: HashMap<String, usize> =
+            HashMap::from([("getSum".to_string(), 18), ("add".to_string(), 19)]);
+        let expected_write_index_functions: HashSet<usize> = HashSet::from([4, 19, 14]);
+        let expected_call_graph: HashMap<usize, HashSet<usize>> = HashMap::from([
+            (0, HashSet::new()),
+            (1, HashSet::new()),
+            (2, HashSet::new()),
+            (3, HashSet::new()),
+            (4, HashSet::new()),
+            (5, HashSet::new()),
+            (6, HashSet::new()),
+            (7, HashSet::new()),
+            (8, HashSet::new()),
+            (9, HashSet::new()),
+            (10, HashSet::new()),
+            (11, HashSet::from([12, 0])),
+            (12, HashSet::new()),
+            (13, HashSet::from([1, 2])),
+            (14, HashSet::from([12, 3, 4])),
+            (15, HashSet::from([12, 5, 6])),
+            (16, HashSet::from([12, 7])),
+            (17, HashSet::from([8, 13, 11, 16, 14])),
+            (18, HashSet::from([8, 13, 16, 15, 9])),
+            (19, HashSet::from([8, 13, 11, 16, 15, 10, 14])),
+            (20, HashSet::new()),
+        ]);
+
+        if let Ok(content) = Parser::new().parse_bytes(None, ADDER_WITH_ERR_IN_VIEW.as_bytes()) {
+            let wasm_info = populate_wasm_info(
+                String::new(),
+                content.to_vec(),
+                false,
+                &None,
+                view_endpoints,
+            )
+            .expect("Unable to parse WASM content.");
+
+            assert_eq!(
+                expected_write_index_functions,
+                wasm_info.write_index_functions
+            );
+            assert_eq!(expected_call_graph, wasm_info.call_graph);
+            assert_eq!(expected_view_index, wasm_info.view_endpoints);
+        }
+    }
+}
diff --git a/framework/meta-lib/src/version_history.rs b/framework/meta-lib/src/version_history.rs
index bfdaf6bf2b..aed4b17e8f 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.54.1);
 
 /// Indicates where to stop with the upgrades.
 pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION;
@@ -78,6 +78,15 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![
     0.50.6,
     0.51.0,
     0.51.1,
+    0.52.0,
+    0.52.1,
+    0.52.2,
+    0.52.3,
+    0.53.0,
+    0.53.1,
+    0.53.2,
+    0.54.0,
+    0.54.1,
 ];
 
 #[rustfmt::skip]
@@ -103,6 +112,9 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![
     0.49.0,
     0.50.6,
     0.51.1,
+    0.52.3,
+    0.53.2,
+    0.54.1,
 ];
 
 pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0);
diff --git a/framework/meta-lib/tests/ei_test.rs b/framework/meta-lib/tests/ei_test.rs
index 2a1bdb06bb..78df88fe3e 100644
--- a/framework/meta-lib/tests/ei_test.rs
+++ b/framework/meta-lib/tests/ei_test.rs
@@ -74,6 +74,27 @@ pub const EI_1_3_ADDED_NAMES: &[&str] = &[
     "managedIsBuiltinFunction",
 ];
 
+pub const EI_1_4_ADDED_NAMES: &[&str] = &[
+    "isReservedFunctionName",
+    "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 +130,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);
+}
diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml
index 36e91de06d..8180f0dac4 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.54.1"
 edition = "2021"
 
 authors = [
@@ -39,16 +39,17 @@ zip = { version = "2.1", features = ["deflate"], default-features = false }
 copy_dir =  "0.1.2" 
 pathdiff = "0.2.1" 
 common-path = "1.0.0" 
+bip39 = "2.0.0"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../meta-lib"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../base"
 features = ["alloc", "num-bigint"]
 
 [dependencies.multiversx-sc-snippets]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../snippets"
diff --git a/framework/meta/src/cli/cli_args_standalone.rs b/framework/meta/src/cli/cli_args_standalone.rs
index e66c83deb4..abd450b702 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 = "report", about = "Generate code report")]
+    CodeReportGen(CodeReportArgs),
+
     #[command(
         about = "Generates a scenario test initialized with real data fetched from the blockchain."
     )]
@@ -75,6 +78,38 @@ 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),
+
+    #[command(
+        name = "cs",
+        about = "Can install, start and stop a chain simulator configuration."
+    )]
+    ChainSimulator(ChainSimulatorArgs),
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Args)]
+pub struct ChainSimulatorArgs {
+    #[command(subcommand)]
+    pub command: ChainSimulatorCommand,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Subcommand)]
+pub enum ChainSimulatorCommand {
+    #[command(
+        about = "Pulls the latest chain simulator docker image available. Needs Docker installed."
+    )]
+    Install,
+
+    #[command(about = "Starts the chain simulator.")]
+    Start,
+
+    #[command(about = "Stops the chain simulator.")]
+    Stop,
 }
 
 #[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
@@ -102,6 +137,16 @@ pub struct TestArgs {
     #[arg(short, long, default_value = "false", verbatim_doc_comment)]
     pub go: bool,
 
+    /// This arg runs interactor tests using chain simulator
+    /// Default value will be "false" if not specified
+    #[arg(
+        short = 'c',
+        long = "chain-simulator",
+        default_value = "false",
+        verbatim_doc_comment
+    )]
+    pub chain_simulator: bool,
+
     /// This arg runs scenarios.
     /// Default value will be "false" if not specified.
     /// If scen and go are both specified, scen overrides the go argument.
@@ -115,7 +160,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 +177,73 @@ 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(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 reports.")]
+    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.
+    #[arg(short, long, verbatim_doc_comment)]
+    pub path: PathBuf,
+
+    /// Path to the Markdown or JSON file where the report results will be written.
+    #[arg(short, long, verbatim_doc_comment)]
+    pub output: PathBuf,
+}
+
+#[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 baseline: PathBuf,
+
+    /// Path to the current version of the code report JSON file
+    /// that will be compared.
+    #[arg(short, long, verbatim_doc_comment)]
+    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)]
 pub struct AllArgs {
     #[command(subcommand)]
@@ -265,6 +370,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.
+    /// If missing, the default author will be considered.
+    #[arg(long, verbatim_doc_comment)]
+    pub author: Option<String>,
 }
 
 impl CliArgsToRaw for TemplateArgs {
@@ -334,7 +444,7 @@ 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
+    /// Provide the target API you want the data to come from
     #[arg(long = "api")]
     #[clap(global = true)]
     pub api: Option<String>,
@@ -343,3 +453,58 @@ 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 = "bech32",
+        about = "Encodes/decodes a bech32 address to/from hex"
+    )]
+    Bech32(WalletBech32Args),
+    #[command(name = "convert", about = "Converts a wallet")]
+    Convert(WalletConvertArgs),
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Parser)]
+#[command(propagate_version = true)]
+pub struct WalletArgs {
+    #[command(subcommand)]
+    pub command: 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<String>,
+
+    /// The name of the wallet to create.
+    #[arg(long = "outfile", verbatim_doc_comment)]
+    pub outfile: Option<String>,
+}
+
+#[derive(Default, Clone, PartialEq, Eq, Debug, Args)]
+pub struct WalletConvertArgs {
+    #[arg(long = "in-format", verbatim_doc_comment)]
+    pub from: String,
+
+    #[arg(long = "out-format", verbatim_doc_comment)]
+    pub to: String,
+
+    #[arg(long = "infile", verbatim_doc_comment)]
+    pub infile: Option<String>,
+
+    #[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/cli/cli_standalone_main.rs b/framework/meta/src/cli/cli_standalone_main.rs
index 6c8c6a67b0..3d91747f45 100644
--- a/framework/meta/src/cli/cli_standalone_main.rs
+++ b/framework/meta/src/cli/cli_standalone_main.rs
@@ -1,8 +1,11 @@
 use crate::cli::{StandaloneCliAction, StandaloneCliArgs};
+use crate::cmd::chain_simulator::chain_simulator;
 use crate::cmd::retrieve_address::retrieve_address;
+use crate::cmd::wallet::wallet;
 use clap::Parser;
 
 use crate::cmd::all::call_all_meta;
+use crate::cmd::code_report::report;
 use crate::cmd::info::call_info;
 use crate::cmd::install::install;
 use crate::cmd::local_deps::local_deps;
@@ -10,6 +13,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,12 +39,21 @@ pub async fn cli_main_standalone() {
         Some(StandaloneCliAction::TestCoverage(args)) => {
             test_coverage(args);
         },
+        Some(StandaloneCliAction::CodeReportGen(args)) => {
+            report(args);
+        },
         Some(StandaloneCliAction::Account(args)) => {
             retrieve_address(args).await;
         },
         Some(StandaloneCliAction::LocalDeps(args)) => {
             local_deps(args);
         },
+        Some(StandaloneCliAction::Wallet(args)) => {
+            wallet(args);
+        },
+        Some(StandaloneCliAction::ChainSimulator(args)) => {
+            chain_simulator(args);
+        },
         None => {},
     }
 }
diff --git a/framework/meta/src/cmd.rs b/framework/meta/src/cmd.rs
index a588f90162..8dc9863398 100644
--- a/framework/meta/src/cmd.rs
+++ b/framework/meta/src/cmd.rs
@@ -1,4 +1,6 @@
 pub mod all;
+pub mod chain_simulator;
+pub mod code_report;
 pub mod info;
 pub mod install;
 pub mod local_deps;
@@ -9,3 +11,4 @@ pub mod template;
 pub mod test;
 pub mod test_coverage;
 pub mod upgrade;
+pub mod wallet;
diff --git a/framework/meta/src/cmd/chain_simulator.rs b/framework/meta/src/cmd/chain_simulator.rs
new file mode 100644
index 0000000000..bb4915e008
--- /dev/null
+++ b/framework/meta/src/cmd/chain_simulator.rs
@@ -0,0 +1,40 @@
+mod error;
+mod install;
+mod start;
+mod stop;
+
+use crate::cli::{ChainSimulatorArgs, ChainSimulatorCommand};
+use std::process;
+
+use install::install_and_check;
+use start::start_and_check;
+use stop::stop_and_check;
+
+pub fn chain_simulator(args: &ChainSimulatorArgs) {
+    match args.command {
+        ChainSimulatorCommand::Install => cs_install(),
+        ChainSimulatorCommand::Start => cs_start(),
+        ChainSimulatorCommand::Stop => cs_stop(),
+    }
+}
+
+pub fn cs_install() {
+    if let Err(err) = install_and_check() {
+        eprintln!("{err}");
+        process::exit(1);
+    }
+}
+
+pub fn cs_start() {
+    if let Err(err) = start_and_check() {
+        eprintln!("{err}");
+        process::exit(1);
+    }
+}
+
+pub fn cs_stop() {
+    if let Err(err) = stop_and_check() {
+        eprintln!("{err}");
+        process::exit(1);
+    }
+}
diff --git a/framework/meta/src/cmd/chain_simulator/error.rs b/framework/meta/src/cmd/chain_simulator/error.rs
new file mode 100644
index 0000000000..ee4f21ab2a
--- /dev/null
+++ b/framework/meta/src/cmd/chain_simulator/error.rs
@@ -0,0 +1,43 @@
+use colored::*;
+use std::fmt;
+
+pub const DOCKER_CMD: &str = "docker";
+pub const SIMULATOR_IMAGE: &str = "multiversx/chainsimulator:latest";
+pub const DEFAULT_PORT: &str = "8085:8085";
+
+#[derive(Debug)]
+pub enum ChainSimulatorError {
+    DockerNotInstalled,
+    CommandFailed(String),
+    OperationFailed(String),
+    ContainerNotRunning,
+}
+
+impl fmt::Display for ChainSimulatorError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            ChainSimulatorError::DockerNotInstalled => {
+                write!(
+                    f,
+                    "{}",
+                    "Error: Docker is not installed. Please install Docker to continue.".red()
+                )
+            },
+            ChainSimulatorError::CommandFailed(cmd) => {
+                write!(f, "{} {}", "Error: Failed to execute command:".red(), cmd)
+            },
+            ChainSimulatorError::OperationFailed(op) => {
+                write!(f, "{} {}", "Error: Operation failed:".red(), op)
+            },
+            ChainSimulatorError::ContainerNotRunning => {
+                write!(
+                    f,
+                    "{}",
+                    "Warning: No running Chain Simulator container found.".yellow()
+                )
+            },
+        }
+    }
+}
+
+impl std::error::Error for ChainSimulatorError {}
diff --git a/framework/meta/src/cmd/chain_simulator/install.rs b/framework/meta/src/cmd/chain_simulator/install.rs
new file mode 100644
index 0000000000..c28229d49a
--- /dev/null
+++ b/framework/meta/src/cmd/chain_simulator/install.rs
@@ -0,0 +1,34 @@
+use crate::cmd::chain_simulator::error::{ChainSimulatorError, DOCKER_CMD, SIMULATOR_IMAGE};
+use colored::Colorize;
+use std::process::Command;
+
+pub fn install_and_check() -> Result<(), ChainSimulatorError> {
+    println!(
+        "{}",
+        "Attempting to install prerequisites for the Chain Simulator...".yellow()
+    );
+
+    if Command::new(DOCKER_CMD).arg("--version").output().is_err() {
+        return Err(ChainSimulatorError::DockerNotInstalled);
+    }
+
+    let output = Command::new(DOCKER_CMD)
+        .args(["image", "pull", SIMULATOR_IMAGE])
+        .output()
+        .map_err(|e| {
+            ChainSimulatorError::CommandFailed(format!(
+                "Failed to execute `{DOCKER_CMD} image pull {SIMULATOR_IMAGE}`. Cause: {e:#?}"
+            ))
+        })?;
+
+    if output.status.success() {
+        println!(
+            "{}",
+            "Successfully pulled the latest Chain Simulator image.".green()
+        );
+        Ok(())
+    } else {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        Err(ChainSimulatorError::CommandFailed(stderr.to_string()))
+    }
+}
diff --git a/framework/meta/src/cmd/chain_simulator/start.rs b/framework/meta/src/cmd/chain_simulator/start.rs
new file mode 100644
index 0000000000..6800684459
--- /dev/null
+++ b/framework/meta/src/cmd/chain_simulator/start.rs
@@ -0,0 +1,57 @@
+use crate::cmd::chain_simulator::error::{
+    ChainSimulatorError, DEFAULT_PORT, DOCKER_CMD, SIMULATOR_IMAGE,
+};
+use colored::Colorize;
+use std::io::{self, BufRead};
+use std::process::{Command, Stdio};
+
+pub fn start_and_check() -> Result<(), ChainSimulatorError> {
+    println!("{}", "Attempting to start the Chain Simulator...".yellow());
+
+    let mut child = Command::new(DOCKER_CMD)
+        .args(["run", "-p", DEFAULT_PORT, SIMULATOR_IMAGE])
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .map_err(|e| ChainSimulatorError::CommandFailed(format!(
+            "Failed to execute `{DOCKER_CMD} run -p {DEFAULT_PORT} {SIMULATOR_IMAGE}`. Cause: {e:#?}"
+        )))?;
+
+    println!("{}", "Successfully started the Chain Simulator.".green());
+
+    let stdout = child.stdout.take().ok_or_else(|| {
+        ChainSimulatorError::OperationFailed("Failed to capture stdout.".to_string())
+    })?;
+    let stderr = child.stderr.take().ok_or_else(|| {
+        ChainSimulatorError::OperationFailed("Failed to capture stderr.".to_string())
+    })?;
+
+    let stdout_reader = io::BufReader::new(stdout);
+    let stderr_reader = io::BufReader::new(stderr);
+
+    for line in stdout_reader.lines().map_while(Result::ok) {
+        println!("{line}");
+    }
+
+    let mut stderr_lines = Vec::new();
+    for line in stderr_reader.lines().map_while(Result::ok) {
+        eprintln!("{line}");
+        stderr_lines.push(line);
+    }
+
+    let status = child.wait().map_err(|e| {
+        ChainSimulatorError::OperationFailed(format!(
+            "Waiting for the container process to finish failed. Cause: {e:#?}"
+        ))
+    })?;
+
+    if status.success() {
+        Ok(())
+    } else {
+        let stderr_msg = stderr_lines.join("\n");
+
+        Err(ChainSimulatorError::OperationFailed(format!(
+            "Chain Simulator execution failed. Exit status: {status}. Error stack trace: {stderr_msg}",
+        )))
+    }
+}
diff --git a/framework/meta/src/cmd/chain_simulator/stop.rs b/framework/meta/src/cmd/chain_simulator/stop.rs
new file mode 100644
index 0000000000..189abf4265
--- /dev/null
+++ b/framework/meta/src/cmd/chain_simulator/stop.rs
@@ -0,0 +1,44 @@
+use crate::cmd::chain_simulator::error::{ChainSimulatorError, DOCKER_CMD, SIMULATOR_IMAGE};
+use colored::Colorize;
+use std::process::Command;
+
+pub fn stop_and_check() -> Result<(), ChainSimulatorError> {
+    println!("{}", "Attempting to close the Chain Simulator...".yellow());
+
+    let output = Command::new(DOCKER_CMD)
+        .args(["ps", "-q", "--filter", format!("ancestor={SIMULATOR_IMAGE}").as_str()])
+        .output()
+        .map_err(|e| {
+            ChainSimulatorError::CommandFailed(format!(
+                "Failed to execute `{DOCKER_CMD} ps` to find a running Chain Simulator container. Cause: {e:#?}"
+            ))
+        })?;
+
+    if !output.status.success() {
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        return Err(ChainSimulatorError::CommandFailed(stderr.to_string()));
+    }
+
+    let container_id = String::from_utf8_lossy(&output.stdout).trim().to_string();
+
+    if container_id.is_empty() {
+        return Err(ChainSimulatorError::ContainerNotRunning);
+    }
+
+    let stop_output = Command::new(DOCKER_CMD)
+        .args(["stop", &container_id])
+        .output()
+        .map_err(|e| {
+            ChainSimulatorError::CommandFailed(format!(
+                "Failed to execute `{DOCKER_CMD} stop {container_id}`. Cause: {e:#?}"
+            ))
+        })?;
+
+    if stop_output.status.success() {
+        println!("{}", "Successfully stopped the Chain Simulator.".green());
+        Ok(())
+    } else {
+        let stderr = String::from_utf8_lossy(&stop_output.stderr);
+        Err(ChainSimulatorError::CommandFailed(stderr.to_string()))
+    }
+}
diff --git a/framework/meta/src/cmd/code_report.rs b/framework/meta/src/cmd/code_report.rs
new file mode 100644
index 0000000000..47e51948f0
--- /dev/null
+++ b/framework/meta/src/cmd/code_report.rs
@@ -0,0 +1,15 @@
+pub mod compare;
+pub mod generate_report;
+pub mod render_code_report;
+
+use generate_report::{compare_report, convert_report, create_report};
+
+use crate::cli::{CodeReportAction, CodeReportArgs};
+
+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),
+    }
+}
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..28c604962d
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/compare.rs
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 0000000000..0cd0c76993
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/generate_report.rs
@@ -0,0 +1,164 @@
+use std::{
+    fs::{read_dir, File},
+    io::{BufReader, Write},
+    path::{Path, PathBuf},
+};
+
+use crate::{
+    cli::{CompareArgs, CompileArgs, ConvertArgs},
+    folder_structure::RelevantDirectories,
+};
+
+use multiversx_sc_meta_lib::{
+    self, code_report_json::CodeReportJson, mxsc_file_json::MxscFileJson,
+};
+
+use super::render_code_report::CodeReportRender;
+
+const JSON: &str = ".json";
+const MD: &str = ".md";
+
+pub fn compare_report(compare_args: &CompareArgs) {
+    if !is_path_ends_with(&compare_args.output, MD) {
+        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 are only available for JSON file extension.");
+    }
+
+    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![],
+    };
+
+    let new_reports: Vec<CodeReportJson> = extract_reports_from_json(&compare_args.new);
+
+    let mut render_code_report =
+        CodeReportRender::new(&mut output_file, &baseline_reports, &new_reports);
+    render_code_report.compare_reports();
+}
+
+pub fn convert_report(convert_args: &ConvertArgs) {
+    if !is_path_ends_with(&convert_args.output, MD) {
+        panic!("Conversion output is only available for Markdown file extension");
+    }
+
+    if !is_path_ends_with(&convert_args.input, JSON) {
+        panic!("Conversion only available from JSON file extension");
+    }
+
+    let mut output_file = create_file(&convert_args.output);
+
+    let reports: Vec<CodeReportJson> = extract_reports_from_json(&convert_args.input);
+
+    let mut convert_code_report = CodeReportRender::new_without_compare(&mut output_file, &reports);
+
+    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 only available for Markdown or JSON output file.")
+    }
+
+    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 generate_new_report(path: &PathBuf) -> Vec<CodeReportJson> {
+    let directors = RelevantDirectories::find_all(path, &["".to_owned()]);
+
+    assemble_report_vec(directors)
+}
+
+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> {
+    if !path.is_dir() {
+        return vec![];
+    }
+
+    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("-dbg.mxsc.json") {
+            continue;
+        }
+
+        if file_path.to_str().unwrap().ends_with(".mxsc.json") {
+            mxsc_files.push(file_path);
+        }
+    }
+
+    mxsc_files
+}
+
+fn collect_reports(path: &PathBuf, reports: &mut Vec<CodeReportJson>) {
+    for mxsc_path in find_mxsc_files(path) {
+        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: &PathBuf) -> File {
+    File::create(file_path).expect("could not write report file")
+}
+
+fn sanitize_output_path_from_report(reports: &mut [CodeReportJson]) {
+    reports.iter_mut().for_each(|report| {
+        report.path = report
+            .path
+            .split('/')
+            .last()
+            .unwrap_or(&report.path)
+            .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).unwrap_or_else(|_| panic!("file with path {} not found", path.display()));
+    let reader = BufReader::new(file);
+
+    serde_json::from_reader(reader).unwrap_or_else(|_| vec![])
+}
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..e6edcfae8e
--- /dev/null
+++ b/framework/meta/src/cmd/code_report/render_code_report.rs
@@ -0,0 +1,122 @@
+use std::fmt::Display;
+
+pub struct CodeReportRender<'a> {
+    pub file: Option<&'a mut dyn std::io::Write>,
+    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, size_status_after_comparing,
+};
+
+impl<'a> CodeReportRender<'a> {
+    pub fn new(
+        file: &'a mut dyn std::io::Write,
+        compared_reports: &'a [CodeReportJson],
+        reports: &'a [CodeReportJson],
+    ) -> Self {
+        Self {
+            file: Some(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,
+        }
+    }
+
+    pub fn render_report(&mut self) {
+        self.render_header();
+
+        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 download the report for the base branch. Displaying only the report for the current branch. :warning:");
+        } else {
+            self.render_report_and_compare();
+        }
+    }
+
+    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();
+    }
+
+    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
+        ));
+    }
+
+    fn render_header(&mut self) {
+        self.writeln("| Path                                                         |                                     size |                  has-allocator |                     has-format |");
+        self.writeln("| :-- | --: | --: | --: |");
+    }
+
+    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,
+            );
+        }
+    }
+
+    fn render_report_and_compare(&mut self) {
+        for report in self.reports.iter() {
+            if let Some(compared_report) = self
+                .compared_reports
+                .iter()
+                .find(|cr| cr.path == report.path)
+            {
+                self.print_compared_output(report, compared_report);
+            }
+        }
+    }
+
+    fn print_compared_output(&mut self, report: &CodeReportJson, compared_report: &CodeReportJson) {
+        let size_report = size_status_after_comparing(report.size, compared_report.size);
+
+        let has_allocator_report =
+            allocator_status_after_comparing(report.has_allocator, compared_report.has_allocator);
+
+        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/framework/meta/src/cmd/info.rs b/framework/meta/src/cmd/info.rs
index 2d36399474..6d51ccd39f 100644
--- a/framework/meta/src/cmd/info.rs
+++ b/framework/meta/src/cmd/info.rs
@@ -1,10 +1,11 @@
-use super::upgrade::print_tree_dir_metadata;
 use crate::{
     cli::InfoArgs,
     folder_structure::{dir_pretty_print, RelevantDirectories},
     version_history::LAST_UPGRADE_VERSION,
 };
 
+use super::print_util::print_tree_dir_metadata;
+
 pub fn call_info(args: &InfoArgs) {
     let path = if let Some(some_path) = &args.path {
         some_path.as_str()
diff --git a/framework/meta/src/cmd/local_deps.rs b/framework/meta/src/cmd/local_deps.rs
index 7aed31a6d3..bd58036865 100644
--- a/framework/meta/src/cmd/local_deps.rs
+++ b/framework/meta/src/cmd/local_deps.rs
@@ -5,7 +5,7 @@ use crate::{
     },
 };
 use common_path::common_path_all;
-use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use multiversx_sc_meta_lib::cargo_toml::CargoTomlContents;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, LinkedList},
diff --git a/framework/meta/src/cmd/print_util.rs b/framework/meta/src/cmd/print_util.rs
index 7b3e0be9b8..d9e7a9b636 100644
--- a/framework/meta/src/cmd/print_util.rs
+++ b/framework/meta/src/cmd/print_util.rs
@@ -1,6 +1,9 @@
 use colored::Colorize;
+use multiversx_sc_meta_lib::{cargo_toml::DependencyReference, version::FrameworkVersion};
 use std::path::Path;
 
+use crate::folder_structure::{DirectoryType, RelevantDirectory};
+
 pub fn print_all_count(num_contract_crates: usize) {
     println!(
         "\n{}",
@@ -24,3 +27,53 @@ pub fn print_all_command(meta_path: &Path, cargo_run_args: &[String]) {
         cargo_run_args.join(" "),
     );
 }
+
+pub fn print_tree_dir_metadata(dir: &RelevantDirectory, last_version: &FrameworkVersion) {
+    match dir.dir_type {
+        DirectoryType::Contract => print!(" {}", "[contract]".blue()),
+        DirectoryType::Lib => print!(" {}", "[lib]".magenta()),
+    }
+
+    match &dir.version {
+        DependencyReference::Version(version_req) => {
+            let version_string = format!("[{}]", version_req.semver);
+            if version_req.semver == *last_version {
+                print!(" {}", version_string.green());
+            } else {
+                print!(" {}", version_string.red());
+            };
+        },
+        DependencyReference::GitCommit(git_reference) => {
+            let git_string = format!(
+                "[git: {} rev: {}]",
+                git_reference.git.truecolor(255, 127, 0),
+                git_reference.rev.truecolor(255, 127, 0)
+            );
+            print!(" {}", git_string.truecolor(255, 198, 0));
+        },
+        DependencyReference::GitBranch(git_reference) => {
+            let git_string = format!(
+                "[git: {} branch: {}]",
+                git_reference.git.truecolor(255, 127, 0),
+                git_reference.branch.truecolor(255, 127, 0)
+            );
+            print!(" {}", git_string.truecolor(255, 198, 0));
+        },
+        DependencyReference::GitTag(git_reference) => {
+            let git_string = format!(
+                "[git: {} rev: {}]",
+                git_reference.git.truecolor(255, 127, 0),
+                git_reference.tag.truecolor(255, 127, 0)
+            );
+            print!(" {}", git_string.truecolor(255, 198, 0));
+        },
+        DependencyReference::Path(path_buf) => {
+            let git_string = format!("[path: {}]", path_buf.truecolor(255, 127, 0));
+            print!(" {}", git_string.truecolor(255, 198, 0));
+        },
+        DependencyReference::Unsupported(error) => {
+            let message = format!("dependency error: {error}");
+            print!(" {}", message.red());
+        },
+    }
+}
diff --git a/framework/meta/src/cmd/retrieve_address.rs b/framework/meta/src/cmd/retrieve_address.rs
index f20b5b8e05..8e3bdffe5e 100644
--- a/framework/meta/src/cmd/retrieve_address.rs
+++ b/framework/meta/src/cmd/retrieve_address.rs
@@ -1,9 +1,13 @@
-use multiversx_sc_snippets::account_tool;
+use multiversx_sc_snippets::{account_tool, imports::GatewayHttpProxy};
 
 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");
-    account_tool::print_account_as_scenario_set_state(api_string, args.address.to_string()).await;
+    account_tool::print_account_as_scenario_set_state(
+        GatewayHttpProxy::new(api_string),
+        args.address.to_string(),
+    )
+    .await;
 }
diff --git a/framework/meta/src/cmd/template/contract_creator.rs b/framework/meta/src/cmd/template/contract_creator.rs
index 65e45f4d47..8483f3c8f8 100644
--- a/framework/meta/src/cmd/template/contract_creator.rs
+++ b/framework/meta/src/cmd/template/contract_creator.rs
@@ -18,7 +18,13 @@ 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);
 }
@@ -59,6 +65,7 @@ impl<'a> ContractCreator<'a> {
         template_name: String,
         target: ContractCreatorTarget,
         keep_paths: bool,
+        new_author: Option<String>,
     ) -> Self {
         let template_sources = template_sources(repo_source);
         let template_source = template_sources
@@ -75,6 +82,7 @@ impl<'a> ContractCreator<'a> {
                 metadata,
                 target,
                 keep_paths,
+                new_author,
             },
         }
     }
@@ -91,7 +99,7 @@ impl<'a> ContractCreator<'a> {
     }
 
     pub fn update_dependencies(&self, args_tag: FrameworkVersion) {
-        self.adjuster.update_dependencies(args_tag);
+        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 e1ac5ad827..0aca5b5fb8 100644
--- a/framework/meta/src/cmd/template/template_adjuster.rs
+++ b/framework/meta/src/cmd/template/template_adjuster.rs
@@ -5,7 +5,7 @@ use crate::{
     version_history::is_template_with_autogenerated_wasm,
 };
 use convert_case::{Case, Casing};
-use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use multiversx_sc_meta_lib::cargo_toml::CargoTomlContents;
 use ruplacer::Query;
 use toml::value::Table;
 
@@ -14,22 +14,28 @@ 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";
+const INTERACT_CARGO_TOML: &str = "./interactor/Cargo.toml";
+const DEFAULT_AUTHOR: &str = "you";
 
 pub struct TemplateAdjuster {
     pub metadata: TemplateMetadata,
     pub target: ContractCreatorTarget,
     pub keep_paths: bool,
+    pub new_author: Option<String>,
 }
 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_cargo_toml_files(&self, args_tag: FrameworkVersion) {
+        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);
+        self.update_cargo_toml_interact(author_as_str);
     }
 
-    fn update_dependencies_root(&self) {
+    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);
 
@@ -38,15 +44,15 @@ impl TemplateAdjuster {
         }
 
         if self.metadata.has_interactor {
-            toml.add_workspace(&[".", "meta", "interact"]);
+            toml.add_workspace(&[".", "meta", "interactor"]);
         } else {
             toml.add_workspace(&[".", "meta"]);
         }
-
+        toml.change_author(author);
         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 +63,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 +78,7 @@ impl TemplateAdjuster {
         toml.save_to_file(&cargo_toml_path);
     }
 
-    fn update_dependencies_interact(&self) {
+    fn update_cargo_toml_interact(&self, author: String) {
         if !self.metadata.has_interactor {
             return;
         }
@@ -84,6 +90,7 @@ impl TemplateAdjuster {
             remove_paths_from_deps(&mut toml, &[&self.metadata.name]);
         }
 
+        toml.change_author(author);
         toml.save_to_file(&cargo_toml_path);
     }
 
diff --git a/framework/meta/src/cmd/test.rs b/framework/meta/src/cmd/test.rs
index 828d9c9859..18e5657a97 100644
--- a/framework/meta/src/cmd/test.rs
+++ b/framework/meta/src/cmd/test.rs
@@ -12,6 +12,7 @@ pub fn test(test_args: &TestArgs) {
     let go = test_args.go;
     let scen = test_args.scen;
     let no_capture = test_args.nocapture;
+    let chain_simulator = test_args.chain_simulator;
 
     if scen {
         program = "mx-scenario-go";
@@ -27,6 +28,10 @@ pub fn test(test_args: &TestArgs) {
             args.extend(["--features", "multiversx-sc-scenario/run-go-tests"]);
         }
 
+        if chain_simulator {
+            args.extend(["--features", "chain-simulator-tests"]);
+        }
+
         if no_capture {
             args.extend(["--", "--nocapture"]);
         }
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();
         },
     };
diff --git a/framework/meta/src/cmd/upgrade.rs b/framework/meta/src/cmd/upgrade.rs
index ab14b75075..b4b9a28904 100644
--- a/framework/meta/src/cmd/upgrade.rs
+++ b/framework/meta/src/cmd/upgrade.rs
@@ -8,5 +8,4 @@ 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/upgrade/upgrade_0_39.rs b/framework/meta/src/cmd/upgrade/upgrade_0_39.rs
index 2f04a01610..91907d47f1 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_0_39.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_39.rs
@@ -7,7 +7,7 @@ use super::{
     upgrade_print::*,
 };
 use crate::folder_structure::{DirectoryType, RelevantDirectory};
-use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use multiversx_sc_meta_lib::cargo_toml::CargoTomlContents;
 use ruplacer::Query;
 use toml::{value::Table, Value};
 
diff --git a/framework/meta/src/cmd/upgrade/upgrade_0_45.rs b/framework/meta/src/cmd/upgrade/upgrade_0_45.rs
index 7082f92f97..a7ba21dc62 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_0_45.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_45.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 
 use super::upgrade_common::version_bump_in_cargo_toml;
 use crate::folder_structure::{DirectoryType, RelevantDirectory};
-use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use multiversx_sc_meta_lib::cargo_toml::CargoTomlContents;
 use toml::Value;
 
 /// Migrate `0.44.0` to `0.45.0`, including the version bump.
diff --git a/framework/meta/src/cmd/upgrade/upgrade_0_51.rs b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
index d5f4cdb03a..a168cbfa62 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_0_51.rs
@@ -1,7 +1,7 @@
 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 multiversx_sc_meta_lib::cargo_toml::CargoTomlContents;
 use ruplacer::Query;
 use std::path::Path;
 use toml::Value;
diff --git a/framework/meta/src/cmd/upgrade/upgrade_common.rs b/framework/meta/src/cmd/upgrade/upgrade_common.rs
index 5d97cbafe6..3678051527 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_common.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_common.rs
@@ -2,12 +2,12 @@ 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,
+        DirectoryType, RelevantDirectory, 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 multiversx_sc_meta_lib::cargo_toml::{
+    CargoTomlContents, VersionReq, CARGO_TOML_DEPENDENCIES, CARGO_TOML_DEV_DEPENDENCIES,
 };
 use ruplacer::{Console, DirectoryPatcher, Query, Settings};
 use std::{
@@ -179,7 +179,7 @@ fn change_version_string(
     framework_crate_name: &str,
 ) {
     let version_string_before = version_string.clone();
-    let mut version_spec = VersionReq::from_string(std::mem::take(version_string));
+    let mut version_spec = VersionReq::from_version_str(&std::mem::take(version_string));
     if version_spec.semver == *from_version {
         version_spec.semver = to_version.clone();
     }
diff --git a/framework/meta/src/cmd/upgrade/upgrade_print.rs b/framework/meta/src/cmd/upgrade/upgrade_print.rs
index 51d66f9333..a531d66338 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_print.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_print.rs
@@ -1,11 +1,6 @@
-use crate::{
-    folder_structure::{
-        DirectoryType::{Contract, Lib},
-        RelevantDirectory,
-    },
-    version::FrameworkVersion,
-};
+use crate::{folder_structure::RelevantDirectory, version::FrameworkVersion};
 use colored::Colorize;
+use multiversx_sc_meta_lib::cargo_toml::DependencyReference;
 use std::path::Path;
 
 pub fn print_upgrading(dir: &RelevantDirectory) {
@@ -82,20 +77,6 @@ pub fn print_postprocessing_after_39_1(path: &Path) {
     );
 }
 
-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 {
-        print!(" {}", version_string.green());
-    } else {
-        print!(" {}", version_string.red());
-    };
-}
-
 pub fn print_cargo_dep_remove(path: &Path, dep_name: &str) {
     println!(
         "{}/dependencies/{}",
@@ -113,15 +94,17 @@ pub fn print_cargo_dep_add(path: &Path, dep_name: &str) {
 }
 
 pub fn print_cargo_check(dir: &RelevantDirectory) {
-    println!(
-        "\n{}",
-        format!(
-            "Running cargo check after upgrading to version {} in {}\n",
-            dir.version.semver,
-            dir.path.display(),
-        )
-        .purple()
-    );
+    if let DependencyReference::Version(version_req) = &dir.version {
+        println!(
+            "\n{}",
+            format!(
+                "Running cargo check after upgrading to version {} in {}\n",
+                version_req.semver,
+                dir.path.display(),
+            )
+            .purple()
+        );
+    }
 }
 
 pub fn print_cargo_check_fail() {
diff --git a/framework/meta/src/cmd/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
index 0f958b176e..5031339220 100644
--- a/framework/meta/src/cmd/upgrade/upgrade_selector.rs
+++ b/framework/meta/src/cmd/upgrade/upgrade_selector.rs
@@ -1,6 +1,6 @@
 use crate::{
     cli::UpgradeArgs,
-    cmd::upgrade::upgrade_settings::UpgradeSettings,
+    cmd::{print_util::print_tree_dir_metadata, upgrade::upgrade_settings::UpgradeSettings},
     folder_structure::{dir_pretty_print, RelevantDirectories, RelevantDirectory},
     version::FrameworkVersion,
     version_history::{versions_iter, CHECK_AFTER_UPGRADE_TO, LAST_UPGRADE_VERSION, VERSIONS},
diff --git a/framework/meta/src/cmd/wallet.rs b/framework/meta/src/cmd/wallet.rs
new file mode 100644
index 0000000000..d8fd1f097c
--- /dev/null
+++ b/framework/meta/src/cmd/wallet.rs
@@ -0,0 +1,175 @@
+use core::str;
+
+use crate::cli::{WalletAction, WalletArgs, WalletBech32Args, WalletConvertArgs, WalletNewArgs};
+use multiversx_sc::types::{self, Address};
+use multiversx_sc_snippets::sdk::bech32;
+use multiversx_sc_snippets::sdk::{crypto::public_key::PublicKey, 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 {
+        WalletAction::New(new_args) => new(new_args),
+        WalletAction::Bech32(bech32_args) => bech32_conversion(bech32_args),
+        WalletAction::Convert(convert_args) => convert(convert_args),
+    }
+}
+
+fn convert(convert_args: &WalletConvertArgs) {
+    let infile = convert_args.infile.as_ref();
+    let outfile = convert_args.outfile.as_ref();
+    let in_format = &convert_args.from;
+    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();
+                (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();
+                (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");
+        },
+    }
+}
+
+fn write_resulted_pem(public_key: &str, private_key: &str, outfile: Option<&String>) {
+    let address = get_wallet_address(private_key);
+    match outfile {
+        Some(outfile) => {
+            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 = Wallet::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();
+
+    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_address(private_key: &str) -> Address {
+    let wallet = Wallet::from_private_key(private_key).unwrap();
+    wallet.to_address()
+}
+
+fn new(new_args: &WalletNewArgs) {
+    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) = Wallet::get_wallet_keys_mnemonic(mnemonic.to_string());
+    let address = get_wallet_address(private_key_str.as_str());
+
+    println!("Wallet address: {}", bech32::encode(&address));
+
+    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 => {},
+    }
+}
diff --git a/framework/meta/src/folder_structure.rs b/framework/meta/src/folder_structure.rs
index f55ce581ff..8386362bc4 100644
--- a/framework/meta/src/folder_structure.rs
+++ b/framework/meta/src/folder_structure.rs
@@ -1,7 +1,5 @@
 mod pretty_print;
 mod relevant_directory;
-mod version_req;
 
 pub use pretty_print::*;
 pub use relevant_directory::*;
-pub use version_req::*;
diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs
index be0c4ce0ac..13badaa006 100644
--- a/framework/meta/src/folder_structure/relevant_directory.rs
+++ b/framework/meta/src/folder_structure/relevant_directory.rs
@@ -1,12 +1,11 @@
 use crate::version::FrameworkVersion;
-use multiversx_sc_meta_lib::cargo_toml_contents::CargoTomlContents;
+use multiversx_sc_meta_lib::cargo_toml::{CargoTomlContents, DependencyReference};
 use std::{
     fs::{self, DirEntry},
     path::{Path, PathBuf},
 };
-use toml::Value;
 
-use super::version_req::VersionReq;
+// use super::{version_req::VersionReq, DependencyReference, GitReference};
 
 /// Used for retrieving crate versions.
 pub const FRAMEWORK_CRATE_NAMES: &[&str] = &[
@@ -35,7 +34,7 @@ pub enum DirectoryType {
 #[derive(Debug, Clone)]
 pub struct RelevantDirectory {
     pub path: PathBuf,
-    pub version: VersionReq,
+    pub version: DependencyReference,
     pub upgrade_in_progress: Option<(FrameworkVersion, FrameworkVersion)>,
     pub dir_type: DirectoryType,
 }
@@ -89,7 +88,7 @@ impl RelevantDirectories {
     pub fn count_for_version(&self, version: &FrameworkVersion) -> usize {
         self.0
             .iter()
-            .filter(|dir| dir.version.semver == *version)
+            .filter(|dir| dir.version.is_framework_version(version))
             .count()
     }
 
@@ -99,13 +98,13 @@ impl RelevantDirectories {
     ) -> impl Iterator<Item = &RelevantDirectory> {
         self.0
             .iter()
-            .filter(move |dir| dir.version.semver == *version)
+            .filter(move |dir| dir.version.is_framework_version(version))
     }
 
     /// Marks all appropriate directories as ready for upgrade.
     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 {
+            if dir.version.is_framework_version(&from_version) {
                 dir.upgrade_in_progress = Some((from_version.clone(), to_version.clone()));
             }
         }
@@ -116,7 +115,9 @@ impl RelevantDirectories {
     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.clone();
+                if let DependencyReference::Version(version_req) = &mut dir.version {
+                    version_req.semver = to_version.clone();
+                }
                 dir.upgrade_in_progress = None;
             }
         }
@@ -136,7 +137,7 @@ fn populate_directories(path: &Path, ignore: &[String], result: &mut Vec<Relevan
         }
     }
 
-    if let Some(version) = find_framework_version(path) {
+    if let Some(version) = find_framework_dependency(path) {
         let dir_type = if is_contract {
             DirectoryType::Contract
         } else {
@@ -172,18 +173,6 @@ fn can_continue_recursion(dir_entry: &DirEntry, blacklist: &[String]) -> bool {
     }
 }
 
-fn find_framework_version_string(cargo_toml_contents: &CargoTomlContents) -> Option<String> {
-    for &crate_name in FRAMEWORK_CRATE_NAMES {
-        if let Some(old_base) = cargo_toml_contents.dependency(crate_name) {
-            if let Some(Value::String(s)) = old_base.get("version") {
-                return Some(s.clone());
-            }
-        }
-    }
-
-    None
-}
-
 fn load_cargo_toml_contents(dir_path: &Path) -> Option<CargoTomlContents> {
     let cargo_toml_path = dir_path.join(CARGO_TOML_FILE_NAME);
     if cargo_toml_path.is_file() {
@@ -200,10 +189,12 @@ impl RelevantDirectory {
     }
 }
 
-fn find_framework_version(dir_path: &Path) -> Option<VersionReq> {
+fn find_framework_dependency(dir_path: &Path) -> Option<DependencyReference> {
     if let Some(cargo_toml_contents) = load_cargo_toml_contents(dir_path) {
-        if let Some(version) = find_framework_version_string(&cargo_toml_contents) {
-            return Some(VersionReq::from_string(version));
+        for &crate_name in FRAMEWORK_CRATE_NAMES {
+            if let Some(dep_raw) = cargo_toml_contents.dependency_raw_value(crate_name) {
+                return Some(dep_raw.interpret());
+            }
         }
     }
 
diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs
index 4b0fc0bc23..7a52398ff8 100644
--- a/framework/meta/tests/template_test.rs
+++ b/framework/meta/tests/template_test.rs
@@ -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,11 +85,18 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) {
 
     prepare_target_dir(&target);
 
+    let author = if new_author.is_empty() {
+        None
+    } else {
+        Some(new_author.to_string())
+    };
+
     ContractCreator::new(
         &repo_source,
         template_name.to_string(),
         target.clone(),
         true,
+        author,
     )
     .create_contract(LAST_TEMPLATE_VERSION);
 
@@ -97,7 +109,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 +121,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 +135,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,11 +153,18 @@ fn template_test_released(template_name: &str, new_name: &str) {
 
     prepare_target_dir(&target);
 
+    let author = if new_author.is_empty() {
+        None
+    } else {
+        Some(new_author.to_string())
+    };
+
     ContractCreator::new(
         &repo_source,
         template_name.to_string(),
         target.clone(),
         false,
+        author,
     )
     .create_contract(LAST_TEMPLATE_VERSION);
 
@@ -209,7 +232,7 @@ fn cargo_check_interactor(sub_path: &str, new_name: &str) {
         .join(TEMPLATE_TEMP_DIR_NAME)
         .join(sub_path)
         .join(new_name)
-        .join("interact");
+        .join("interactor");
 
     let exit_status = Command::new("cargo")
         .arg("check")
diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml
index 25e43afdef..c019233953 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.54.1"
 edition = "2021"
 
 authors = [
@@ -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"
@@ -32,21 +32,21 @@ 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]
-version = "=0.51.1"
+version = "=0.54.1"
 features = ["alloc", "num-bigint"]
 path = "../base"
 
 [dependencies.multiversx-sc-meta-lib]
-version = "=0.51.1"
+version = "=0.54.1"
 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]
@@ -55,5 +55,5 @@ git = "https://github.com/multiversx/mx-vm-executor-rs"
 branch = "rc/v1.7.next1"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.9.0"
-path = "../../vm"
+version = "=0.11.0"
+path = "../../chain/vm"
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..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!")
     }
 
@@ -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,
+    ) {
+        panic!("verify_secp256r1 not implemented yet!")
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) {
+        panic!("verify_bls_signature_share not implemented yet!")
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        _key: Self::ManagedBufferHandle,
+        _message: Self::ManagedBufferHandle,
+        _signature: Self::ManagedBufferHandle,
+    ) {
+        panic!("verify_bls_aggregated_signature not implemented yet!")
+    }
 }
diff --git a/framework/scenario/src/api/impl_vh/debug_api.rs b/framework/scenario/src/api/impl_vh/debug_api.rs
index b493047686..43bed2fe5d 100644
--- a/framework/scenario/src/api/impl_vh/debug_api.rs
+++ b/framework/scenario/src/api/impl_vh/debug_api.rs
@@ -5,7 +5,7 @@ use multiversx_chain_vm::{
     tx_mock::{TxContext, TxContextRef, TxContextStack, TxPanic},
     vm_hooks::{DebugApiVMHooksHandler, VMHooksDispatcher},
 };
-use multiversx_sc::err_msg;
+use multiversx_sc::{chain_core::types::ReturnCode, err_msg};
 
 use crate::debug_executor::{StaticVarData, StaticVarStack};
 
@@ -61,7 +61,7 @@ impl VMHooksApiBackend for DebugApiBackend {
     fn assert_live_handle(handle: &Self::HandleType) {
         if !handle.is_on_current_context() {
             debugger_panic(
-                err_msg::DEBUG_API_ERR_STATUS,
+                ReturnCode::DebugApiError,
                 err_msg::DEBUG_API_ERR_HANDLE_STALE,
             );
         }
@@ -93,7 +93,7 @@ impl std::fmt::Debug for DebugApi {
     }
 }
 
-fn debugger_panic(status: u64, message: &str) {
+fn debugger_panic(status: ReturnCode, message: &str) {
     TxContextRef::new_from_static().replace_tx_result_with_error(TxPanic::new(status, message));
     std::panic::panic_any(BreakpointValue::SignalError);
 }
@@ -101,7 +101,7 @@ fn debugger_panic(status: u64, message: &str) {
 fn assert_handles_on_same_context(handle1: &DebugHandle, handle2: &DebugHandle) {
     if !handle1.is_on_same_context(handle2) {
         debugger_panic(
-            err_msg::DEBUG_API_ERR_STATUS,
+            ReturnCode::DebugApiError,
             err_msg::DEBUG_API_ERR_HANDLE_CONTEXT_MISMATCH,
         );
     }
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 0623270758..99dc7c6e87 100644
--- a/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
+++ b/framework/scenario/src/api/impl_vh/debug_handle_vh.rs
@@ -93,8 +93,8 @@ impl ManagedVecItem for DebugHandle {
         use_raw_handle(RawHandle::from_byte_reader(reader))
     }
 
-    fn to_byte_writer<R, Writer: FnMut(&[u8]) -> R>(&self, writer: Writer) -> R {
-        RawHandle::to_byte_writer(&self.get_raw_handle(), writer)
+    fn into_byte_writer<R, Writer: FnMut(&[u8]) -> R>(self, writer: Writer) -> R {
+        RawHandle::into_byte_writer(self.get_raw_handle(), writer)
     }
 }
 
diff --git a/framework/scenario/src/api/impl_vh/static_api.rs b/framework/scenario/src/api/impl_vh/static_api.rs
index 7e375a0c31..d4941a60db 100644
--- a/framework/scenario/src/api/impl_vh/static_api.rs
+++ b/framework/scenario/src/api/impl_vh/static_api.rs
@@ -55,7 +55,7 @@ impl StaticApi {
     ///
     /// This placeholder then needs to be converted to something useful.
     pub fn is_current_address_placeholder(address: &Address) -> bool {
-        address.as_array() == StaticApiVMHooksHandler::CURRENT_ADDRESS_PLACEHOLDER.as_array()
+        address == &StaticApiVMHooksHandler::CURRENT_ADDRESS_PLACEHOLDER
     }
 
     pub fn reset() {
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/framework/scenario/src/debug_executor/contract_container.rs b/framework/scenario/src/debug_executor/contract_container.rs
index 8d89062d15..188bd6bdd5 100644
--- a/framework/scenario/src/debug_executor/contract_container.rs
+++ b/framework/scenario/src/debug_executor/contract_container.rs
@@ -1,6 +1,6 @@
 use multiversx_chain_vm::tx_mock::{TxContextRef, TxFunctionName, TxPanic};
 use multiversx_chain_vm_executor::{BreakpointValue, ExecutorError, Instance, MemLength, MemPtr};
-use multiversx_sc::contract_base::CallableContract;
+use multiversx_sc::{chain_core::types::ReturnCode, contract_base::CallableContract};
 use std::sync::Arc;
 
 use super::{catch_tx_panic, StaticVarStack};
@@ -81,7 +81,10 @@ impl Instance for ContractContainerRef {
             if call_successful {
                 Ok(())
             } else {
-                Err(TxPanic::new(1, "invalid function (not found)"))
+                Err(TxPanic::new(
+                    ReturnCode::FunctionNotFound,
+                    "invalid function (not found)",
+                ))
             }
         });
 
diff --git a/framework/scenario/src/facade/result_handlers.rs b/framework/scenario/src/facade/result_handlers.rs
index 1893647b45..0df62dae43 100644
--- a/framework/scenario/src/facade/result_handlers.rs
+++ b/framework/scenario/src/facade/result_handlers.rs
@@ -2,18 +2,26 @@ mod expect_error;
 mod expect_message;
 mod expect_status;
 mod expect_value;
+mod returns_gas_used;
+mod returns_handled_or_err;
+mod returns_logs;
 mod returns_message;
 mod returns_new_bech32_address;
 mod returns_new_token_identifier;
 mod returns_status;
+mod returns_tx_hash;
 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_gas_used::ReturnsGasUsed;
+pub use returns_handled_or_err::ReturnsHandledOrError;
+pub use returns_logs::ReturnsLogs;
 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 returns_tx_hash::ReturnsTxHash;
 pub use with_tx_raw_response::WithRawTxResponse;
diff --git a/framework/scenario/src/facade/result_handlers/returns_gas_used.rs b/framework/scenario/src/facade/result_handlers/returns_gas_used.rs
new file mode 100644
index 0000000000..e8bc605224
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_gas_used.rs
@@ -0,0 +1,22 @@
+use multiversx_sc::types::{RHListItem, RHListItemExec, TxEnv};
+
+use crate::scenario_model::TxResponse;
+
+/// Indicates that the newly deployed address will be returned after a deploy.
+pub struct ReturnsGasUsed;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsGasUsed
+where
+    Env: TxEnv,
+{
+    type Returns = u64;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsGasUsed
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, tx_response: &TxResponse) -> Self::Returns {
+        tx_response.gas_used
+    }
+}
diff --git a/framework/scenario/src/facade/result_handlers/returns_handled_or_err.rs b/framework/scenario/src/facade/result_handlers/returns_handled_or_err.rs
new file mode 100644
index 0000000000..12dede24ff
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_handled_or_err.rs
@@ -0,0 +1,96 @@
+use std::marker::PhantomData;
+
+use multiversx_sc::{
+    tuple_util::NestedTupleFlatten,
+    types::{
+        OriginalResultMarker, RHList, RHListAppendRet, RHListExec, RHListItem, RHListItemExec,
+        TxEnv,
+    },
+};
+
+use crate::scenario_model::{CheckValue, TxExpect, TxResponse, TxResponseStatus};
+
+/// Indicates that a `Result` will be returned, either with the handled result,
+/// according to the nested result handlers, or with an error in case of a failed transaction.
+pub struct ReturnsHandledOrError<Env, Original, NHList>
+where
+    Env: TxEnv,
+    NHList: RHList<Env>,
+{
+    _phantom_env: PhantomData<Env>,
+    _phantom_original: PhantomData<Original>,
+    pub nested_handlers: NHList,
+}
+
+impl<Env, Original> Default for ReturnsHandledOrError<Env, Original, OriginalResultMarker<Original>>
+where
+    Env: TxEnv,
+{
+    fn default() -> Self {
+        ReturnsHandledOrError {
+            _phantom_env: PhantomData,
+            _phantom_original: PhantomData,
+            nested_handlers: OriginalResultMarker::new(),
+        }
+    }
+}
+
+impl<Env, Original> ReturnsHandledOrError<Env, Original, OriginalResultMarker<Original>>
+where
+    Env: TxEnv,
+{
+    pub fn new() -> Self {
+        ReturnsHandledOrError::default()
+    }
+}
+
+impl<Env, Original, NHList> ReturnsHandledOrError<Env, Original, NHList>
+where
+    Env: TxEnv,
+    NHList: RHListExec<TxResponse, Env>,
+{
+    pub fn returns<RH>(self, item: RH) -> ReturnsHandledOrError<Env, Original, NHList::RetOutput>
+    where
+        RH: RHListItem<Env, NHList::OriginalResult>,
+        NHList: RHListAppendRet<Env, RH>,
+    {
+        ReturnsHandledOrError {
+            _phantom_env: PhantomData,
+            _phantom_original: PhantomData,
+            nested_handlers: self.nested_handlers.append_ret(item),
+        }
+    }
+}
+
+impl<Env, Original, NHList> RHListItem<Env, Original>
+    for ReturnsHandledOrError<Env, Original, NHList>
+where
+    Env: TxEnv,
+    NHList: RHListExec<TxResponse, Env>,
+    NHList::ListReturns: NestedTupleFlatten,
+{
+    type Returns = Result<<NHList::ListReturns as NestedTupleFlatten>::Unpacked, TxResponseStatus>;
+}
+
+impl<Env, Original, NHList> RHListItemExec<TxResponse, Env, Original>
+    for ReturnsHandledOrError<Env, Original, NHList>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    NHList: RHListExec<TxResponse, Env>,
+    NHList::ListReturns: NestedTupleFlatten,
+{
+    fn item_tx_expect(&self, mut prev: TxExpect) -> TxExpect {
+        prev.status = CheckValue::Star;
+        prev.message = CheckValue::Star;
+        prev
+    }
+
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        if raw_result.tx_error.is_success() {
+            let tuple_result = self.nested_handlers.list_process_result(raw_result);
+            Ok(tuple_result.flatten_unpack())
+        } else {
+            Err(raw_result.tx_error.clone())
+        }
+    }
+}
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/framework/scenario/src/facade/result_handlers/returns_status.rs b/framework/scenario/src/facade/result_handlers/returns_status.rs
index 184163619d..30eba0730c 100644
--- a/framework/scenario/src/facade/result_handlers/returns_status.rs
+++ b/framework/scenario/src/facade/result_handlers/returns_status.rs
@@ -31,6 +31,6 @@ where
     }
 
     fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
-        raw_result.tx_error.status
+        raw_result.tx_error.status.as_u64()
     }
 }
diff --git a/framework/scenario/src/facade/result_handlers/returns_tx_hash.rs b/framework/scenario/src/facade/result_handlers/returns_tx_hash.rs
new file mode 100644
index 0000000000..fb30ea1ff3
--- /dev/null
+++ b/framework/scenario/src/facade/result_handlers/returns_tx_hash.rs
@@ -0,0 +1,25 @@
+use multiversx_chain_vm::types::H256;
+use multiversx_sc::types::RHListItemExec;
+
+use crate::{
+    multiversx_sc::types::{RHListItem, TxEnv},
+    scenario_model::TxResponse,
+};
+
+pub struct ReturnsTxHash;
+
+impl<Env, Original> RHListItem<Env, Original> for ReturnsTxHash
+where
+    Env: TxEnv,
+{
+    type Returns = H256;
+}
+
+impl<Env, Original> RHListItemExec<TxResponse, Env, Original> for ReturnsTxHash
+where
+    Env: TxEnv,
+{
+    fn item_process_result(self, raw_result: &TxResponse) -> Self::Returns {
+        raw_result.tx_hash.clone().expect("missing tx hash")
+    }
+}
diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs
index 056cbbe7f7..afaffbf1c3 100644
--- a/framework/scenario/src/facade/scenario_world.rs
+++ b/framework/scenario/src/facade/scenario_world.rs
@@ -21,7 +21,7 @@ pub struct ScenarioWorld {
 }
 
 pub(crate) enum Backend {
-    Debugger(DebuggerBackend),
+    Debugger(Box<DebuggerBackend>),
     VmGoBackend,
 }
 
@@ -35,10 +35,10 @@ impl ScenarioWorld {
     pub fn debugger() -> Self {
         ScenarioWorld {
             current_dir: std::env::current_dir().unwrap(),
-            backend: Backend::Debugger(DebuggerBackend {
+            backend: Backend::Debugger(Box::new(DebuggerBackend {
                 vm_runner: ScenarioVMRunner::new(),
                 trace: None,
-            }),
+            })),
         }
     }
 
@@ -103,11 +103,8 @@ impl ScenarioWorld {
         self
     }
 
-    /// 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.")]
+    /// 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();
         path.push(relative_path);
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>,
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_exec_call.rs b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
index 8905c7d14d..9c1551111b 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_call.rs
@@ -52,7 +52,7 @@ impl<'w> TxEnvMockDeployAddress for ScenarioEnvExec<'w> {
             .world
             .get_state()
             .accounts
-            .get(&from_value.to_vm_address())
+            .get(&from_value.to_address())
             .expect("sender does not exist")
             .nonce;
         let new_address_value = address_annotated(self, &new_address);
@@ -85,7 +85,6 @@ 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()
     }
@@ -111,7 +110,6 @@ 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()
     }
@@ -119,8 +117,11 @@ where
 
 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");
-        self.data.tx_hash = Some(tx_hash);
+        self.data.set_tx_hash(tx_hash);
+    }
+
+    fn take_tx_hash(&mut self) -> Option<H256> {
+        self.data.take_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 40fbbaa878..866d4f562f 100644
--- a/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_exec_deploy.rs
@@ -35,7 +35,6 @@ 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_set_state.rs b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
index d036d647cd..3fd44d70b3 100644
--- a/framework/scenario/src/facade/world_tx/scenario_set_state.rs
+++ b/framework/scenario/src/facade/world_tx/scenario_set_state.rs
@@ -73,7 +73,7 @@ impl ScenarioWorld {
         let balance_value = big_uint_annotated(&env, &balance);
         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() {
+            if vm_address_key == &address_value.to_address() {
                 account.egld_balance.clone_from(&balance_value.value);
             }
         }
@@ -88,8 +88,8 @@ impl ScenarioWorld {
         let address_value = address_annotated(&env, &address);
         let balance_value = big_uint_annotated(&env, &balance);
         let accounts = &mut self.get_mut_state().accounts;
-        for (vm_address, account) in accounts.iter_mut() {
-            if vm_address == &address_value.to_vm_address() {
+        for (address, account) in accounts.iter_mut() {
+            if address == &address_value.to_address() {
                 account.esdt.set_esdt_balance(
                     token_id.to_vec(),
                     0,
@@ -129,8 +129,8 @@ impl ScenarioWorld {
         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 == &address_value.to_vm_address() {
+        for (account_address, account) in accounts.iter_mut() {
+            if account_address == &address_value.to_address() {
                 account.esdt.set_esdt_balance(
                     token_id.to_vec(),
                     nonce_value.value,
@@ -138,7 +138,7 @@ impl ScenarioWorld {
                     EsdtInstanceMetadata {
                         creator: creator
                             .as_ref()
-                            .map(|c| address_annotated(&env, c).to_vm_address()),
+                            .map(|c| address_annotated(&env, c).to_address()),
                         attributes: esdt_attributes.clone(),
                         royalties: royalties_value.value,
                         name: name.unwrap_or_default().to_vec(),
@@ -156,8 +156,8 @@ impl ScenarioWorld {
         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() {
+        for (account_address, account) in accounts.iter_mut() {
+            if account_address == &AddressKey::from(address).to_address() {
                 account
                     .developer_rewards
                     .clone_from(&BigUintValue::from(developer_rewards).value);
@@ -172,8 +172,8 @@ impl ScenarioWorld {
         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 == &address_value.to_vm_address() {
+        for (account_address, account) in accounts.iter_mut() {
+            if account_address == &address_value.to_address() {
                 account.esdt.set_roles(
                     token_id.to_vec(),
                     roles
@@ -231,7 +231,7 @@ impl<'w> SetStateBuilderBase<'w> {
                 .vm_runner
                 .blockchain_mock
                 .state
-                .account_exists(&address.to_vm_address()),
+                .account_exists(&address.to_address()),
             "updating existing accounts currently not supported"
         );
 
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 339ed9b38b..c3a2a1c204 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,5 @@
 use multiversx_chain_scenario_format::interpret_trait::InterpreterContext;
-use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv, H256};
+use multiversx_sc::types::{ManagedAddress, ManagedBuffer, TxEnv, TxEnvWithTxHash, H256};
 
 use crate::{api::StaticApi, scenario_model::TxExpect, ScenarioWorld};
 
@@ -33,6 +33,17 @@ impl TxEnv for ScenarioTxEnvData {
     }
 }
 
+impl TxEnvWithTxHash for ScenarioTxEnvData {
+    fn set_tx_hash(&mut self, tx_hash: H256) {
+        assert!(self.tx_hash.is_none(), "tx hash set twice");
+        self.tx_hash = Some(tx_hash);
+    }
+
+    fn take_tx_hash(&mut self) -> Option<H256> {
+        core::mem::take(&mut self.tx_hash)
+    }
+}
+
 impl ScenarioTxEnvData {
     pub fn interpreter_context(&self) -> InterpreterContext {
         self.interpreter_context.clone()
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..62842a6e25
--- /dev/null
+++ b/framework/scenario/src/facade/world_tx/scenario_tx_whitebox.rs
@@ -0,0 +1,217 @@
+use crate::debug_executor::contract_instance_wrapped_execution;
+use crate::scenario::tx_to_step::TxToQueryStep;
+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::{
+        Code, DeployCall, FunctionCall, RHListExec, Tx, TxCodeValue, TxFromSpecified, TxNoPayment,
+        TxPayment, TxToSpecified,
+    },
+};
+
+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,
+        F: FnOnce(ContractObj);
+}
+
+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>(
+        self,
+        contract_obj_builder: fn() -> ContractObj,
+        f: F,
+    ) -> 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
+            .world
+            .get_mut_debugger_backend()
+            .vm_runner
+            .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()
+    }
+}
+
+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
+    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),
+    {
+        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
+        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, || {
+                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()
+    }
+}
+
+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
+    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),
+    {
+        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
+        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_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()
+    }
+}
diff --git a/framework/scenario/src/imports.rs b/framework/scenario/src/imports.rs
index 171862dc9a..b82583b97c 100644
--- a/framework/scenario/src/imports.rs
+++ b/framework/scenario/src/imports.rs
@@ -24,3 +24,5 @@ pub use crate::{
     whitebox_legacy::*,
     ScenarioTxRun,
 };
+
+pub use crate::multiversx_sc::chain_core::types::ReturnCode;
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 4a68bfa000..8d8d71b0e8 100644
--- a/framework/scenario/src/scenario/model/step/sc_call_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_call_step.rs
@@ -205,12 +205,16 @@ impl ScCallStep {
             .expect("SC call response not yet available")
     }
 
-    pub fn save_response(&mut self, tx_response: TxResponse) {
+    pub fn save_response(&mut self, mut tx_response: TxResponse) {
         if let Some(expect) = &mut self.expect {
             if expect.build_from_response {
                 expect.update_from_response(&tx_response)
             }
         }
+        tx_response.tx_hash = self
+            .explicit_tx_hash
+            .as_ref()
+            .map(|vm_hash| vm_hash.as_array().into());
         self.response = Some(tx_response);
     }
 }
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 7e520e1a17..6090cfd492 100644
--- a/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
+++ b/framework/scenario/src/scenario/model/step/sc_deploy_step.rs
@@ -135,13 +135,17 @@ impl ScDeployStep {
             .expect("SC deploy response not yet available")
     }
 
-    pub fn save_response(&mut self, response: TxResponse) {
+    pub fn save_response(&mut self, mut tx_response: TxResponse) {
         if let Some(expect) = &mut self.expect {
             if expect.build_from_response {
-                expect.update_from_response(&response)
+                expect.update_from_response(&tx_response)
             }
         }
-        self.response = Some(response);
+        tx_response.tx_hash = self
+            .explicit_tx_hash
+            .as_ref()
+            .map(|vm_hash| vm_hash.as_array().into());
+        self.response = Some(tx_response);
     }
 }
 
diff --git a/framework/scenario/src/scenario/model/transaction/log.rs b/framework/scenario/src/scenario/model/transaction/log.rs
index 27ebccfd08..803c521bbf 100644
--- a/framework/scenario/src/scenario/model/transaction/log.rs
+++ b/framework/scenario/src/scenario/model/transaction/log.rs
@@ -1,9 +1,9 @@
-use crate::scenario_model::BytesValue;
+use multiversx_sc::types::Address;
 
 #[derive(Debug, Clone)]
 pub struct Log {
-    pub address: BytesValue,
-    pub endpoint: BytesValue,
-    pub topics: Vec<BytesValue>,
-    pub data: BytesValue,
+    pub address: Address,
+    pub endpoint: String,
+    pub topics: Vec<Vec<u8>>,
+    pub data: Vec<Vec<u8>>,
 }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_error.rs b/framework/scenario/src/scenario/model/transaction/tx_error.rs
deleted file mode 100644
index d0a2b5a3e4..0000000000
--- a/framework/scenario/src/scenario/model/transaction/tx_error.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#[derive(Debug, Default, Clone)]
-pub struct TxResponseStatus {
-    pub status: u64,
-    pub message: String,
-}
-
-impl TxResponseStatus {
-    pub fn is_success(&self) -> bool {
-        self.status == 0
-    }
-}
-
-impl std::fmt::Display for TxResponseStatus {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if self.is_success() {
-            write!(f, "transaction successful")
-        } else {
-            write!(f, "transaction error: {}", self.message)
-        }
-    }
-}
diff --git a/framework/scenario/src/scenario/model/transaction/tx_expect.rs b/framework/scenario/src/scenario/model/transaction/tx_expect.rs
index d487a10db5..875dc2a280 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_expect.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_expect.rs
@@ -8,8 +8,7 @@ use crate::{
     scenario_model::Checkable,
 };
 use multiversx_chain_vm::tx_mock::result_values_to_string;
-
-const USER_ERROR_CODE: u64 = 4;
+use multiversx_sc::chain_core::types::ReturnCode;
 
 #[derive(Debug, Clone)]
 pub struct TxExpect {
@@ -67,7 +66,7 @@ impl TxExpect {
     where
         BytesValue: From<E>,
     {
-        Self::err(USER_ERROR_CODE, err_msg_expr)
+        Self::err(ReturnCode::UserError, err_msg_expr)
     }
 
     pub fn no_result(mut self) -> Self {
@@ -100,7 +99,7 @@ impl TxExpect {
 
     fn check_response(&self, tx_response: &TxResponse) {
         assert!(
-            self.status.check(tx_response.tx_error.status),
+            self.status.check(tx_response.tx_error.status.as_u64()),
             "{}result code mismatch. Want: {}. Have: {}. Message: {}",
             &self.additional_error_message,
             self.status,
@@ -120,7 +119,7 @@ impl TxExpect {
             self.message.check(tx_response.tx_error.message.as_str()),
             "{}result message mismatch. Want: {}. Have: {}.",
             &self.additional_error_message,
-            &self.status,
+            &self.message,
             &tx_response.tx_error.message,
         );
     }
diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs
index fd9721721f..60fed34e1c 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs
@@ -1,4 +1,4 @@
-use multiversx_chain_vm::tx_mock::TxResult;
+use multiversx_chain_vm::{tx_mock::TxResult, types::H256};
 use multiversx_sc::types::Address;
 
 use super::{Log, TxExpect, TxResponseStatus};
@@ -17,9 +17,11 @@ pub struct TxResponse {
     /// The logs of the transaction.
     pub logs: Vec<Log>,
     /// The gas used by the transaction.
-    pub gas: u64,
+    pub gas_used: u64,
     /// The refund of the transaction.
     pub refund: u64,
+    /// The transaction hash, if available.
+    pub tx_hash: Option<H256>,
 }
 
 impl TxResponse {
@@ -31,6 +33,16 @@ impl TxResponse {
                 status: tx_result.result_status,
                 message: tx_result.result_message,
             },
+            logs: tx_result
+                .result_logs
+                .iter()
+                .map(|tx_log| Log {
+                    address: tx_log.address.clone(),
+                    endpoint: tx_log.endpoint.to_string(),
+                    topics: tx_log.topics.clone(),
+                    data: tx_log.data.clone(),
+                })
+                .collect(),
             ..Default::default()
         }
     }
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 e7902047c6..17860ab05f 100644
--- a/framework/scenario/src/scenario/model/transaction/tx_response_status.rs
+++ b/framework/scenario/src/scenario/model/transaction/tx_response_status.rs
@@ -1,15 +1,17 @@
-#[derive(Debug, Default, Clone)]
+use multiversx_sc::chain_core::types::ReturnCode;
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 /// The status of a transaction.
 pub struct TxResponseStatus {
     /// The status of the transaction.
-    pub status: u64,
+    pub status: ReturnCode,
     /// The message of the transaction.
     pub message: String,
 }
 
 impl TxResponseStatus {
     /// Creates a [`TxResponseStatus`]
-    pub fn new(status: u64, message: &str) -> Self {
+    pub fn new(status: ReturnCode, message: &str) -> Self {
         Self {
             status,
             message: message.to_string(),
@@ -18,12 +20,12 @@ impl TxResponseStatus {
 
     /// Creates a [`TxResponseStatus`] that signals an error.
     pub fn signal_error(message: &str) -> Self {
-        Self::new(4, message)
+        Self::new(ReturnCode::UserError, message)
     }
 
     /// Checks if the transaction was successful.
     pub fn is_success(&self) -> bool {
-        self.status == 0
+        self.status.is_success()
     }
 }
 
diff --git a/framework/scenario/src/scenario/model/transaction/typed_response.rs b/framework/scenario/src/scenario/model/transaction/typed_response.rs
index a25974a1b8..aae20a0be5 100644
--- a/framework/scenario/src/scenario/model/transaction/typed_response.rs
+++ b/framework/scenario/src/scenario/model/transaction/typed_response.rs
@@ -31,7 +31,7 @@ where
             result,
             new_issued_token_identifier: raw_response.new_issued_token_identifier.clone(),
             logs: raw_response.logs.clone(),
-            gas: raw_response.gas,
+            gas: raw_response.gas_used,
             refund: raw_response.refund,
         }
     }
diff --git a/framework/scenario/src/scenario/model/value/address_key.rs b/framework/scenario/src/scenario/model/value/address_key.rs
index f54e05b2f3..a5234d6a63 100644
--- a/framework/scenario/src/scenario/model/value/address_key.rs
+++ b/framework/scenario/src/scenario/model/value/address_key.rs
@@ -29,10 +29,6 @@ impl AddressKey {
     pub fn to_address(&self) -> Address {
         self.value.clone()
     }
-
-    pub fn to_vm_address(&self) -> multiversx_chain_vm::types::VMAddress {
-        self.value.as_array().into()
-    }
 }
 
 impl Ord for AddressKey {
diff --git a/framework/scenario/src/scenario/model/value/address_value.rs b/framework/scenario/src/scenario/model/value/address_value.rs
index fdde631ede..8ef4e78a26 100644
--- a/framework/scenario/src/scenario/model/value/address_value.rs
+++ b/framework/scenario/src/scenario/model/value/address_value.rs
@@ -36,10 +36,6 @@ impl AddressValue {
     pub fn to_address(&self) -> Address {
         self.value.clone()
     }
-
-    pub fn to_vm_address(&self) -> multiversx_chain_vm::types::VMAddress {
-        self.value.as_array().into()
-    }
 }
 
 impl fmt::Display for AddressValue {
diff --git a/framework/scenario/src/scenario/model/value/value_key_bytes.rs b/framework/scenario/src/scenario/model/value/value_key_bytes.rs
index 12a6813262..7b8f709e9f 100644
--- a/framework/scenario/src/scenario/model/value/value_key_bytes.rs
+++ b/framework/scenario/src/scenario/model/value/value_key_bytes.rs
@@ -14,6 +14,15 @@ pub struct BytesKey {
     pub original: String,
 }
 
+impl BytesKey {
+    pub fn from_hex(hex_value: &str) -> Self {
+        Self {
+            value: hex::decode(hex_value).expect("could not decode hex value"),
+            original: format!("0x{hex_value}"),
+        }
+    }
+}
+
 impl From<Vec<u8>> for BytesKey {
     fn from(v: Vec<u8>) -> Self {
         BytesKey {
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 627f2ace9c..160f30f75a 100644
--- a/framework/scenario/src/scenario/model/value/value_set_bytes.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_bytes.rs
@@ -23,6 +23,13 @@ impl BytesValue {
             original: ValueSubTree::Str(String::default()),
         }
     }
+
+    pub fn from_hex(hex_value: &str) -> Self {
+        Self {
+            value: hex::decode(hex_value).expect("could not decode hex value"),
+            original: ValueSubTree::Str(format!("0x{hex_value}")),
+        }
+    }
 }
 
 impl InterpretableFrom<ValueSubTree> for BytesValue {
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 b332543116..a0305eb9f5 100644
--- a/framework/scenario/src/scenario/model/value/value_set_u64.rs
+++ b/framework/scenario/src/scenario/model/value/value_set_u64.rs
@@ -4,6 +4,7 @@ use crate::scenario_format::{
     value_interpreter::{interpret_string, interpret_subtree},
 };
 
+use multiversx_sc::chain_core::types::ReturnCode;
 use num_bigint::BigUint;
 use num_traits::ToPrimitive;
 use std::fmt;
@@ -108,6 +109,12 @@ impl From<i32> for U64Value {
     }
 }
 
+impl From<ReturnCode> for U64Value {
+    fn from(from: ReturnCode) -> Self {
+        U64Value::from(from.as_u64())
+    }
+}
+
 impl From<&str> for U64Value {
     fn from(from: &str) -> Self {
         U64Value::interpret_from(from, &InterpreterContext::default())
diff --git a/framework/scenario/src/scenario/run_vm/check_state.rs b/framework/scenario/src/scenario/run_vm/check_state.rs
index abed0212cc..c1d8275c2b 100644
--- a/framework/scenario/src/scenario/run_vm/check_state.rs
+++ b/framework/scenario/src/scenario/run_vm/check_state.rs
@@ -23,7 +23,7 @@ impl ScenarioVMRunner {
 
 fn execute(state: &BlockchainState, accounts: &CheckAccounts) {
     for (expected_address, expected_account) in accounts.accounts.iter() {
-        if let Some(account) = state.accounts.get(&expected_address.to_vm_address()) {
+        if let Some(account) = state.accounts.get(&expected_address.to_address()) {
             assert!(
                 expected_account.nonce.check(account.nonce),
                 "bad account nonce. Address: {}. Want: {}. Have: {}",
diff --git a/framework/scenario/src/scenario/run_vm/sc_call.rs b/framework/scenario/src/scenario/run_vm/sc_call.rs
index 0a66578eaf..0cfad3aa62 100644
--- a/framework/scenario/src/scenario/run_vm/sc_call.rs
+++ b/framework/scenario/src/scenario/run_vm/sc_call.rs
@@ -86,8 +86,8 @@ impl ScenarioVMRunner {
 fn tx_input_from_call(sc_call_step: &ScCallStep) -> TxInput {
     let tx = &sc_call_step.tx;
     TxInput {
-        from: tx.from.to_vm_address(),
-        to: tx.to.to_vm_address(),
+        from: tx.from.to_address(),
+        to: tx.to.to_address(),
         egld_value: tx.egld_value.value.clone(),
         esdt_values: tx_esdt_transfers_from_scenario(tx.esdt_value.as_slice()),
         func_name: tx.function.clone().into(),
diff --git a/framework/scenario/src/scenario/run_vm/sc_deploy.rs b/framework/scenario/src/scenario/run_vm/sc_deploy.rs
index 11bb387a6b..4386a1ab5d 100644
--- a/framework/scenario/src/scenario/run_vm/sc_deploy.rs
+++ b/framework/scenario/src/scenario/run_vm/sc_deploy.rs
@@ -43,7 +43,7 @@ impl ScenarioVMRunner {
             tx_result.pending_calls.no_calls(),
             "Async calls from constructors are currently not supported"
         );
-        (new_address.as_array().into(), tx_result)
+        (new_address, tx_result)
     }
 
     pub fn perform_sc_deploy_lambda_and_check<F>(
@@ -65,7 +65,7 @@ impl ScenarioVMRunner {
 fn tx_input_from_deploy(sc_deploy_step: &ScDeployStep) -> TxInput {
     let tx = &sc_deploy_step.tx;
     TxInput {
-        from: tx.from.to_vm_address(),
+        from: tx.from.to_address(),
         to: multiversx_chain_vm::types::VMAddress::zero(),
         egld_value: tx.egld_value.value.clone(),
         esdt_values: Vec::new(),
diff --git a/framework/scenario/src/scenario/run_vm/sc_query.rs b/framework/scenario/src/scenario/run_vm/sc_query.rs
index 1d3476ab4e..2e0c1cbdda 100644
--- a/framework/scenario/src/scenario/run_vm/sc_query.rs
+++ b/framework/scenario/src/scenario/run_vm/sc_query.rs
@@ -48,8 +48,8 @@ impl ScenarioVMRunner {
 
 fn tx_input_from_query(sc_query_step: &ScQueryStep) -> TxInput {
     TxInput {
-        from: sc_query_step.tx.to.to_vm_address(),
-        to: sc_query_step.tx.to.to_vm_address(),
+        from: sc_query_step.tx.to.to_address(),
+        to: sc_query_step.tx.to.to_address(),
         egld_value: BigUint::from(0u32),
         esdt_values: Vec::new(),
         func_name: sc_query_step.tx.function.clone().into(),
diff --git a/framework/scenario/src/scenario/run_vm/set_state.rs b/framework/scenario/src/scenario/run_vm/set_state.rs
index 8284d42422..42042ee1cc 100644
--- a/framework/scenario/src/scenario/run_vm/set_state.rs
+++ b/framework/scenario/src/scenario/run_vm/set_state.rs
@@ -35,7 +35,7 @@ fn execute(state: &mut BlockchainState, set_state_step: &SetStateStep) {
         );
 
         state.validate_and_add_account(AccountData {
-            address: address.to_vm_address(),
+            address: address.to_address(),
             nonce: account
                 .nonce
                 .as_ref()
@@ -65,7 +65,7 @@ fn execute(state: &mut BlockchainState, set_state_step: &SetStateStep) {
             contract_owner: account
                 .owner
                 .as_ref()
-                .map(|address_value| address_value.to_vm_address()),
+                .map(|address_value| address_value.to_address()),
             developer_rewards: account
                 .developer_rewards
                 .as_ref()
@@ -79,9 +79,9 @@ fn execute(state: &mut BlockchainState, set_state_step: &SetStateStep) {
             "field should have SC format"
         );
         state.put_new_address(
-            new_address.creator_address.to_vm_address(),
+            new_address.creator_address.to_address(),
             new_address.creator_nonce.value,
-            new_address.new_address.to_vm_address(),
+            new_address.new_address.to_address(),
         )
     }
     for new_token_identifier in set_state_step.new_token_identifiers.iter().cloned() {
@@ -155,7 +155,7 @@ fn convert_scenario_esdt_instance_to_world_mock(
             creator: scenario_esdt
                 .creator
                 .as_ref()
-                .map(|creator| creator.to_vm_address()),
+                .map(|creator| creator.to_address()),
             royalties: scenario_esdt
                 .royalties
                 .as_ref()
diff --git a/framework/scenario/src/scenario/run_vm/transfer.rs b/framework/scenario/src/scenario/run_vm/transfer.rs
index 0ecb89b7b8..a0fcc948dc 100644
--- a/framework/scenario/src/scenario/run_vm/transfer.rs
+++ b/framework/scenario/src/scenario/run_vm/transfer.rs
@@ -18,7 +18,7 @@ impl ScenarioVMRunner {
 
     pub fn perform_validator_reward(&mut self, validator_rewards_step: &ValidatorRewardStep) {
         self.blockchain_mock.state.increase_validator_reward(
-            &validator_rewards_step.tx.to.to_vm_address(),
+            &validator_rewards_step.tx.to.to_address(),
             &validator_rewards_step.tx.egld_value.value,
         );
     }
@@ -26,8 +26,8 @@ impl ScenarioVMRunner {
 
 fn tx_input_from_transfer(tx_transfer: &TxTransfer) -> TxInput {
     TxInput {
-        from: tx_transfer.from.to_vm_address(),
-        to: tx_transfer.to.to_vm_address(),
+        from: tx_transfer.from.to_address(),
+        to: tx_transfer.to.to_address(),
         egld_value: tx_transfer.egld_value.value.clone(),
         esdt_values: tx_esdt_transfers_from_scenario(tx_transfer.esdt_value.as_slice()),
         func_name: TxFunctionName::EMPTY,
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 eeec7a1c4e..7a3380de46 100644
--- a/framework/scenario/src/scenario/run_vm/tx_output_check.rs
+++ b/framework/scenario/src/scenario/run_vm/tx_output_check.rs
@@ -8,7 +8,7 @@ use multiversx_chain_vm::{
 pub fn check_tx_output(tx_id: &str, tx_expect: &TxExpect, tx_result: &TxResult) {
     let have_str = tx_result.result_message.as_str();
     assert!(
-        tx_expect.status.check(tx_result.result_status),
+        tx_expect.status.check(tx_result.result_status.as_u64()),
         "result code mismatch. Tx id: '{}'. Want: {}. Have: {}. Message: {}",
         tx_id,
         tx_expect.status,
diff --git a/framework/scenario/src/scenario/tx_to_step.rs b/framework/scenario/src/scenario/tx_to_step.rs
index 82e236e48b..1369ae10e1 100644
--- a/framework/scenario/src/scenario/tx_to_step.rs
+++ b/framework/scenario/src/scenario/tx_to_step.rs
@@ -5,6 +5,7 @@ mod tx_to_step_deploy;
 mod tx_to_step_query;
 mod tx_to_step_trait;
 mod tx_to_step_transfer;
+mod tx_to_step_upgrade;
 
 pub use step_annotation::*;
 pub use step_wrapper::{StepWithResponse, StepWrapper};
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 475326eac7..0661806509 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,20 +1,16 @@
 use multiversx_sc::types::{
-    Code, FunctionCall, NotPayable, RHListExec, Tx, TxEnv, TxFromSpecified, TxGas, TxPayment,
-    TxToSpecified, UpgradeCall,
+    FunctionCall, RHListExec, Tx, TxEnv, TxEnvWithTxHash, TxFromSpecified, TxGas, TxPayment,
+    TxToSpecified,
 };
 
-use crate::{
-    imports::MxscPath,
-    scenario_model::{ScCallStep, TxESDT, TxExpect, TxResponse},
-    ScenarioEnvExec,
-};
+use crate::scenario_model::{ScCallStep, TxESDT, TxExpect, TxResponse};
 
 use super::{address_annotated, gas_annotated, StepWrapper, 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>,
+    Env: TxEnvWithTxHash<RHExpect = TxExpect>,
     From: TxFromSpecified<Env>,
     To: TxToSpecified<Env>,
     Payment: TxPayment<Env>,
@@ -23,7 +19,7 @@ where
 {
     type Step = ScCallStep;
 
-    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH> {
+    fn tx_to_step(mut self) -> StepWrapper<Env, Self::Step, RH> {
         let mut step = tx_to_sc_call_step(
             &self.env,
             self.from,
@@ -32,6 +28,7 @@ where
             self.gas,
             self.data,
         );
+        step.explicit_tx_hash = self.env.take_tx_hash();
         step.expect = Some(self.result_handler.list_tx_expect());
 
         StepWrapper {
@@ -80,53 +77,3 @@ 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
-}
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 4e49be51b4..1c7532e27a 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
@@ -1,5 +1,6 @@
 use multiversx_sc::types::{
-    Code, DeployCall, RHListExec, Tx, TxCodeValue, TxEnv, TxFromSpecified, TxGas, TxPayment,
+    Code, DeployCall, RHListExec, Tx, TxCodeValue, TxEnv, TxEnvWithTxHash, TxFromSpecified, TxGas,
+    TxPayment,
 };
 
 use crate::scenario_model::{ScDeployStep, TxExpect, TxResponse};
@@ -9,7 +10,7 @@ use super::{address_annotated, code_annotated, gas_annotated, StepWrapper, TxToS
 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>,
+    Env: TxEnvWithTxHash<RHExpect = TxExpect>,
     From: TxFromSpecified<Env>,
     Payment: TxPayment<Env>,
     Gas: TxGas<Env>,
@@ -18,9 +19,10 @@ where
 {
     type Step = ScDeployStep;
 
-    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH> {
+    fn tx_to_step(mut 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.explicit_tx_hash = self.env.take_tx_hash();
         step.expect = Some(self.result_handler.list_tx_expect());
 
         StepWrapper {
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
diff --git a/framework/scenario/src/scenario/tx_to_step/tx_to_step_upgrade.rs b/framework/scenario/src/scenario/tx_to_step/tx_to_step_upgrade.rs
new file mode 100644
index 0000000000..c7071ee3ab
--- /dev/null
+++ b/framework/scenario/src/scenario/tx_to_step/tx_to_step_upgrade.rs
@@ -0,0 +1,66 @@
+use multiversx_sc::types::{
+    Code, NotPayable, RHListExec, Tx, TxCodeValue, TxEnv, TxFromSpecified, TxGas, TxToSpecified,
+    UpgradeCall,
+};
+
+use crate::{
+    imports::ScCallStep,
+    scenario_model::{TxExpect, TxResponse},
+};
+
+use super::{address_annotated, code_annotated, gas_annotated, StepWrapper, TxToStep};
+
+impl<Env, From, To, Gas, RH, CodeValue> TxToStep<Env, RH>
+    for Tx<Env, From, To, NotPayable, Gas, UpgradeCall<Env, Code<CodeValue>>, RH>
+where
+    Env: TxEnv<RHExpect = TxExpect>,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+    RH: RHListExec<TxResponse, Env>,
+{
+    type Step = ScCallStep;
+
+    fn tx_to_step(self) -> StepWrapper<Env, Self::Step, RH> {
+        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 {
+            env: self.env,
+            step,
+            result_handler: self.result_handler,
+        }
+    }
+}
+
+pub fn tx_to_sc_call_upgrade_step<'a, 'w: 'a, Env, From, To, Gas, CodeValue>(
+    env: &Env,
+    from: From,
+    to: To,
+    gas: Gas,
+    data: UpgradeCall<Env, Code<CodeValue>>,
+) -> ScCallStep
+where
+    Env: TxEnv,
+    From: TxFromSpecified<Env>,
+    To: TxToSpecified<Env>,
+    Gas: TxGas<Env>,
+    CodeValue: TxCodeValue<Env>,
+{
+    let mut step = ScCallStep::new()
+        .from(address_annotated(env, &from))
+        .to(address_annotated(env, &to))
+        .function("upgradeContract")
+        .argument(code_annotated(env, data.code_source))
+        .argument(data.code_metadata.to_byte_array().to_vec());
+
+    step.tx.gas_limit = gas_annotated(env, gas);
+
+    for arg in data.arg_buffer.iter_buffers() {
+        step.tx.arguments.push(arg.to_vec().into());
+    }
+
+    step
+}
diff --git a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
index b88377b98d..3ae56e5a61 100644
--- a/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
+++ b/framework/scenario/src/whitebox_legacy/contract_obj_wrapper.rs
@@ -13,10 +13,7 @@ use crate::{
     ScenarioWorld,
 };
 use multiversx_chain_scenario_format::interpret_trait::InterpretableFrom;
-use multiversx_chain_vm::{
-    tx_mock::{TxContext, TxContextStack, TxFunctionName, TxResult},
-    types::VMAddress,
-};
+use multiversx_chain_vm::tx_mock::{TxContext, TxContextStack, TxFunctionName, TxResult};
 use multiversx_sc::types::{BigUint, H256};
 use num_traits::Zero;
 
@@ -89,7 +86,7 @@ impl BlockchainStateWrapper {
     }
 
     pub fn check_egld_balance(&self, address: &Address, expected_balance: &num_bigint::BigUint) {
-        let actual_balance = match &self.world.get_state().accounts.get(&to_vm_address(address)) {
+        let actual_balance = match &self.world.get_state().accounts.get(address) {
             Some(acc) => acc.egld_balance.clone(),
             None => num_bigint::BigUint::zero(),
         };
@@ -109,7 +106,7 @@ impl BlockchainStateWrapper {
         token_id: &[u8],
         expected_balance: &num_bigint::BigUint,
     ) {
-        let actual_balance = match &self.world.get_state().accounts.get(&to_vm_address(address)) {
+        let actual_balance = match &self.world.get_state().accounts.get(address) {
             Some(acc) => acc.esdt.get_esdt_balance(token_id, 0),
             None => num_bigint::BigUint::zero(),
         };
@@ -135,7 +132,7 @@ impl BlockchainStateWrapper {
         T: TopEncode + TopDecode + PartialEq + core::fmt::Debug,
     {
         let (actual_balance, actual_attributes_serialized) =
-            match &self.world.get_state().accounts.get(&to_vm_address(address)) {
+            match &self.world.get_state().accounts.get(address) {
                 Some(acc) => {
                     let esdt_data = acc.esdt.get_by_identifier_or_default(token_id);
                     let opt_instance = esdt_data.instances.get_by_nonce(nonce);
@@ -304,20 +301,19 @@ impl BlockchainStateWrapper {
         CB: ContractBase<Api = DebugApi> + CallableContract + 'static,
         ContractObjBuilder: 'static + Copy + Fn() -> CB,
     {
-        let deployer_vm_address = to_vm_address(deployer);
         let deployer_acc = self
             .world
             .get_state()
             .accounts
-            .get(&deployer_vm_address)
+            .get(deployer)
             .unwrap()
             .clone();
 
         let new_sc_address = self.address_factory.new_sc_address();
         self.world.get_mut_state().put_new_address(
-            deployer_vm_address,
+            deployer.clone(),
             deployer_acc.nonce,
-            to_vm_address(&new_sc_address),
+            new_sc_address.clone(),
         );
 
         ContractObjWrapper::new(new_sc_address, obj_builder)
@@ -493,8 +489,7 @@ impl BlockchainStateWrapper {
     }
 
     pub fn add_mandos_set_account(&mut self, address: &Address) {
-        let vm_address = to_vm_address(address);
-        if let Some(acc) = self.world.get_state().accounts.get(&vm_address).cloned() {
+        if let Some(acc) = self.world.get_state().accounts.get(address).cloned() {
             let opt_contract_path = self.address_to_code_path.get(address);
             if let Some(trace) = &mut self.world.get_mut_debugger_backend().trace {
                 MandosGenerator::new(&mut trace.scenario_trace, &mut self.current_tx_id)
@@ -504,8 +499,7 @@ impl BlockchainStateWrapper {
     }
 
     pub fn add_mandos_check_account(&mut self, address: &Address) {
-        let vm_address = to_vm_address(address);
-        if let Some(acc) = self.world.get_state().accounts.get(&vm_address).cloned() {
+        if let Some(acc) = self.world.get_state().accounts.get(address).cloned() {
             if let Some(trace) = &mut self.world.get_mut_debugger_backend().trace {
                 MandosGenerator::new(&mut trace.scenario_trace, &mut self.current_tx_id)
                     .check_account(&acc);
@@ -662,7 +656,7 @@ impl BlockchainStateWrapper {
 
 impl BlockchainStateWrapper {
     pub fn get_egld_balance(&self, address: &Address) -> num_bigint::BigUint {
-        match self.world.get_state().accounts.get(&to_vm_address(address)) {
+        match self.world.get_state().accounts.get(address) {
             Some(acc) => acc.egld_balance.clone(),
             None => panic!(
                 "get_egld_balance: Account {:?} does not exist",
@@ -677,7 +671,7 @@ impl BlockchainStateWrapper {
         token_id: &[u8],
         token_nonce: u64,
     ) -> num_bigint::BigUint {
-        match self.world.get_state().accounts.get(&to_vm_address(address)) {
+        match self.world.get_state().accounts.get(address) {
             Some(acc) => acc.esdt.get_esdt_balance(token_id, token_nonce),
             None => panic!(
                 "get_esdt_balance: Account {:?} does not exist",
@@ -692,7 +686,7 @@ impl BlockchainStateWrapper {
         token_id: &[u8],
         token_nonce: u64,
     ) -> Option<T> {
-        match self.world.get_state().accounts.get(&to_vm_address(address)) {
+        match self.world.get_state().accounts.get(address) {
             Some(acc) => match acc.esdt.get_by_identifier(token_id) {
                 Some(esdt_data) => esdt_data
                     .instances
@@ -708,8 +702,8 @@ impl BlockchainStateWrapper {
     }
 
     pub fn dump_state(&self) {
-        for addr in self.world.get_state().accounts.keys() {
-            self.dump_state_for_account_hex_attributes(&to_framework_address(addr));
+        for address in self.world.get_state().accounts.keys() {
+            self.dump_state_for_account_hex_attributes(address);
             println!();
         }
     }
@@ -725,8 +719,7 @@ impl BlockchainStateWrapper {
         &self,
         address: &Address,
     ) {
-        let vm_address = to_vm_address(address);
-        let account = match self.world.get_state().accounts.get(&vm_address) {
+        let account = match self.world.get_state().accounts.get(address) {
             Some(acc) => acc,
             None => panic!(
                 "dump_state_for_account: Account {:?} does not exist",
@@ -817,11 +810,3 @@ where
     let c_base = func();
     Box::new(c_base)
 }
-
-fn to_vm_address(address: &Address) -> VMAddress {
-    address.as_array().into()
-}
-
-fn to_framework_address(vm_address: &VMAddress) -> Address {
-    vm_address.as_array().into()
-}
diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs
index a08f1a4bbd..c597bb9e81 100644
--- a/framework/scenario/tests/contract_without_macros.rs
+++ b/framework/scenario/tests/contract_without_macros.rs
@@ -387,16 +387,10 @@ mod sample_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::<
@@ -408,47 +402,30 @@ mod sample_adder {
             >();
             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,
-            );
+            )
+            .with_docs("Add desired amount to the storage variable.");
             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);
@@ -806,6 +783,7 @@ fn contract_without_macros_basic() {
 
 fn world() -> multiversx_sc_scenario::ScenarioWorld {
     let mut blockchain = multiversx_sc_scenario::ScenarioWorld::new();
+    blockchain.set_current_dir_from_workspace("framework/scenario");
     blockchain.register_contract(
         "mxsc:../../contracts/examples/adder/output/adder.mxsc.json",
         sample_adder::ContractBuilder,
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 9e0cfa8c74..6efd920acc 100644
--- a/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_biguint_test.rs
@@ -45,8 +45,8 @@ fn managed_struct_to_bytes_writer() {
     let handle_bytes = s.big_uint.get_handle().to_be_bytes();
     let expected = [0xff, 0xff, 0xff, handle_bytes[3], 0x00, 0x01, 0x23, 0x45];
 
-    <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::to_byte_writer(
-        &s,
+    <ManagedStructWithBigUint<StaticApi> as multiversx_sc::types::ManagedVecItem>::into_byte_writer(
+        s,
         |bytes| {
             payload_slice.copy_from_slice(bytes);
 
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 fc7d95343e..1018747da3 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
@@ -63,8 +63,8 @@ fn struct_to_bytes_writer() {
         handle3[1], handle3[2], handle3[3], handle4[0], handle4[1], handle4[2], handle4[3],
     ];
 
-    <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::to_byte_writer(
-        &s,
+    <ManagedStructWithToken<StaticApi> as multiversx_sc::types::ManagedVecItem>::into_byte_writer(
+        s,
         |bytes| {
             payload_slice.copy_from_slice(bytes);
 
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 1c139f5b84..46dcceed33 100644
--- a/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs
+++ b/framework/scenario/tests/derive_managed_vec_item_simple_enum.rs
@@ -27,8 +27,8 @@ fn enum_static() {
 
 #[test]
 fn enum_to_bytes_writer() {
-    <SimpleEnum as multiversx_sc::types::ManagedVecItem>::to_byte_writer(
-        &SimpleEnum::Variant1,
+    <SimpleEnum as multiversx_sc::types::ManagedVecItem>::into_byte_writer(
+        SimpleEnum::Variant1,
         |bytes| {
             assert_eq!(bytes.len(), 1);
             assert_eq!(bytes[0], 0);
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 e5ee344e3c..e55e6d9140 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
@@ -67,7 +67,7 @@ fn struct_1_to_bytes_writer() {
     let mut payload = <Struct1 as multiversx_sc::types::ManagedVecItem>::PAYLOAD::new_buffer();
     let payload_slice = payload.payload_slice_mut();
 
-    <Struct1 as multiversx_sc::types::ManagedVecItem>::to_byte_writer(&s, |bytes| {
+    <Struct1 as multiversx_sc::types::ManagedVecItem>::into_byte_writer(s, |bytes| {
         payload_slice.copy_from_slice(bytes);
         assert_eq!(
             payload_slice,
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 87fee5ed62..50bea73aac 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
@@ -49,7 +49,7 @@ fn struct_to_bytes_writer() {
         /* arr  */ 0x61, 0x11, 0x62, 0x22,
     ];
 
-    <Struct2 as multiversx_sc::types::ManagedVecItem>::to_byte_writer(&s, |bytes| {
+    <Struct2 as multiversx_sc::types::ManagedVecItem>::into_byte_writer(s, |bytes| {
         assert_eq!(bytes, &expected_payload[..]);
     });
 }
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..fca0451d7c
--- /dev/null
+++ b/framework/scenario/tests/managed_buffer_read_to_end_test.rs
@@ -0,0 +1,52 @@
+use multiversx_sc::{
+    api::ManagedTypeApi,
+    codec::{
+        self,
+        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>,
+    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());
+
+    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")
+    );
+}
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();
diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml
index d5a9f46dea..54fe80f23f 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.54.1"
 edition = "2021"
 
 authors = ["MultiversX <contact@multiversx.com>"]
@@ -13,25 +13,45 @@ description = "MultiversX framework for building smart contract interaction snip
 keywords = ["multiversx", "blockchain", "contract", "snippets"]
 categories = ["cryptography::cryptocurrencies"]
 
+[features]
+default = ["http", "default-tls"]
+http = ["multiversx-sdk-http", "tokio"]
+dapp = ["multiversx-sdk-dapp"]
+default-tls = ["multiversx-sdk-http/default-tls"]
+static-tls = ["multiversx-sdk-http/static-tls"]
+
 [dependencies]
-tokio = { version = "1.24", features = ["full"] }
 hex = "0.4"
 base64 = "0.22"
 log = "0.4.17"
 env_logger = "0.11"
 futures = "0.3"
+anyhow = "1.0.44"
+
+tokio = { version = "1.24", features = ["full"], optional = true}
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.54.1"
 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.7.0"
 path = "../../sdk/core"
 
+[dependencies.multiversx-sdk-http]
+version = "=0.7.0"
+path = "../../sdk/http"
+optional = true
+default-features = false
+
+[dependencies.multiversx-sdk-dapp]
+version = "=0.7.0"
+path = "../../sdk/dapp"
+optional = true
+
 [dev-dependencies]
 serde_json = "1.0"
diff --git a/framework/snippets/README.md b/framework/snippets/README.md
index 62a184e28c..b3af9e10c1 100644
--- a/framework/snippets/README.md
+++ b/framework/snippets/README.md
@@ -2,6 +2,9 @@
 
 Provides basic functionality for interacting with smart contracts directly from Rust.
 
-It a base on top of which little interaction programs (or snippets) can be written.
+It is a base on top of which little interaction programs (or snippets) can be written. Can be used in:
+- interactors,
+- web servers (in Rust),
+- front-end (WebAssembly, via wasm-bindgen/Rust).
 
-It is largely a wrapper around `elrond-sdk-erdrs` and `multiversx-chain-vm`.
+It is largely a wrapper around `multiversx-sdk` and `multiversx-sc`, combining the two.
diff --git a/framework/snippets/src/account_tool.rs b/framework/snippets/src/account_tool.rs
index b10baf4a80..b0a5ccc220 100644
--- a/framework/snippets/src/account_tool.rs
+++ b/framework/snippets/src/account_tool.rs
@@ -1,11 +1,13 @@
+use crate::sdk_core::data::esdt::EsdtBalance;
 use multiversx_chain_scenario_format::interpret_trait::IntoRaw;
 use multiversx_sc_scenario::{
     imports::Bech32Address,
     scenario_model::{Account, BytesKey, BytesValue, Scenario, SetStateStep, Step},
 };
-use multiversx_sdk::{
-    data::{address::Address, esdt::EsdtBalance},
-    gateway::GatewayProxy,
+use multiversx_sdk::gateway::GatewayAsyncService;
+use multiversx_sdk::gateway::{
+    GetAccountEsdtRolesRequest, GetAccountEsdtTokensRequest, GetAccountRequest,
+    GetAccountStorageRequest,
 };
 use std::collections::{BTreeMap, HashMap};
 
@@ -13,13 +15,12 @@ use std::collections::{BTreeMap, HashMap};
 ///
 /// 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_string: String,
+pub async fn print_account_as_scenario_set_state<GatewayProxy: GatewayAsyncService>(
+    gateway_proxy: GatewayProxy,
     address_bech32_string: 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 set_state = retrieve_account_as_scenario_set_state(&gateway_proxy, &address).await;
     let scenario = build_scenario(set_state);
     println!("{}", scenario.into_raw().to_json_string());
 }
@@ -33,27 +34,33 @@ fn build_scenario(set_state: SetStateStep) -> Scenario {
     }
 }
 
-pub async fn retrieve_account_as_scenario_set_state(
+pub async fn retrieve_account_as_scenario_set_state<GatewayProxy: GatewayAsyncService>(
     api: &GatewayProxy,
-    address: &Bech32Address,
+    bech32_address: &Bech32Address,
 ) -> SetStateStep {
-    let sdk_address = Address::from_bech32_string(address.to_bech32_str()).unwrap();
-    let sdk_account = api.get_account(&sdk_address).await.unwrap();
+    let address = bech32_address.as_address();
+    let sdk_account = api.request(GetAccountRequest::new(address)).await.unwrap();
 
     let account_esdt = api
-        .get_account_esdt_tokens(&sdk_address)
+        .request(GetAccountEsdtTokensRequest::new(address))
         .await
         .unwrap_or_else(|err| {
-            panic!("failed to retrieve ESDT tokens for address {address}: {err}")
+            eprintln!("failed to retrieve ESDT tokens for address {bech32_address}: {err}");
+            HashMap::new()
         });
     let account_esdt_roles = api
-        .get_account_esdt_roles(&sdk_address)
+        .request(GetAccountEsdtRolesRequest::new(address))
         .await
-        .unwrap_or_else(|err| panic!("failed to retrieve ESDT roles for address {address}: {err}"));
+        .unwrap_or_else(|err| {
+            eprintln!("failed to retrieve ESDT roles for address {bech32_address}: {err}");
+            HashMap::new()
+        });
     let account_storage = api
-        .get_account_storage_keys(&sdk_address)
+        .request(GetAccountStorageRequest::new(address))
         .await
-        .unwrap_or_else(|err| panic!("failed to retrieve storage for address {address}: {err}"));
+        .unwrap_or_else(|err| {
+            panic!("failed to retrieve storage for address {bech32_address}: {err}")
+        });
 
     let account_state = set_account(
         sdk_account,
@@ -63,11 +70,11 @@ pub async fn retrieve_account_as_scenario_set_state(
     );
 
     let set_state_step = SetStateStep::new();
-    set_state_step.put_account(address, account_state)
+    set_state_step.put_account(bech32_address, account_state)
 }
 
 fn set_account(
-    account: multiversx_sdk::data::account::Account,
+    account: crate::sdk::data::account::Account,
     account_storage: HashMap<String, String>,
     account_esdt: HashMap<String, EsdtBalance>,
     account_esdt_roles: HashMap<String, Vec<String>>,
@@ -75,7 +82,7 @@ fn set_account(
     let mut account_state = Account::new()
         .nonce(account.nonce)
         .balance(account.balance.as_str())
-        .code(account.code);
+        .code(BytesValue::from_hex(&account.code));
     account_state.username = Some(format!("str:{}", account.username.as_str()).into());
     account_state.storage = convert_storage(account_storage);
 
@@ -97,6 +104,6 @@ fn convert_storage(account_storage: HashMap<String, String>) -> BTreeMap<BytesKe
     account_storage
         .into_iter()
         .filter(|(k, _)| !k.starts_with("454c524f4e44"))
-        .map(|(k, v)| (BytesKey::from(k.as_str()), BytesValue::from(v)))
+        .map(|(k, v)| (BytesKey::from_hex(&k), BytesValue::from_hex(&v)))
         .collect()
 }
diff --git a/framework/snippets/src/imports.rs b/framework/snippets/src/imports.rs
index d416955e4c..bef8181006 100644
--- a/framework/snippets/src/imports.rs
+++ b/framework/snippets/src/imports.rs
@@ -1,10 +1,21 @@
 pub use crate::multiversx_sc_scenario::imports::*;
 
 pub use crate::{
-    dns_address_for_name, test_wallets, Interactor, InteractorPrepareAsync, StepBuffer,
+    dns_address_for_name, InteractorBase, InteractorPrepareAsync, InteractorRunAsync, StepBuffer,
 };
 
-pub use multiversx_sdk::wallet::Wallet;
+pub use crate::sdk::{data::keystore::InsertPassword, test_wallets, wallet::Wallet};
 
 pub use env_logger;
+
+#[cfg(feature = "http")]
+pub use crate::{HttpInteractor, Interactor};
+
+#[cfg(feature = "http")]
+pub use multiversx_sdk_http::GatewayHttpProxy;
+
+#[cfg(feature = "http")]
 pub use tokio;
+
+#[cfg(feature = "dapp")]
+pub use crate::DappInteractor;
diff --git a/framework/snippets/src/interactor.rs b/framework/snippets/src/interactor.rs
index bb38873afe..48b9d49d8a 100644
--- a/framework/snippets/src/interactor.rs
+++ b/framework/snippets/src/interactor.rs
@@ -1,91 +1,11 @@
-use multiversx_sc_scenario::{
-    imports::{Bech32Address, ScenarioRunner},
-    mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
-    multiversx_sc::types::Address,
-    scenario_model::AddressValue,
-};
-use multiversx_sdk::{
-    data::{address::Address as ErdrsAddress, network_config::NetworkConfig},
-    gateway::GatewayProxy,
-    wallet::Wallet,
-};
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-    time::Duration,
-};
-
-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: GatewayProxy,
-    pub network_config: NetworkConfig,
-    pub sender_map: HashMap<Address, Sender>,
-
-    pub(crate) waiting_time_ms: u64,
-    pub pre_runners: ScenarioRunnerList,
-    pub post_runners: ScenarioRunnerList,
-
-    pub current_dir: PathBuf,
-}
-
-impl Interactor {
-    pub async fn new(gateway_url: &str) -> Self {
-        let proxy = GatewayProxy::new(gateway_url.to_string());
-        let network_config = proxy.get_network_config().await.unwrap();
-        Self {
-            proxy,
-            network_config,
-            sender_map: HashMap::new(),
-            waiting_time_ms: 0,
-            pre_runners: ScenarioRunnerList::empty(),
-            post_runners: ScenarioRunnerList::empty(),
-            current_dir: PathBuf::default(),
-        }
-    }
-
-    pub fn register_wallet(&mut self, wallet: Wallet) -> Address {
-        let address = erdrs_address_to_h256(wallet.address());
-        self.sender_map.insert(
-            address.clone(),
-            Sender {
-                address: address.clone(),
-                wallet,
-                current_nonce: None,
-            },
-        );
-        address
-    }
-
-    pub async fn sleep(&mut self, duration: Duration) {
-        self.waiting_time_ms += duration.as_millis() as u64;
-        tokio::time::sleep(duration).await;
-    }
-
-    pub async fn with_tracer<P: AsRef<Path>>(mut self, path: P) -> Self {
-        self.post_runners.push(ScenarioTraceFile::new(path));
-        self
-    }
-
-    pub async fn retrieve_account(&mut self, wallet_address: &Bech32Address) {
-        let set_state = retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
-        self.pre_runners.run_set_state_step(&set_state);
-        self.post_runners.run_set_state_step(&set_state);
-    }
-}
-
-pub(crate) fn mandos_to_erdrs_address(mandos_address: &AddressValue) -> ErdrsAddress {
-    let bytes = mandos_address.value.as_array();
-    ErdrsAddress::from_bytes(*bytes)
-}
-
-pub(crate) fn address_h256_to_erdrs(address: &Address) -> ErdrsAddress {
-    let bytes = address.as_array();
-    ErdrsAddress::from_bytes(*bytes)
-}
-
-pub(crate) fn erdrs_address_to_h256(erdrs_address: ErdrsAddress) -> Address {
-    erdrs_address.to_bytes().into()
-}
+mod interactor_base;
+mod interactor_chain_simulator;
+mod interactor_dns;
+mod interactor_scenario;
+mod interactor_sender;
+mod interactor_tx;
+
+pub use interactor_base::*;
+pub use interactor_dns::*;
+pub use interactor_sender::*;
+pub use interactor_tx::*;
diff --git a/framework/snippets/src/interactor/interactor_base.rs b/framework/snippets/src/interactor/interactor_base.rs
new file mode 100644
index 0000000000..604051d7a0
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_base.rs
@@ -0,0 +1,101 @@
+use crate::sdk::{data::network_config::NetworkConfig, wallet::Wallet};
+use multiversx_sc_scenario::{
+    imports::{Bech32Address, ScenarioRunner},
+    mandos_system::{run_list::ScenarioRunnerList, run_trace::ScenarioTraceFile},
+    meta::tools::find_current_workspace,
+    multiversx_sc::types::Address,
+};
+use multiversx_sdk::gateway::{GatewayAsyncService, NetworkConfigRequest};
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    time::Duration,
+};
+
+use crate::{account_tool::retrieve_account_as_scenario_set_state, Sender};
+
+pub const INTERACTOR_SCENARIO_TRACE_PATH: &str = "interactor_trace.scen.json";
+
+pub struct InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub proxy: GatewayProxy,
+    pub use_chain_simulator: bool,
+    pub network_config: NetworkConfig,
+    pub sender_map: HashMap<Address, Sender>,
+
+    pub waiting_time_ms: u64,
+    pub pre_runners: ScenarioRunnerList,
+    pub post_runners: ScenarioRunnerList,
+
+    pub current_dir: PathBuf,
+}
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    /// Not yet changed for backwards compatibility.
+    pub async fn new(gateway_uri: &str) -> Self {
+        let proxy = GatewayProxy::from_uri(gateway_uri);
+        let network_config = proxy.request(NetworkConfigRequest).await.unwrap();
+        Self {
+            proxy,
+            use_chain_simulator: false,
+            network_config,
+            sender_map: HashMap::new(),
+            waiting_time_ms: 0,
+            pre_runners: ScenarioRunnerList::empty(),
+            post_runners: ScenarioRunnerList::empty(),
+            current_dir: PathBuf::default(),
+        }
+    }
+
+    pub fn use_chain_simulator(mut self, use_chain_simulator: bool) -> Self {
+        self.use_chain_simulator = use_chain_simulator;
+        self
+    }
+
+    pub async fn register_wallet(&mut self, wallet: Wallet) -> Address {
+        let address = wallet.to_address();
+
+        self.send_user_funds(&address).await.unwrap();
+        self.generate_blocks(1).await.unwrap();
+        self.sender_map.insert(
+            address.clone(),
+            Sender {
+                address: address.clone(),
+                wallet,
+                current_nonce: None,
+            },
+        );
+        address
+    }
+
+    pub async fn sleep(&mut self, duration: Duration) {
+        let millis = duration.as_millis() as u64;
+        self.waiting_time_ms += millis;
+        self.proxy.sleep(millis).await;
+    }
+
+    pub async fn with_tracer<P: AsRef<Path>>(mut self, path: P) -> Self {
+        self.post_runners.push(ScenarioTraceFile::new(path));
+        self
+    }
+
+    pub async fn retrieve_account(&mut self, wallet_address: &Bech32Address) {
+        let set_state = retrieve_account_as_scenario_set_state(&self.proxy, wallet_address).await;
+        self.pre_runners.run_set_state_step(&set_state);
+        self.post_runners.run_set_state_step(&set_state);
+    }
+
+    /// Tells the interactor 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();
+        path.push(relative_path);
+        self.current_dir = path;
+        self
+    }
+}
diff --git a/framework/snippets/src/interactor/interactor_chain_simulator.rs b/framework/snippets/src/interactor/interactor_chain_simulator.rs
new file mode 100644
index 0000000000..44943fe243
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_chain_simulator.rs
@@ -0,0 +1,56 @@
+use anyhow::Error;
+use multiversx_sc_scenario::imports::Address;
+use multiversx_sdk::gateway::{
+    ChainSimulatorGenerateBlocksRequest, ChainSimulatorSendFundsRequest, GatewayAsyncService,
+};
+
+use crate::InteractorBase;
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub async fn send_user_funds(&self, receiver: &Address) -> Result<String, Error> {
+        if !self.use_chain_simulator {
+            return Ok(String::from("no-simulator"));
+        }
+
+        self.proxy
+            .request(ChainSimulatorSendFundsRequest::to_address(receiver))
+            .await
+    }
+
+    pub async fn generate_blocks(&self, num_blocks: u64) -> Result<String, Error> {
+        if !self.use_chain_simulator {
+            return Ok(String::from("no-simulator"));
+        }
+
+        self.proxy
+            .request(ChainSimulatorGenerateBlocksRequest::num_blocks(num_blocks))
+            .await
+    }
+
+    pub async fn generate_blocks_until_epoch(&self, epoch_number: u64) -> Result<String, Error> {
+        if !self.use_chain_simulator {
+            return Ok(String::from("no-simulator"));
+        }
+
+        self.proxy
+            .request(ChainSimulatorGenerateBlocksRequest::until_epoch(
+                epoch_number,
+            ))
+            .await
+    }
+
+    pub async fn generate_blocks_until_tx_processed(&self, tx_hash: &str) -> Result<String, Error> {
+        if !self.use_chain_simulator {
+            return Ok(String::from("no-simulator"));
+        }
+
+        self.proxy
+            .request(ChainSimulatorGenerateBlocksRequest::until_tx_processed(
+                tx_hash,
+            ))
+            .await
+    }
+}
diff --git a/framework/snippets/src/interactor_dns.rs b/framework/snippets/src/interactor/interactor_dns.rs
similarity index 100%
rename from framework/snippets/src/interactor_dns.rs
rename to framework/snippets/src/interactor/interactor_dns.rs
diff --git a/framework/snippets/src/interactor_scenario.rs b/framework/snippets/src/interactor/interactor_scenario.rs
similarity index 100%
rename from framework/snippets/src/interactor_scenario.rs
rename to framework/snippets/src/interactor/interactor_scenario.rs
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs
similarity index 79%
rename from framework/snippets/src/interactor_scenario/interactor_sc_call.rs
rename to framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs
index 6802304ae9..86fd32a6f9 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_call.rs
+++ b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_call.rs
@@ -1,4 +1,4 @@
-use crate::{address_h256_to_erdrs, mandos_to_erdrs_address, network_response, Interactor};
+use crate::{network_response, InteractorBase};
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -6,17 +6,27 @@ use multiversx_sc_scenario::{
     scenario_model::{ScCallStep, SetStateStep, TxCall},
 };
 use multiversx_sdk::{data::transaction::Transaction, utils::base64_encode};
+use multiversx_sdk::{
+    gateway::{GatewayAsyncService, SendTxRequest},
+    retrieve_tx_on_network,
+};
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub async fn sc_call<S>(&mut self, mut sc_call_step: S)
     where
         S: AsMut<ScCallStep>,
     {
         let sc_call_step = sc_call_step.as_mut();
         let tx_hash = self.launch_sc_call(sc_call_step).await;
-        let tx = self.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
+        self.generate_blocks_until_tx_processed(&tx_hash)
+            .await
+            .unwrap();
+        let (tx, return_code) = retrieve_tx_on_network(&self.proxy, tx_hash.clone()).await;
 
-        sc_call_step.save_response(network_response::parse_tx_response(tx));
+        sc_call_step.save_response(network_response::parse_tx_response(tx, return_code));
 
         if let Some(token_identifier) = sc_call_step.response().new_issued_token_identifier.clone()
         {
@@ -37,7 +47,11 @@ impl Interactor {
         let mut transaction = self.tx_call_to_blockchain_tx(&sc_call_step.tx);
         self.set_nonce_and_sign_tx(sender_address, &mut transaction)
             .await;
-        let tx_hash = self.proxy.send_transaction(&transaction).await.unwrap();
+        let tx_hash = self
+            .proxy
+            .request(SendTxRequest(&transaction))
+            .await
+            .expect("Launch sc call failed");
         println!("sc call tx hash: {tx_hash}");
         info!("sc call tx hash: {}", tx_hash);
 
@@ -57,8 +71,8 @@ impl Interactor {
         Transaction {
             nonce: 0,
             value: contract_call.egld_payment.to_alloc().to_string(),
-            sender: mandos_to_erdrs_address(&tx_call.from),
-            receiver: address_h256_to_erdrs(&contract_call.basic.to.to_address()),
+            sender: tx_call.from.to_address().into(),
+            receiver: contract_call.basic.to.to_address().into(),
             gas_price: self.network_config.min_gas_price,
             gas_limit: tx_call.gas_limit.value,
             data,
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs
similarity index 76%
rename from framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
rename to framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs
index 59de249e83..a957e86cea 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_deploy.rs
+++ b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_deploy.rs
@@ -1,24 +1,26 @@
-use crate::{mandos_to_erdrs_address, network_response, Interactor};
+use crate::{network_response, InteractorBase};
 use log::info;
 use multiversx_sc_scenario::{
-    imports::Bech32Address,
+    imports::{Address, Bech32Address},
     mandos_system::ScenarioRunner,
     scenario_model::{ScDeployStep, SetStateStep},
 };
+use multiversx_sdk::{data::transaction::Transaction, utils::base64_encode};
 use multiversx_sdk::{
-    data::{address::Address as ErdrsAddress, transaction::Transaction},
-    utils::base64_encode,
+    gateway::{GatewayAsyncService, SendTxRequest},
+    retrieve_tx_on_network,
 };
 
-const DEPLOY_RECEIVER: [u8; 32] = [0u8; 32];
-
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub(crate) fn sc_deploy_to_blockchain_tx(&self, sc_deploy_step: &ScDeployStep) -> Transaction {
         Transaction {
             nonce: 0,
             value: sc_deploy_step.tx.egld_value.value.to_string(),
-            sender: mandos_to_erdrs_address(&sc_deploy_step.tx.from),
-            receiver: ErdrsAddress::from_bytes(DEPLOY_RECEIVER),
+            sender: sc_deploy_step.tx.from.to_address().into(),
+            receiver: Address::zero().into(),
             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())),
@@ -38,7 +40,7 @@ impl Interactor {
             .await;
         let tx_hash = self
             .proxy
-            .send_transaction(&transaction)
+            .request(SendTxRequest(&transaction))
             .await
             .expect("error sending tx (possible API failure)");
         println!("sc deploy tx hash: {tx_hash}");
@@ -53,11 +55,14 @@ 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.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
+        self.generate_blocks_until_tx_processed(&tx_hash)
+            .await
+            .unwrap();
+        let (tx, return_code) = retrieve_tx_on_network(&self.proxy, tx_hash.clone()).await;
 
         let addr = sc_deploy_step.tx.from.clone();
         let nonce = tx.nonce;
-        sc_deploy_step.save_response(network_response::parse_tx_response(tx));
+        sc_deploy_step.save_response(network_response::parse_tx_response(tx, return_code));
 
         let deploy_address = sc_deploy_step
             .response()
diff --git a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_extra.rs
similarity index 97%
rename from framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
rename to framework/snippets/src/interactor/interactor_scenario/interactor_sc_extra.rs
index 44e5efa744..b08d1f284f 100644
--- a/framework/snippets/src/interactor_scenario/interactor_sc_extra.rs
+++ b/framework/snippets/src/interactor/interactor_scenario/interactor_sc_extra.rs
@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 
-use crate::Interactor;
+use crate::InteractorBase;
 use multiversx_sc_scenario::{
     api::StaticApi,
     multiversx_sc::{
@@ -13,8 +13,12 @@ use multiversx_sc_scenario::{
         TypedScDeploy, TypedScQuery,
     },
 };
+use multiversx_sdk::gateway::GatewayAsyncService;
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     #[deprecated(
         since = "0.49.0",
         note = "Please use the unified transaction syntax instead."
diff --git a/framework/snippets/src/interactor_scenario/interactor_transfer.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_transfer.rs
similarity index 55%
rename from framework/snippets/src/interactor_scenario/interactor_transfer.rs
rename to framework/snippets/src/interactor/interactor_scenario/interactor_transfer.rs
index 6557e4119f..36a0a342db 100644
--- a/framework/snippets/src/interactor_scenario/interactor_transfer.rs
+++ b/framework/snippets/src/interactor/interactor_scenario/interactor_transfer.rs
@@ -1,8 +1,15 @@
-use crate::Interactor;
+use crate::InteractorBase;
 use log::info;
 use multiversx_sc_scenario::{scenario::ScenarioRunner, scenario_model::TransferStep};
+use multiversx_sdk::{
+    gateway::{GatewayAsyncService, SendTxRequest},
+    retrieve_tx_on_network,
+};
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub async fn transfer(&mut self, transfer_step: TransferStep) -> String {
         self.pre_runners.run_transfer_step(&transfer_step);
 
@@ -10,11 +17,19 @@ impl Interactor {
         let mut transaction = self.tx_call_to_blockchain_tx(&transfer_step.tx.to_tx_call());
         self.set_nonce_and_sign_tx(sender_address, &mut transaction)
             .await;
-        let tx_hash = self.proxy.send_transaction(&transaction).await.unwrap();
+        let tx_hash = self
+            .proxy
+            .request(SendTxRequest(&transaction))
+            .await
+            .unwrap();
+        self.generate_blocks_until_tx_processed(&tx_hash)
+            .await
+            .unwrap();
+
         println!("transfer tx hash: {tx_hash}");
         info!("transfer tx hash: {}", tx_hash);
 
-        self.proxy.retrieve_tx_on_network(tx_hash.clone()).await;
+        retrieve_tx_on_network(&self.proxy, tx_hash.clone()).await;
 
         self.post_runners.run_transfer_step(&transfer_step);
 
diff --git a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs b/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs
similarity index 77%
rename from framework/snippets/src/interactor_scenario/interactor_vm_query.rs
rename to framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs
index aa9f87efb7..d9d893a8c0 100644
--- a/framework/snippets/src/interactor_scenario/interactor_vm_query.rs
+++ b/framework/snippets/src/interactor/interactor_scenario/interactor_vm_query.rs
@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 
-use crate::{address_h256_to_erdrs, Interactor};
+use crate::InteractorBase;
 use log::info;
 use multiversx_sc_scenario::{
     api::StaticApi,
@@ -8,9 +8,13 @@ use multiversx_sc_scenario::{
     multiversx_sc::{abi::TypeAbiFrom, codec::TopDecodeMulti, types::ContractCall},
     scenario_model::{ScQueryStep, TxResponse},
 };
-use multiversx_sdk::{data::vm::VmValueRequest, utils::base64_decode};
+use multiversx_sdk::gateway::{GatewayAsyncService, VMQueryRequest};
+use multiversx_sdk::{data::vm::VMQueryInput, utils::base64_decode};
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub async fn sc_query<S>(&mut self, mut step: S) -> &mut Self
     where
         S: AsMut<ScQueryStep>,
@@ -20,9 +24,9 @@ impl Interactor {
     }
 
     pub async fn perform_sc_query(&mut self, step: &mut ScQueryStep) {
-        let sc_address = address_h256_to_erdrs(&step.tx.to.to_address());
-        let req = VmValueRequest {
-            sc_address: sc_address.clone(),
+        let sc_address = step.tx.to.to_address();
+        let req = VMQueryInput {
+            sc_address: sc_address.clone().into(),
             func_name: step.tx.function.clone(),
             args: step
                 .tx
@@ -30,12 +34,10 @@ impl Interactor {
                 .iter()
                 .map(|arg| hex::encode(&arg.value))
                 .collect(),
-            caller: sc_address,
-            value: "0".to_string(),
         };
         let result = self
             .proxy
-            .execute_vmquery(&req)
+            .request(VMQueryRequest(&req))
             .await
             .expect("error executing VM query");
 
diff --git a/framework/snippets/src/interactor_sender.rs b/framework/snippets/src/interactor/interactor_sender.rs
similarity index 82%
rename from framework/snippets/src/interactor_sender.rs
rename to framework/snippets/src/interactor/interactor_sender.rs
index 86d6abcada..e3877dec0a 100644
--- a/framework/snippets/src/interactor_sender.rs
+++ b/framework/snippets/src/interactor/interactor_sender.rs
@@ -1,8 +1,9 @@
+use crate::sdk::{data::transaction::Transaction, wallet::Wallet};
 use log::debug;
 use multiversx_sc_scenario::multiversx_sc::types::Address;
-use multiversx_sdk::{data::transaction::Transaction, wallet::Wallet};
+use multiversx_sdk::gateway::{GatewayAsyncService, GetAccountRequest};
 
-use crate::{address_h256_to_erdrs, Interactor};
+use crate::InteractorBase;
 
 /// A user account that can sign transactions (a pem is present).
 pub struct Sender {
@@ -11,12 +12,14 @@ pub struct Sender {
     pub current_nonce: Option<u64>,
 }
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub async fn recall_nonce(&self, address: &Address) -> u64 {
-        let erdrs_address = address_h256_to_erdrs(address);
         let account = self
             .proxy
-            .get_account(&erdrs_address)
+            .request(GetAccountRequest::new(address))
             .await
             .expect("failed to retrieve account nonce");
         account.nonce
diff --git a/framework/snippets/src/interactor_tx.rs b/framework/snippets/src/interactor/interactor_tx.rs
similarity index 61%
rename from framework/snippets/src/interactor_tx.rs
rename to framework/snippets/src/interactor/interactor_tx.rs
index 1075cc533f..c017699468 100644
--- a/framework/snippets/src/interactor_tx.rs
+++ b/framework/snippets/src/interactor/interactor_tx.rs
@@ -13,12 +13,6 @@ mod interactor_query_step;
 
 pub use interactor_exec_env::InteractorEnvExec;
 pub use interactor_exec_step::InteractorExecStep;
-pub use interactor_prepare_async::InteractorPrepareAsync;
+pub use interactor_prepare_async::{InteractorPrepareAsync, InteractorRunAsync};
 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/interactor_tx/interactor_exec_call.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_call.rs
new file mode 100644
index 0000000000..000daba91a
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_call.rs
@@ -0,0 +1,125 @@
+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 multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync, InteractorRunAsync};
+
+async fn run_async_call<'w, GatewayProxy, From, To, Payment, Gas, RH>(
+    tx: Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        To,
+        Payment,
+        Gas,
+        FunctionCall<StaticApi>,
+        RH,
+    >,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    let mut step_wrapper = tx.tx_to_step();
+    step_wrapper.env.world.sc_call(&mut step_wrapper.step).await;
+    step_wrapper.process_result()
+}
+
+impl<'w, GatewayProxy, From, To, Payment, Gas, RH> InteractorRunAsync
+    for Tx<InteractorEnvExec<'w, GatewayProxy>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Result = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result> {
+        run_async_call(self)
+    }
+}
+
+impl<'w, GatewayProxy, From, To, Payment, Gas, RH> InteractorPrepareAsync
+    for Tx<InteractorEnvExec<'w, GatewayProxy>, From, To, Payment, Gas, FunctionCall<StaticApi>, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorExecStep<'w, GatewayProxy, ScCallStep, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w, GatewayProxy, RH> InteractorExecStep<'w, GatewayProxy, ScCallStep, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    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<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    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/interactor/interactor_tx/interactor_exec_deploy.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_deploy.rs
new file mode 100644
index 0000000000..8871a90030
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_deploy.rs
@@ -0,0 +1,187 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{
+            Code, DeployCall, RHListExec, Tx, TxBaseWithEnv, TxCodeValue, TxFromSpecified, TxGas,
+            TxPayment,
+        },
+    },
+    scenario::tx_to_step::TxToStep,
+    scenario_model::{ScDeployStep, TxResponse},
+    ScenarioTxEnvData,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+use super::{
+    interactor_prepare_async::InteractorRunAsync, InteractorEnvExec, InteractorExecStep,
+    InteractorPrepareAsync,
+};
+
+#[allow(clippy::type_complexity)]
+async fn run_async_deploy<'w, GatewayProxy, From, Payment, Gas, CodeValue, RH>(
+    tx: Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    let mut step_wrapper = tx.tx_to_step();
+    step_wrapper
+        .env
+        .world
+        .sc_deploy(&mut step_wrapper.step)
+        .await;
+    step_wrapper.process_result()
+}
+
+impl<'w, GatewayProxy, From, Payment, Gas, CodeValue, RH> InteractorRunAsync
+    for Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Result = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result> {
+        run_async_deploy(self)
+    }
+}
+
+impl<'w, GatewayProxy, From, Payment, Gas, CodeValue, RH> InteractorPrepareAsync
+    for Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        (),
+        Payment,
+        Gas,
+        DeployCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorExecStep<'w, GatewayProxy, ScDeployStep, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w, GatewayProxy, RH> InteractorExecStep<'w, GatewayProxy, ScDeployStep, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    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()
+    }
+}
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    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: RHListExec<TxResponse, 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_wrapper = tx.tx_to_step();
+        self.sc_deploy(&mut step_wrapper.step).await;
+        step_wrapper.process_result();
+
+        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: RHListExec<TxResponse, 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_wrapper = tx.tx_to_step();
+        self.sc_deploy(&mut step_wrapper.step).await;
+        step_wrapper.process_result()
+    }
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_exec_env.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_env.rs
new file mode 100644
index 0000000000..c7987d28e6
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_env.rs
@@ -0,0 +1,74 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::types::{
+        ManagedAddress, ManagedBuffer, Tx, TxBaseWithEnv, TxEnv, TxEnvWithTxHash, H256,
+    },
+    scenario_model::TxExpect,
+    ScenarioTxEnv, ScenarioTxEnvData,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub fn tx(&mut self) -> TxBaseWithEnv<InteractorEnvExec<'_, GatewayProxy>> {
+        let data = self.new_env_data();
+        let env = InteractorEnvExec { world: self, data };
+        Tx::new_with_env(env)
+    }
+}
+
+/// Environment for executing transactions.
+pub struct InteractorEnvExec<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub world: &'w mut InteractorBase<GatewayProxy>,
+    pub data: ScenarioTxEnvData,
+}
+
+impl<'w, GatewayProxy> TxEnv for InteractorEnvExec<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    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, GatewayProxy> ScenarioTxEnv for InteractorEnvExec<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    fn env_data(&self) -> &ScenarioTxEnvData {
+        &self.data
+    }
+}
+
+impl<'w, GatewayProxy> TxEnvWithTxHash for InteractorEnvExec<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    fn set_tx_hash(&mut self, tx_hash: H256) {
+        self.data.set_tx_hash(tx_hash);
+    }
+
+    fn take_tx_hash(&mut self) -> Option<H256> {
+        self.data.take_tx_hash()
+    }
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_exec_step.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_step.rs
new file mode 100644
index 0000000000..0ef9666bf8
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_step.rs
@@ -0,0 +1,17 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
+    scenario::tx_to_step::StepWrapper,
+    scenario_model::TxResponse,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use super::InteractorEnvExec;
+
+pub struct InteractorExecStep<'w, GatewayProxy, Step, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub(crate) step_wrapper: StepWrapper<InteractorEnvExec<'w, GatewayProxy>, Step, RH>,
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_exec_transf.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_transf.rs
new file mode 100644
index 0000000000..bb7559ba93
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_transf.rs
@@ -0,0 +1,68 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::types::{Tx, TxFromSpecified, TxGas, TxPayment, TxToSpecified},
+    scenario::tx_to_step::TxToStep,
+    scenario_model::TransferStep,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync, InteractorRunAsync};
+
+async fn run_async_transfer<'w, GatewayProxy, From, To, Payment, Gas>(
+    tx: Tx<InteractorEnvExec<'w, GatewayProxy>, From, To, Payment, Gas, (), ()>,
+) where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+{
+    let step_wrapper = tx.tx_to_step();
+    step_wrapper.env.world.transfer(step_wrapper.step).await;
+}
+
+impl<'w, GatewayProxy, From, To, Payment, Gas> InteractorRunAsync
+    for Tx<InteractorEnvExec<'w, GatewayProxy>, From, To, Payment, Gas, (), ()>
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+{
+    type Result = ();
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result> {
+        run_async_transfer(self)
+    }
+}
+
+impl<'w, GatewayProxy, From, To, Payment, Gas> InteractorPrepareAsync
+    for Tx<InteractorEnvExec<'w, GatewayProxy>, From, To, Payment, Gas, (), ()>
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Payment: TxPayment<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+{
+    type Exec = InteractorExecStep<'w, GatewayProxy, TransferStep, ()>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
+
+impl<'w, GatewayProxy> InteractorExecStep<'w, GatewayProxy, TransferStep, ()>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub async fn run(self) {
+        self.step_wrapper
+            .env
+            .world
+            .transfer(self.step_wrapper.step)
+            .await;
+    }
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_exec_upgrade.rs b/framework/snippets/src/interactor/interactor_tx/interactor_exec_upgrade.rs
new file mode 100644
index 0000000000..601cbad17b
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_exec_upgrade.rs
@@ -0,0 +1,98 @@
+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, code_annotated, StepWrapper, TxToStep},
+    scenario_model::{ScDeployStep, TxResponse},
+    ScenarioTxEnvData,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync, InteractorRunAsync};
+
+#[allow(clippy::type_complexity)]
+async fn run_async_upgrade<'w, GatewayProxy, From, To, Gas, CodeValue, RH>(
+    tx: Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        To,
+        NotPayable,
+        Gas,
+        UpgradeCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    let mut step_wrapper = tx.tx_to_step();
+    step_wrapper.env.world.sc_call(&mut step_wrapper.step).await;
+    step_wrapper.process_result()
+}
+
+impl<'w, GatewayProxy, From, To, Gas, CodeValue, RH> InteractorRunAsync
+    for Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        To,
+        NotPayable,
+        Gas,
+        UpgradeCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Result = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result> {
+        run_async_upgrade(self)
+    }
+}
+
+impl<'w, GatewayProxy, From, To, Gas, CodeValue, RH> InteractorPrepareAsync
+    for Tx<
+        InteractorEnvExec<'w, GatewayProxy>,
+        From,
+        To,
+        NotPayable,
+        Gas,
+        UpgradeCall<InteractorEnvExec<'w, GatewayProxy>, Code<CodeValue>>,
+        RH,
+    >
+where
+    GatewayProxy: GatewayAsyncService,
+    From: TxFromSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    To: TxToSpecified<InteractorEnvExec<'w, GatewayProxy>>,
+    Gas: TxGas<InteractorEnvExec<'w, GatewayProxy>>,
+    CodeValue: TxCodeValue<InteractorEnvExec<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvExec<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorExecStep<'w, GatewayProxy, ScCallStep, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorExecStep {
+            step_wrapper: self.tx_to_step(),
+        }
+    }
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_prepare_async.rs b/framework/snippets/src/interactor/interactor_tx/interactor_prepare_async.rs
new file mode 100644
index 0000000000..fcb8f7a7d9
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_prepare_async.rs
@@ -0,0 +1,32 @@
+use multiversx_sc_scenario::{imports::InterpreterContext, ScenarioTxEnvData};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
+        ScenarioTxEnvData {
+            interpreter_context: InterpreterContext::new().with_dir(self.current_dir.clone()),
+            tx_hash: None,
+        }
+    }
+}
+
+pub trait InteractorPrepareAsync {
+    type Exec;
+
+    #[deprecated(
+        since = "0.54.0",
+        note = "Calling `.prepare_async()` no longer necessary, `.run()` can be called directly."
+    )]
+    fn prepare_async(self) -> Self::Exec;
+}
+
+pub trait InteractorRunAsync {
+    type Result;
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result>;
+}
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_query_call.rs b/framework/snippets/src/interactor/interactor_tx/interactor_query_call.rs
new file mode 100644
index 0000000000..70821b831b
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_query_call.rs
@@ -0,0 +1,109 @@
+use multiversx_sc_scenario::{
+    api::StaticApi,
+    multiversx_sc::{
+        tuple_util::NestedTupleFlatten,
+        types::{FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxNoPayment, TxToSpecified},
+    },
+    scenario::tx_to_step::TxToQueryStep,
+    scenario_model::TxResponse,
+    ScenarioTxEnvData,
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use crate::InteractorBase;
+
+use super::{InteractorEnvQuery, InteractorPrepareAsync, InteractorQueryStep, InteractorRunAsync};
+
+async fn run_async_query<'w, GatewayProxy, To, Payment, RH>(
+    tx: Tx<InteractorEnvQuery<'w, GatewayProxy>, (), To, Payment, (), FunctionCall<StaticApi>, RH>,
+) -> <RH::ListReturns as NestedTupleFlatten>::Unpacked
+where
+    GatewayProxy: GatewayAsyncService,
+    To: TxToSpecified<InteractorEnvQuery<'w, GatewayProxy>>,
+    Payment: TxNoPayment<InteractorEnvQuery<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    let mut step_wrapper = tx.tx_to_query_step();
+    step_wrapper
+        .env
+        .world
+        .sc_query(&mut step_wrapper.step)
+        .await;
+    step_wrapper.process_result()
+}
+
+impl<'w, GatewayProxy, To, Payment, RH> InteractorRunAsync
+    for Tx<InteractorEnvQuery<'w, GatewayProxy>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    To: TxToSpecified<InteractorEnvQuery<'w, GatewayProxy>>,
+    Payment: TxNoPayment<InteractorEnvQuery<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Result = <RH::ListReturns as NestedTupleFlatten>::Unpacked;
+
+    fn run(self) -> impl std::future::Future<Output = Self::Result> {
+        run_async_query(self)
+    }
+}
+
+impl<'w, GatewayProxy, To, Payment, RH> InteractorPrepareAsync
+    for Tx<InteractorEnvQuery<'w, GatewayProxy>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    To: TxToSpecified<InteractorEnvQuery<'w, GatewayProxy>>,
+    Payment: TxNoPayment<InteractorEnvQuery<'w, GatewayProxy>>,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    type Exec = InteractorQueryStep<'w, GatewayProxy, RH>;
+
+    fn prepare_async(self) -> Self::Exec {
+        InteractorQueryStep {
+            step_wrapper: self.tx_to_query_step(),
+        }
+    }
+}
+
+impl<'w, GatewayProxy, RH> InteractorQueryStep<'w, GatewayProxy, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w, GatewayProxy>>,
+    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<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    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, Payment, (), 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/interactor_tx/interactor_query_env.rs
similarity index 60%
rename from framework/snippets/src/interactor_tx/interactor_query_env.rs
rename to framework/snippets/src/interactor/interactor_tx/interactor_query_env.rs
index 71dcd2f3b4..25d0b5e822 100644
--- a/framework/snippets/src/interactor_tx/interactor_query_env.rs
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_query_env.rs
@@ -4,23 +4,33 @@ use multiversx_sc_scenario::{
     scenario_model::TxExpect,
     ScenarioTxEnv, ScenarioTxEnvData,
 };
+use multiversx_sdk::gateway::GatewayAsyncService;
 
-use crate::Interactor;
+use crate::InteractorBase;
 
-impl Interactor {
-    pub fn query(&mut self) -> TxBaseWithEnv<InteractorEnvQuery<'_>> {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub fn query(&mut self) -> TxBaseWithEnv<InteractorEnvQuery<'_, GatewayProxy>> {
         let data = self.new_env_data();
         let env = InteractorEnvQuery { world: self, data };
         Tx::new_with_env(env)
     }
 }
 
-pub struct InteractorEnvQuery<'w> {
-    pub world: &'w mut Interactor,
+pub struct InteractorEnvQuery<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    pub world: &'w mut InteractorBase<GatewayProxy>,
     pub data: ScenarioTxEnvData,
 }
 
-impl<'w> TxEnv for InteractorEnvQuery<'w> {
+impl<'w, GatewayProxy> TxEnv for InteractorEnvQuery<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     type Api = StaticApi;
 
     type RHExpect = TxExpect;
@@ -38,7 +48,10 @@ impl<'w> TxEnv for InteractorEnvQuery<'w> {
     }
 }
 
-impl<'w> ScenarioTxEnv for InteractorEnvQuery<'w> {
+impl<'w, GatewayProxy> ScenarioTxEnv for InteractorEnvQuery<'w, GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     fn env_data(&self) -> &ScenarioTxEnvData {
         &self.data
     }
diff --git a/framework/snippets/src/interactor/interactor_tx/interactor_query_step.rs b/framework/snippets/src/interactor/interactor_tx/interactor_query_step.rs
new file mode 100644
index 0000000000..ae4645ff3a
--- /dev/null
+++ b/framework/snippets/src/interactor/interactor_tx/interactor_query_step.rs
@@ -0,0 +1,17 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
+    scenario::tx_to_step::StepWrapper,
+    scenario_model::{ScQueryStep, TxResponse},
+};
+use multiversx_sdk::gateway::GatewayAsyncService;
+
+use super::InteractorEnvQuery;
+
+pub struct InteractorQueryStep<'w, GatewayProxy, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+    RH: RHListExec<TxResponse, InteractorEnvQuery<'w, GatewayProxy>>,
+    RH::ListReturns: NestedTupleFlatten,
+{
+    pub(crate) step_wrapper: StepWrapper<InteractorEnvQuery<'w, GatewayProxy>, ScQueryStep, RH>,
+}
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_call.rs b/framework/snippets/src/interactor_tx/interactor_exec_call.rs
deleted file mode 100644
index 261ce44989..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_call.rs
+++ /dev/null
@@ -1,76 +0,0 @@
-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::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
-
-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 = 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, 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 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/interactor_tx/interactor_exec_deploy.rs b/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
deleted file mode 100644
index 6070158258..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_deploy.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use multiversx_sc_scenario::{
-    multiversx_sc::{
-        tuple_util::NestedTupleFlatten,
-        types::{
-            Code, DeployCall, RHListExec, Tx, TxBaseWithEnv, TxCodeValue, TxFromSpecified, TxGas,
-            TxPayment,
-        },
-    },
-    scenario::tx_to_step::TxToStep,
-    scenario_model::{ScDeployStep, TxResponse},
-    ScenarioTxEnvData,
-};
-
-use crate::Interactor;
-
-use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
-
-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: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    type Exec = InteractorExecStep<'w, ScDeployStep, RH>;
-
-    fn prepare_async(self) -> Self::Exec {
-        InteractorExecStep {
-            step_wrapper: self.tx_to_step(),
-        }
-    }
-}
-
-impl<'w, RH> InteractorExecStep<'w, ScDeployStep, 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_deploy(&mut self.step_wrapper.step)
-            .await;
-        self.step_wrapper.process_result()
-    }
-}
-
-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: RHListExec<TxResponse, 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_wrapper = tx.tx_to_step();
-        self.sc_deploy(&mut step_wrapper.step).await;
-        step_wrapper.process_result();
-
-        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: RHListExec<TxResponse, 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_wrapper = tx.tx_to_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
deleted file mode 100644
index 6473c50a91..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_env.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-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<InteractorEnvExec<'_>> {
-        let data = self.new_env_data();
-        let env = InteractorEnvExec { world: self, data };
-        Tx::new_with_env(env)
-    }
-}
-
-/// 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
-    }
-}
diff --git a/framework/snippets/src/interactor_tx/interactor_exec_step.rs b/framework/snippets/src/interactor_tx/interactor_exec_step.rs
deleted file mode 100644
index 1d4eabf54d..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_step.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use multiversx_sc_scenario::{
-    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
-    scenario::tx_to_step::StepWrapper,
-    scenario_model::TxResponse,
-};
-
-use super::InteractorEnvExec;
-
-pub struct InteractorExecStep<'w, Step, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvExec<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    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
deleted file mode 100644
index 3ec04c0b05..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_transf.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use multiversx_sc_scenario::{
-    multiversx_sc::types::{Tx, TxFromSpecified, TxGas, TxPayment, TxToSpecified},
-    scenario::tx_to_step::TxToStep,
-    scenario_model::TransferStep,
-};
-
-use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
-
-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 = 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/interactor_tx/interactor_exec_upgrade.rs b/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
deleted file mode 100644
index af68999830..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_exec_upgrade.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-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, code_annotated, StepWrapper, TxToStep},
-    scenario_model::{ScDeployStep, TxResponse},
-    ScenarioTxEnvData,
-};
-
-use crate::Interactor;
-
-use super::{InteractorEnvExec, InteractorExecStep, InteractorPrepareAsync};
-
-impl<'w, From, To, Gas, CodeValue, RH> InteractorPrepareAsync
-    for Tx<
-        InteractorEnvExec<'w>,
-        From,
-        To,
-        NotPayable,
-        Gas,
-        UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
-        RH,
-    >
-where
-    From: TxFromSpecified<InteractorEnvExec<'w>>,
-    To: TxToSpecified<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, To, Gas, RH, CodeValue> TxToStep<InteractorEnvExec<'w>, RH>
-    for Tx<
-        InteractorEnvExec<'w>,
-        From,
-        To,
-        NotPayable,
-        Gas,
-        UpgradeCall<InteractorEnvExec<'w>, Code<CodeValue>>,
-        RH,
-    >
-where
-    From: TxFromSpecified<InteractorEnvExec<'w>>,
-    To: TxToSpecified<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.to, 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, 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))
-        .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());
-    }
-
-    step
-}
diff --git a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs b/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
deleted file mode 100644
index 073641f811..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_prepare_async.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use multiversx_sc_scenario::{imports::InterpreterContext, ScenarioTxEnvData};
-
-use crate::Interactor;
-
-impl Interactor {
-    pub(crate) fn new_env_data(&self) -> ScenarioTxEnvData {
-        ScenarioTxEnvData {
-            interpreter_context: InterpreterContext::new().with_dir(self.current_dir.clone()),
-            tx_hash: None,
-        }
-    }
-}
-
-pub trait InteractorPrepareAsync {
-    type Exec;
-
-    fn prepare_async(self) -> Self::Exec;
-}
diff --git a/framework/snippets/src/interactor_tx/interactor_query_call.rs b/framework/snippets/src/interactor_tx/interactor_query_call.rs
deleted file mode 100644
index 5e35b5409b..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_query_call.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use multiversx_sc_scenario::{
-    api::StaticApi,
-    multiversx_sc::{
-        tuple_util::NestedTupleFlatten,
-        types::{FunctionCall, RHListExec, Tx, TxBaseWithEnv, TxNoPayment, TxToSpecified},
-    },
-    scenario::tx_to_step::TxToQueryStep,
-    scenario_model::TxResponse,
-    ScenarioTxEnvData,
-};
-
-use crate::Interactor;
-
-use super::{InteractorEnvQuery, InteractorPrepareAsync, InteractorQueryStep};
-
-impl<'w, To, Payment, RH> InteractorPrepareAsync
-    for Tx<InteractorEnvQuery<'w>, (), To, Payment, (), FunctionCall<StaticApi>, RH>
-where
-    To: TxToSpecified<InteractorEnvQuery<'w>>,
-    Payment: TxNoPayment<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 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, Payment, (), 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_step.rs b/framework/snippets/src/interactor_tx/interactor_query_step.rs
deleted file mode 100644
index bbb7a0996b..0000000000
--- a/framework/snippets/src/interactor_tx/interactor_query_step.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use multiversx_sc_scenario::{
-    multiversx_sc::{tuple_util::NestedTupleFlatten, types::RHListExec},
-    scenario::tx_to_step::StepWrapper,
-    scenario_model::{ScQueryStep, TxResponse},
-};
-
-use super::InteractorEnvQuery;
-
-pub struct InteractorQueryStep<'w, RH>
-where
-    RH: RHListExec<TxResponse, InteractorEnvQuery<'w>>,
-    RH::ListReturns: NestedTupleFlatten,
-{
-    pub(crate) step_wrapper: StepWrapper<InteractorEnvQuery<'w>, ScQueryStep, RH>,
-}
diff --git a/framework/snippets/src/lib.rs b/framework/snippets/src/lib.rs
index 7d3b52c696..8446e46176 100644
--- a/framework/snippets/src/lib.rs
+++ b/framework/snippets/src/lib.rs
@@ -1,25 +1,29 @@
 pub mod account_tool;
 mod interactor;
-mod interactor_dns;
-mod interactor_scenario;
-mod interactor_sender;
-mod interactor_tx;
 mod multi;
 pub mod network_response;
-pub mod test_wallets;
 
 pub use env_logger;
 pub use hex;
 pub use interactor::*;
-pub use interactor_dns::*;
-pub use interactor_sender::*;
-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_core;
 pub use multiversx_sdk as sdk;
-pub use tokio;
 
 /// Imports normally needed in interactors, grouped together.
 pub mod imports;
+
+/// Backwards compatibility.
+pub use crate::sdk_core::test_wallets;
+
+#[cfg(feature = "http")]
+pub type HttpInteractor = crate::InteractorBase<multiversx_sdk_http::GatewayHttpProxy>;
+
+/// Backwards compatibility.
+#[cfg(feature = "http")]
+pub type Interactor = HttpInteractor;
+
+#[cfg(feature = "dapp")]
+pub type DappInteractor = crate::InteractorBase<multiversx_sdk_dapp::GatewayDappProxy>;
diff --git a/framework/snippets/src/multi.rs b/framework/snippets/src/multi.rs
index 973b159858..dd9cd3288a 100644
--- a/framework/snippets/src/multi.rs
+++ b/framework/snippets/src/multi.rs
@@ -5,5 +5,5 @@ mod interactor_step;
 mod step_buffer;
 
 pub use homogenous_tx_buffer::HomogenousTxBuffer;
-pub use interactor_step::InteractorStep;
+pub use interactor_step::{InteractorStep, InteractorStepRef};
 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
index 66f5dec79f..4ee43ab81a 100644
--- a/framework/snippets/src/multi/homogenous_tx_buffer.rs
+++ b/framework/snippets/src/multi/homogenous_tx_buffer.rs
@@ -3,24 +3,33 @@ use multiversx_sc_scenario::{
         tuple_util::NestedTupleFlatten,
         types::{RHListExec, TxBaseWithEnv},
     },
-    scenario::tx_to_step::{StepWithResponse, StepWrapper, TxToStep},
+    scenario::tx_to_step::{StepWrapper, TxToStep},
     scenario_model::TxResponse,
     ScenarioTxEnvData,
 };
+use multiversx_sdk::gateway::GatewayAsyncService;
 
-use crate::{Interactor, InteractorEnvExec, InteractorStep, StepBuffer};
+use crate::{InteractorBase, InteractorEnvExec, InteractorStep, StepBuffer};
 
-pub struct HomogenousTxBuffer<'w, Step, RH> {
-    env: InteractorEnvExec<'w>,
+pub struct HomogenousTxBuffer<'w, GatewayProxy, Step, RH>
+where
+    GatewayProxy: GatewayAsyncService,
+{
+    env: InteractorEnvExec<'w, GatewayProxy>,
     steps: Vec<StepWrapper<ScenarioTxEnvData, Step, RH>>,
 }
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     /// 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> {
+    pub fn homogenous_call_buffer<Step, RH>(
+        &mut self,
+    ) -> HomogenousTxBuffer<'_, GatewayProxy, Step, RH> {
         let data = self.new_env_data();
         let env = InteractorEnvExec { world: self, data };
         HomogenousTxBuffer {
@@ -30,9 +39,10 @@ impl Interactor {
     }
 }
 
-impl<'w, Step, RH> HomogenousTxBuffer<'w, Step, RH>
+impl<'w, GatewayProxy, Step, RH> HomogenousTxBuffer<'w, GatewayProxy, Step, RH>
 where
-    Step: InteractorStep + StepWithResponse,
+    GatewayProxy: GatewayAsyncService,
+    Step: InteractorStep,
     RH: RHListExec<TxResponse, ScenarioTxEnvData>,
     RH::ListReturns: NestedTupleFlatten,
 {
@@ -53,7 +63,7 @@ where
     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);
+            step_buffer.refs.push(step.step.as_interactor_step());
         }
         self.env.world.multi_sc_exec(step_buffer).await;
 
diff --git a/framework/snippets/src/multi/interactor_multi_sc_exec.rs b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
index 8ac6a4eba9..608e392200 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_exec.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_exec.rs
@@ -1,8 +1,13 @@
 use super::interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs};
-use crate::{network_response, Interactor, InteractorStep, StepBuffer};
-use multiversx_sdk::data::transaction::Transaction;
-
-impl Interactor {
+use super::InteractorStepRef;
+use crate::sdk::data::transaction::Transaction;
+use crate::sdk::gateway::GatewayAsyncService;
+use crate::{network_response, InteractorBase, StepBuffer};
+
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub async fn multi_sc_exec(&mut self, mut buffer: StepBuffer<'_>) {
         for step in buffer.refs.iter_mut() {
             step.run_step(&mut self.pre_runners);
@@ -15,9 +20,8 @@ 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(network_response::parse_tx_response(
-                results.get(i).unwrap().clone(),
-            ));
+            let (tx, return_code) = results.get(i).unwrap().clone();
+            sc_call_step.set_response(network_response::parse_tx_response(tx, return_code));
         }
 
         for step in buffer.refs.iter_mut() {
@@ -43,7 +47,7 @@ impl Interactor {
     }
 }
 
-fn retrieve_senders(sc_call_steps: &[&mut dyn InteractorStep]) -> SenderSet {
+fn retrieve_senders(sc_call_steps: &[InteractorStepRef]) -> SenderSet {
     let mut senders = SenderSet::new();
 
     for sc_call_step in sc_call_steps {
diff --git a/framework/snippets/src/multi/interactor_multi_sc_process.rs b/framework/snippets/src/multi/interactor_multi_sc_process.rs
index 3364a4d5ee..d62ce50c1a 100644
--- a/framework/snippets/src/multi/interactor_multi_sc_process.rs
+++ b/framework/snippets/src/multi/interactor_multi_sc_process.rs
@@ -1,12 +1,18 @@
-use crate::{multiversx_sc::types::Address, Interactor, Sender};
+use crate::sdk::data::transaction::{Transaction, TransactionOnNetwork};
+use crate::{multiversx_sc::types::Address, InteractorBase, Sender};
 use futures::future::join_all;
-use multiversx_sdk::data::transaction::{Transaction, TransactionOnNetwork};
+use multiversx_sc_scenario::imports::ReturnCode;
+use multiversx_sdk::gateway::{GatewayAsyncService, SendTxRequest};
+use multiversx_sdk::retrieve_tx_on_network;
 use std::collections::HashSet;
 
 pub(crate) type Txs = Vec<Transaction>;
 pub(crate) type SenderSet = HashSet<Address>;
 
-impl Interactor {
+impl<GatewayProxy> InteractorBase<GatewayProxy>
+where
+    GatewayProxy: GatewayAsyncService,
+{
     pub(crate) async fn recall_senders_nonce(&mut self, senders: HashSet<Address>) {
         for sender_address in &senders {
             let nonce = self.recall_nonce(sender_address).await;
@@ -20,20 +26,24 @@ impl Interactor {
         }
     }
 
-    pub(crate) async fn process_txs(&mut self, txs: Vec<Transaction>) -> Vec<TransactionOnNetwork> {
+    pub(crate) async fn process_txs(
+        &mut self,
+        txs: Vec<Transaction>,
+    ) -> Vec<(TransactionOnNetwork, ReturnCode)> {
         let mut futures = Vec::new();
 
         for tx in &txs {
             let tx_hash = self
                 .proxy
-                .send_transaction(tx)
+                .request(SendTxRequest(tx))
                 .await
                 .expect("failed to send transaction");
 
             println!("process tx hash: {tx_hash} with nonce: {}", tx.nonce);
-            futures.push(self.proxy.retrieve_tx_on_network(tx_hash.clone()));
+            futures.push(retrieve_tx_on_network(&self.proxy, tx_hash.clone()));
         }
 
+        self.generate_blocks(4).await.unwrap();
         join_all(futures).await
     }
 }
diff --git a/framework/snippets/src/multi/interactor_step.rs b/framework/snippets/src/multi/interactor_step.rs
index be172bbb82..93a93d6a9e 100644
--- a/framework/snippets/src/multi/interactor_step.rs
+++ b/framework/snippets/src/multi/interactor_step.rs
@@ -1,55 +1,66 @@
+use crate::sdk::data::transaction::Transaction;
 use multiversx_sc_scenario::{
     mandos_system::ScenarioRunner,
+    scenario::tx_to_step::StepWithResponse,
     scenario_model::{AddressValue, ScCallStep, ScDeployStep, TxResponse},
 };
-use multiversx_sdk::data::transaction::Transaction;
+use multiversx_sdk::gateway::GatewayAsyncService;
 
-use crate::Interactor;
+use crate::InteractorBase;
 
-/// Describes a scenario step that can be executed in an interactor.
-pub trait InteractorStep {
-    fn to_transaction(&self, interactor: &Interactor) -> Transaction;
-
-    fn sender_address(&self) -> &AddressValue;
-
-    fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner);
-
-    fn set_response(&mut self, tx_response: TxResponse);
+pub enum InteractorStepRef<'a> {
+    ScCall(&'a mut ScCallStep),
+    ScDeploy(&'a mut ScDeployStep),
 }
 
-impl InteractorStep for ScCallStep {
-    fn to_transaction(&self, interactor: &Interactor) -> Transaction {
-        interactor.tx_call_to_blockchain_tx(&self.tx)
+impl<'a> InteractorStepRef<'a> {
+    pub fn to_transaction<GatewayProxy: GatewayAsyncService>(
+        &self,
+        interactor: &InteractorBase<GatewayProxy>,
+    ) -> Transaction {
+        match self {
+            InteractorStepRef::ScCall(sc_call) => interactor.tx_call_to_blockchain_tx(&sc_call.tx),
+            InteractorStepRef::ScDeploy(sc_deploy) => {
+                interactor.sc_deploy_to_blockchain_tx(sc_deploy)
+            },
+        }
     }
 
-    fn sender_address(&self) -> &AddressValue {
-        &self.tx.from
+    pub fn sender_address(&self) -> &AddressValue {
+        match self {
+            InteractorStepRef::ScCall(sc_call) => &sc_call.tx.from,
+            InteractorStepRef::ScDeploy(sc_deploy) => &sc_deploy.tx.from,
+        }
     }
 
-    fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner) {
-        let mut clone = self.clone();
-        step_runner.run_sc_call_step(&mut clone); // TODO: make mutability uniform
+    pub fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner) {
+        match self {
+            InteractorStepRef::ScCall(sc_call) => step_runner.run_sc_call_step(sc_call),
+            InteractorStepRef::ScDeploy(sc_deploy) => step_runner.run_sc_deploy_step(sc_deploy),
+        }
     }
 
-    fn set_response(&mut self, response: TxResponse) {
-        self.save_response(response);
+    pub fn set_response(&mut self, tx_response: TxResponse) {
+        match self {
+            InteractorStepRef::ScCall(sc_call) => sc_call.save_response(tx_response),
+            InteractorStepRef::ScDeploy(sc_deploy) => sc_deploy.save_response(tx_response),
+        }
     }
 }
 
-impl InteractorStep for ScDeployStep {
-    fn to_transaction(&self, interactor: &Interactor) -> Transaction {
-        interactor.sc_deploy_to_blockchain_tx(self)
-    }
-
-    fn sender_address(&self) -> &AddressValue {
-        &self.tx.from
-    }
+/// Describes a scenario step that can be executed in an interactor.
+pub trait InteractorStep: StepWithResponse {
+    fn as_interactor_step(&mut self) -> InteractorStepRef<'_>;
+}
 
-    fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner) {
-        step_runner.run_sc_deploy_step(self);
+impl InteractorStep for ScCallStep {
+    fn as_interactor_step(&mut self) -> InteractorStepRef<'_> {
+        InteractorStepRef::ScCall(self)
     }
+}
 
-    fn set_response(&mut self, response: TxResponse) {
-        self.save_response(response);
+impl InteractorStep for ScDeployStep {
+    fn as_interactor_step(&mut self) -> InteractorStepRef<'_> {
+        InteractorStepRef::ScDeploy(self)
     }
 }
diff --git a/framework/snippets/src/multi/step_buffer.rs b/framework/snippets/src/multi/step_buffer.rs
index 529b790ff5..b25835f319 100644
--- a/framework/snippets/src/multi/step_buffer.rs
+++ b/framework/snippets/src/multi/step_buffer.rs
@@ -1,10 +1,10 @@
 use multiversx_sc_scenario::scenario_model::{ScCallStep, ScDeployStep};
 
-use crate::InteractorStep;
+use super::InteractorStepRef;
 
 #[derive(Default)]
 pub struct StepBuffer<'a> {
-    pub refs: Vec<&'a mut dyn InteractorStep>,
+    pub refs: Vec<InteractorStepRef<'a>>,
 }
 
 impl<'a> StepBuffer<'a> {
@@ -17,7 +17,7 @@ impl<'a> StepBuffer<'a> {
         'b: 'a,
         S: AsMut<ScCallStep>,
     {
-        self.refs.push(step.as_mut());
+        self.refs.push(InteractorStepRef::ScCall(step.as_mut()));
     }
 
     pub fn add_sc_call_vec<'b, S>(&'a mut self, steps: &'b mut Vec<S>)
@@ -26,7 +26,7 @@ impl<'a> StepBuffer<'a> {
         S: AsMut<ScCallStep>,
     {
         for step in steps {
-            self.refs.push(step.as_mut());
+            self.refs.push(InteractorStepRef::ScCall(step.as_mut()));
         }
     }
 
@@ -37,7 +37,7 @@ impl<'a> StepBuffer<'a> {
     {
         let mut buffer = Self::default();
         for step in steps {
-            buffer.refs.push(step.as_mut());
+            buffer.refs.push(InteractorStepRef::ScCall(step.as_mut()));
         }
         buffer
     }
@@ -49,12 +49,8 @@ impl<'a> StepBuffer<'a> {
     {
         let mut buffer = Self::default();
         for step in steps {
-            buffer.refs.push(step.as_mut());
+            buffer.refs.push(InteractorStepRef::ScDeploy(step.as_mut()));
         }
         buffer
     }
-
-    pub fn to_refs_vec(&'a self) -> Vec<&'a dyn InteractorStep> {
-        self.refs.iter().map(|r| &**r).collect()
-    }
 }
diff --git a/framework/snippets/src/network_response.rs b/framework/snippets/src/network_response.rs
index d505e7a525..c17ae4456d 100644
--- a/framework/snippets/src/network_response.rs
+++ b/framework/snippets/src/network_response.rs
@@ -1,22 +1,23 @@
-use multiversx_sc_scenario::{
-    imports::{Address, ESDTSystemSCAddress},
-    multiversx_chain_vm::crypto_functions::keccak256,
-    scenario_model::{TxResponse, TxResponseStatus},
-};
-use multiversx_sdk::{
+use crate::sdk::{
     data::transaction::{ApiSmartContractResult, Events, TransactionOnNetwork},
     utils::base64_decode,
 };
+use multiversx_sc_scenario::{
+    imports::{Address, ESDTSystemSCAddress, ReturnCode},
+    multiversx_chain_vm::{crypto_functions::keccak256, types::H256},
+    scenario_model::{Log, TxResponse, TxResponseStatus},
+};
 
 const SC_DEPLOY_PROCESSING_TYPE: &str = "SCDeployment";
 const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
 
 /// Creates a [`TxResponse`] from a [`TransactionOnNetwork`].
-pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
-    let tx_error = process_signal_error(&tx);
+pub fn parse_tx_response(tx: TransactionOnNetwork, return_code: ReturnCode) -> TxResponse {
+    let tx_error = process_signal_error(&tx, return_code);
     if !tx_error.is_success() {
         return TxResponse {
             tx_error,
+            tx_hash: process_tx_hash(&tx),
             ..Default::default()
         };
     }
@@ -24,16 +25,12 @@ pub fn parse_tx_response(tx: TransactionOnNetwork) -> TxResponse {
     process_success(&tx)
 }
 
-fn process_signal_error(tx: &TransactionOnNetwork) -> TxResponseStatus {
+fn process_signal_error(tx: &TransactionOnNetwork, return_code: ReturnCode) -> 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);
-        }
 
-        let error_raw = base64_decode(topics.unwrap().get(1).unwrap());
-        let error = String::from_utf8(error_raw).unwrap();
-        return TxResponseStatus::signal_error(&error);
+        let error = topics.unwrap().first().unwrap();
+        return TxResponseStatus::new(return_code, error);
     }
 
     TxResponseStatus::default()
@@ -44,10 +41,21 @@ 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),
+        tx_hash: process_tx_hash(tx),
+        gas_used: tx.gas_used,
         ..Default::default()
     }
 }
 
+fn process_tx_hash(tx: &TransactionOnNetwork) -> Option<H256> {
+    tx.hash.as_ref().map(|encoded_hash| {
+        let decoded = hex::decode(encoded_hash).expect("error decoding tx hash from hex");
+        assert_eq!(decoded.len(), 32);
+        H256::from_slice(&decoded)
+    })
+}
+
 fn process_out(tx: &TransactionOnNetwork) -> Vec<Vec<u8>> {
     let out_scr = tx.smart_contract_results.iter().find(is_out_scr);
 
@@ -58,18 +66,55 @@ 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: Address::from_slice(&event.address.to_bytes()),
+                endpoint: event.identifier.clone(),
+                topics: extract_topics(event),
+                data: extract_data(event),
+            })
+            .collect::<Vec<Log>>();
+    }
+
+    Vec::new()
+}
+
+fn extract_data(event: &Events) -> Vec<Vec<u8>> {
+    let mut out: Vec<Vec<u8>> = Vec::new();
+    event
+        .data
+        .for_each(|data_field| out.push(data_field.clone().into_bytes()));
+    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 decoded_data = String::from_utf8(base64_decode(data)).unwrap();
+                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 = decode_scr_data_or_panic(decoded_data.as_str());
-                        return Some(out);
+                        let out_content = decode_scr_data_or_panic(decoded_data.as_str());
+                        out.extend(out_content);
                     }
-                }
+                });
+                return Some(out);
             }
 
             None
@@ -103,25 +148,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() {
+        if scr.sender.0 != ESDTSystemSCAddress.to_address() {
             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 +186,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/framework/snippets/tests/test_tx_deployed_address.rs b/framework/snippets/tests/test_tx_deployed_address.rs
index 377a0e779f..defb712946 100644
--- a/framework/snippets/tests/test_tx_deployed_address.rs
+++ b/framework/snippets/tests/test_tx_deployed_address.rs
@@ -1,6 +1,7 @@
-use multiversx_sc_scenario::imports::Address;
+use multiversx_sc_scenario::imports::{Address, ReturnCode};
 use multiversx_sc_snippets::network_response;
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sc_snippets::sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sdk::bech32;
 
 #[test]
 fn test_deployed_address() {
@@ -53,12 +54,10 @@ fn test_deployed_address() {
         .data
         .unwrap()
         .transaction;
-    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()
-            .unwrap()
-    });
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
+    let opt_address = tx_response
+        .new_deployed_address
+        .map(|address| bech32::encode(&address));
 
     let expected =
         Some("erd1qqqqqqqqqqqqqpgqwpdf84ggxzqzmr2zmw959q4nlf9nz562q33sak25ze".to_string());
@@ -124,7 +123,7 @@ fn test_deployed_address_should_be_none_if_not_a_sc_deployment_tx() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
     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 3539c4e757..58447140a7 100644
--- a/framework/snippets/tests/test_tx_issued_token_identifier.rs
+++ b/framework/snippets/tests/test_tx_issued_token_identifier.rs
@@ -1,5 +1,6 @@
+use multiversx_sc_scenario::imports::ReturnCode;
 use multiversx_sc_snippets::network_response;
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sc_snippets::sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
 fn test_process_issued_token_identifier_fungible() {
@@ -203,7 +204,7 @@ fn test_process_issued_token_identifier_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Option<String> = Some("EGLDMEX-95c6d5".to_string());
 
@@ -362,7 +363,7 @@ fn test_process_issued_token_identifier_semi_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Option<String> = Some("DOPETEST-77200c".to_string());
 
@@ -618,7 +619,7 @@ fn test_process_issued_token_identifier_non_fungible() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Option<String> = Some("GEN-868593".to_string());
 
@@ -919,7 +920,7 @@ fn test_process_issued_token_identifier_meta_esdt() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Option<String> = Some("AVASH-7d8b5d".to_string());
 
@@ -1152,7 +1153,7 @@ fn test_set_special_roles_should_not_process_issued_token_identifier() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Option<String> = None;
 
@@ -1414,7 +1415,7 @@ fn test_multisig_issue_nft_and_set_all_roles() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected = Some("TESTCOLL1-5aa80c".to_string());
 
diff --git a/framework/snippets/tests/test_tx_logs.rs b/framework/snippets/tests/test_tx_logs.rs
new file mode 100644
index 0000000000..1beb99a35f
--- /dev/null
+++ b/framework/snippets/tests/test_tx_logs.rs
@@ -0,0 +1,119 @@
+use multiversx_sc_scenario::imports::ReturnCode;
+use multiversx_sc_snippets::network_response;
+use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+
+#[test]
+fn test_tx_multiple_logs() {
+    let data = r#"
+    {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+      "nonce": 6768,
+      "round": 5269269,
+      "epoch": 2169,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+      "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+      "gasPrice": 1000000000,
+      "gasLimit": 30000000,
+      "gasUsed": 30000000,
+      "data": "cG9uZw==",
+      "signature": "dccb8bf68defef89e938e768fea872d34d6a1ba716813fe78c583233e418b6c800973bb353c61c1babf816bae2200c2ff24197e7c7748c007d72560e2ce16108",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 5200682,
+      "blockHash": "b70f33fd98a8cd465cf1a679977d4c0c27f38db6a7634cab57d82e3fd8bd4841",
+      "notarizedAtSourceInMetaNonce": 5204138,
+      "NotarizedAtSourceInMetaHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "notarizedAtDestinationInMetaNonce": 5204138,
+      "notarizedAtDestinationInMetaHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "3217265a72ce8cf40b900a8467b797610fb80eb92158143aac6e9f85e8177945",
+      "hyperblockNonce": 5204138,
+      "hyperblockHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "timestamp": 1725615614,
+      "smartContractResults": [
+        {
+          "hash": "66debb4f02a735f00bd7da565069f7d26412341d6fae56bbab9b98696c8701e9",
+          "nonce": 0,
+          "value": 1000000000000000,
+          "receiver": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+          "sender": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+          "prevTxHash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+          "originalTxHash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "A41+pMaAAA==",
+              "ATlHLv9ohncamC8wg9pdQh8kwpGB5jiIIo3IHKYNaeE="
+            ],
+            "data": "RGlyZWN0Q2FsbA==",
+            "additionalData": [
+              "RGlyZWN0Q2FsbA==",
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "writeLog",
+            "topics": [
+              "ATlHLv9ohncamC8wg9pdQh8kwpGB5jiIIo3IHKYNaeE=",
+              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gMjk5NDQwMDAsIGdhcyB1c2VkID0gMjE3MTk0OA=="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": [
+              "QDZmNmI="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "completedTxEvent",
+            "topics": [
+              "TFVNBg4bSJ1AN1nkRcSk2AsNqlqOzq/HuQk+uKfdS3o="
+            ],
+            "data": null,
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "pong",
+      "initiallyPaidFee": "355440000000000",
+      "fee": "355440000000000",
+      "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 = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
+
+    assert!(tx_response.logs.len() == 3);
+    assert_eq!(tx_response.logs[0].endpoint, "transferValueOnly");
+    assert_eq!(tx_response.logs[1].endpoint, "writeLog");
+    assert_eq!(tx_response.logs[2].endpoint, "completedTxEvent");
+}
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 a9b64d8941..d80dc39f25 100644
--- a/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
+++ b/framework/snippets/tests/test_tx_multi_contract_sc_result.rs
@@ -1,5 +1,6 @@
+use multiversx_sc_scenario::imports::ReturnCode;
 use multiversx_sc_snippets::network_response;
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sc_snippets::sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
 fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
@@ -79,7 +80,7 @@ fn test_with_multi_contract_same_shard_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),
@@ -211,7 +212,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_no_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -340,7 +341,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_non_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Vec<Vec<u8>> = vec![];
 
@@ -469,7 +470,7 @@ fn test_with_multi_contract_cross_shard_tx_that_has_returning_callback() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     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 4fee781b7f..e31184c110 100644
--- a/framework/snippets/tests/test_tx_multiple_sc_results.rs
+++ b/framework/snippets/tests/test_tx_multiple_sc_results.rs
@@ -1,5 +1,6 @@
+use multiversx_sc_scenario::imports::ReturnCode;
 use multiversx_sc_snippets::network_response::{self, is_out_scr};
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sc_snippets::sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
 fn test_transaction_multiple_sc_results() {
@@ -285,5 +286,5 @@ fn test_transaction_multiple_sc_results() {
     assert!(is_out_scr(
         &tx_on_network.smart_contract_results.get(2).unwrap()
     ));
-    let _ = network_response::parse_tx_response(tx_on_network);
+    let _ = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 }
diff --git a/framework/snippets/tests/test_tx_sc_result.rs b/framework/snippets/tests/test_tx_sc_result.rs
index b3809eb2f8..7eeea673b5 100644
--- a/framework/snippets/tests/test_tx_sc_result.rs
+++ b/framework/snippets/tests/test_tx_sc_result.rs
@@ -1,5 +1,6 @@
+use multiversx_sc_scenario::imports::ReturnCode;
 use multiversx_sc_snippets::network_response;
-use multiversx_sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use multiversx_sc_snippets::sdk::data::transaction::{TransactionInfo, TransactionOnNetwork};
 
 #[test]
 fn test_with_tx_that_has_sc_result() {
@@ -251,7 +252,7 @@ fn test_with_tx_that_has_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0000000c5745474c442d64376336626200000000000000000000000803856446ff9a304b")
@@ -339,7 +340,7 @@ fn test_with_tx_that_has_no_sc_result() {
         .data
         .unwrap()
         .transaction;
-    let tx_response = network_response::parse_tx_response(tx_on_network);
+    let tx_response = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
 
     let expected: Vec<Vec<u8>> = vec![
         hex::decode("0a").unwrap(),
@@ -348,3 +349,116 @@ fn test_with_tx_that_has_no_sc_result() {
 
     assert_eq!(tx_response.out, expected)
 }
+
+#[test]
+fn test_tx_sc_results_with_no_data() {
+    let data = r#"
+    {
+  "data": {
+    "transaction": {
+      "type": "normal",
+      "processingTypeOnSource": "SCInvoking",
+      "processingTypeOnDestination": "SCInvoking",
+      "hash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+      "nonce": 6768,
+      "round": 5269269,
+      "epoch": 2169,
+      "value": "0",
+      "receiver": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+      "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+      "gasPrice": 1000000000,
+      "gasLimit": 30000000,
+      "gasUsed": 30000000,
+      "data": "cG9uZw==",
+      "signature": "dccb8bf68defef89e938e768fea872d34d6a1ba716813fe78c583233e418b6c800973bb353c61c1babf816bae2200c2ff24197e7c7748c007d72560e2ce16108",
+      "sourceShard": 1,
+      "destinationShard": 1,
+      "blockNonce": 5200682,
+      "blockHash": "b70f33fd98a8cd465cf1a679977d4c0c27f38db6a7634cab57d82e3fd8bd4841",
+      "notarizedAtSourceInMetaNonce": 5204138,
+      "NotarizedAtSourceInMetaHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "notarizedAtDestinationInMetaNonce": 5204138,
+      "notarizedAtDestinationInMetaHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "miniblockType": "TxBlock",
+      "miniblockHash": "3217265a72ce8cf40b900a8467b797610fb80eb92158143aac6e9f85e8177945",
+      "hyperblockNonce": 5204138,
+      "hyperblockHash": "1b908cfc413beb0e4d89812e2d4430d7cfbf67f7c65098aa476a2cdf2a892ac8",
+      "timestamp": 1725615614,
+      "smartContractResults": [
+        {
+          "hash": "66debb4f02a735f00bd7da565069f7d26412341d6fae56bbab9b98696c8701e9",
+          "nonce": 0,
+          "value": 1000000000000000,
+          "receiver": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+          "sender": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+          "prevTxHash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+          "originalTxHash": "4c554d060e1b489d403759e445c4a4d80b0daa5a8eceafc7b9093eb8a7dd4b7a",
+          "gasLimit": 0,
+          "gasPrice": 1000000000,
+          "callType": 0,
+          "originalSender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+          "operation": "transfer"
+        }
+      ],
+      "logs": {
+        "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+        "events": [
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "transferValueOnly",
+            "topics": [
+              "A41+pMaAAA==",
+              "ATlHLv9ohncamC8wg9pdQh8kwpGB5jiIIo3IHKYNaeE="
+            ],
+            "data": "RGlyZWN0Q2FsbA==",
+            "additionalData": [
+              "RGlyZWN0Q2FsbA==",
+              ""
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "writeLog",
+            "topics": [
+              "ATlHLv9ohncamC8wg9pdQh8kwpGB5jiIIo3IHKYNaeE=",
+              "QHRvbyBtdWNoIGdhcyBwcm92aWRlZCBmb3IgcHJvY2Vzc2luZzogZ2FzIHByb3ZpZGVkID0gMjk5NDQwMDAsIGdhcyB1c2VkID0gMjE3MTk0OA=="
+            ],
+            "data": "QDZmNmI=",
+            "additionalData": [
+              "QDZmNmI="
+            ]
+          },
+          {
+            "address": "erd1qqqqqqqqqqqqqpgqqnw862rla67qnm7qwcxnkaw42kpg2t7ld8sssw0vgu",
+            "identifier": "completedTxEvent",
+            "topics": [
+              "TFVNBg4bSJ1AN1nkRcSk2AsNqlqOzq/HuQk+uKfdS3o="
+            ],
+            "data": null,
+            "additionalData": null
+          }
+        ]
+      },
+      "status": "success",
+      "operation": "transfer",
+      "function": "pong",
+      "initiallyPaidFee": "355440000000000",
+      "fee": "355440000000000",
+      "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 = network_response::parse_tx_response(tx_on_network, ReturnCode::Success);
+
+    assert!(tx_response.out.is_empty());
+}
diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml
index 818e195f8c..e7188cfd39 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.54.1"
 edition = "2021"
 
 authors = [
@@ -22,5 +22,5 @@ categories = [
 ]
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../base"
diff --git a/framework/wasm-adapter/src/api/crypto_api_node.rs b/framework/wasm-adapter/src/api/crypto_api_node.rs
index eb16e25e6a..df62b30df9 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 {
@@ -74,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]
@@ -123,4 +135,37 @@ 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,
+    ) {
+        unsafe {
+            let _ = managedVerifySecp256r1(key, message, signature);
+        }
+    }
+
+    fn verify_bls_signature_share_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) {
+        unsafe {
+            let _ = managedVerifyBLSSignatureShare(key, message, signature);
+        }
+    }
+
+    fn verify_bls_aggregated_signature_managed(
+        &self,
+        key: Self::ManagedBufferHandle,
+        message: Self::ManagedBufferHandle,
+        signature: Self::ManagedBufferHandle,
+    ) {
+        unsafe {
+            let _ = managedVerifyBLSAggregatedSignature(key, message, signature);
+        }
+    }
 }
diff --git a/publish.sh b/publish.sh
index ddda3e9762..4810796ce3 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`.
 #
@@ -59,23 +60,35 @@
 # 15. Write a release announcement in Confluence.
 #
 
-cd vm
+cd data/codec-derive
+cargo publish || return 1
+cd ../..
+
+cd data/codec
+cargo publish || return 1
+cd ../..
+
+cd chain/core
 cargo publish || return 1
-cd ..
+cd ../..
+
+cd chain/vm
+cargo publish || return 1
+cd ../..
 
 cd sdk/core
 cargo publish || return 1
 cd ../..
 
-cd sdk/scenario-format/
+cd sdk/http
 cargo publish || return 1
 cd ../..
 
-cd data/codec-derive
+cd sdk/dapp
 cargo publish || return 1
 cd ../..
 
-cd data/codec
+cd sdk/scenario-format/
 cargo publish || return 1
 cd ../..
 
diff --git a/sdk/core/Cargo.toml b/sdk/core/Cargo.toml
index 463b4ce130..81d1559c10 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.7.0"
 edition = "2021"
 
 authors = [
@@ -16,8 +16,6 @@ categories = ["cryptography::cryptocurrencies", "api-bindings"]
 keywords = ["multiversx", "blockchain", "sdk", "api"]
 
 [dependencies]
-tokio = { version = "1.24", features = ["full"] }
-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"
@@ -31,7 +29,15 @@ 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"
+scrypt = "0.11"
+aes = "0.8"
+ctr = "0.9.2"
+uuid = {version = "1.10.0", features = ["v4"]}
+
+[dependencies.multiversx-chain-core]
+version = "=0.11.0"
+path = "../../chain/core"
diff --git a/sdk/core/README.md b/sdk/core/README.md
index 64ab1a19ac..202718e82c 100644
--- a/sdk/core/README.md
+++ b/sdk/core/README.md
@@ -4,21 +4,8 @@
 
 General purpose collection of tools & SDKs to interact with the MultiversX blockchain from Rust projects.
 
-## Example
+It provides communication via the MultiversX gateway API.
 
-```rust
-use multiversx_sdk::blockchain::rpc::{CommunicationProxy, DEVNET_GATEWAY};
-
-#[tokio::test]
-async fn get_network_config() {
-    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
-    let network_config = blockchain.get_network_config().await.unwrap();
-
-    println!("network_config: {:?}", network_config)
-}
-```
-
-More examples in `./examples`.
 
 ## Acknowledgements
 
diff --git a/sdk/core/examples/account.rs b/sdk/core/examples/account.rs
deleted file mode 100644
index 5e9456f4b0..0000000000
--- a/sdk/core/examples/account.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use multiversx_sdk::{
-    data::address::Address,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
-};
-
-#[tokio::main]
-async fn main() {
-    let addr = Address::from_bech32_string(
-        "erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts",
-    )
-    .unwrap();
-
-    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
deleted file mode 100644
index 7693c26e08..0000000000
--- a/sdk/core/examples/account_storage.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use multiversx_sdk::{
-    data::address::Address,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
-};
-
-#[tokio::main]
-async fn main() {
-    let addr = Address::from_bech32_string(
-        "erd1932eft30w753xyvme8d49qejgkjc09n5e49w4mwdjtm0neld797su0dlxp",
-    )
-    .unwrap();
-
-    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
deleted file mode 100644
index fac424da27..0000000000
--- a/sdk/core/examples/get_esdt_tokens.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use multiversx_sdk::{
-    data::address::Address,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
-};
-
-#[tokio::main]
-async fn main() {
-    let addr = Address::from_bech32_string(
-        "erd1pdv0h3ddqyzlraek02y5rhmjnwwapjyhqm983kfcdfzmr6axqhdsfg4akx",
-    )
-    .unwrap();
-
-    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
deleted file mode 100644
index 1d7f969ce1..0000000000
--- a/sdk/core/examples/get_hyper_block_by_hash.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
-
-#[tokio::main]
-async fn main() {
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
-    let result = blockchain
-        .get_hyper_block_by_hash("20b14ba0e68c465810c5ded091f220e51dad41629d7ccd87dab572206185e419")
-        .await;
-
-    println!("block by hash result: {result:?}");
-}
diff --git a/sdk/core/examples/get_hyper_block_by_nonce.rs b/sdk/core/examples/get_hyper_block_by_nonce.rs
deleted file mode 100644
index 575255d6c9..0000000000
--- a/sdk/core/examples/get_hyper_block_by_nonce.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
-
-#[tokio::main]
-async fn main() {
-    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
deleted file mode 100644
index 934358fdbf..0000000000
--- a/sdk/core/examples/get_hyper_block_latest.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
-
-#[tokio::main]
-async fn main() {
-    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/vm_query.rs b/sdk/core/examples/vm_query.rs
deleted file mode 100644
index d07f49b856..0000000000
--- a/sdk/core/examples/vm_query.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use multiversx_sdk::{
-    data::{address::Address, vm::VmValueRequest},
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
-    wallet::Wallet,
-};
-
-#[tokio::main]
-async fn main() {
-    let wl = Wallet::from_private_key(
-        "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0",
-    )
-    .unwrap();
-    let addr = wl.address();
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
-    let req = VmValueRequest {
-        sc_address: Address::from_bech32_string(
-            "erd1qqqqqqqqqqqqqpgqhn3ae8dpc957t7jadn7kywtg503dy7pnj9ts3umqxx",
-        )
-        .unwrap(),
-        func_name: "get".to_string(),
-        args: vec![],
-        caller: addr.clone(),
-        value: "0".to_string(),
-    };
-    let result = blockchain.execute_vmquery(&req).await;
-    println!("{result:#?}");
-}
diff --git a/sdk/core/src/bech32.rs b/sdk/core/src/bech32.rs
new file mode 100644
index 0000000000..69835bacaf
--- /dev/null
+++ b/sdk/core/src/bech32.rs
@@ -0,0 +1,21 @@
+//! Duplicated between sdk and scnearios.
+//!
+//! TODO: de-duplicate, place in chain core crate, if possible.
+
+use bech32::{Bech32, Hrp};
+use multiversx_chain_core::types::Address;
+
+pub fn decode(bech32_address: &str) -> Address {
+    let (_hrp, dest_address_bytes) = bech32::decode(bech32_address)
+        .unwrap_or_else(|err| panic!("bech32 decode error for {bech32_address}: {err}"));
+    if dest_address_bytes.len() != 32 {
+        panic!("Invalid address length after decoding")
+    }
+
+    Address::from_slice(&dest_address_bytes)
+}
+
+pub fn encode(address: &Address) -> String {
+    let hrp = Hrp::parse("erd").expect("invalid hrp");
+    bech32::encode::<Bech32>(hrp, address.as_bytes()).expect("bech32 encode error")
+}
diff --git a/sdk/core/src/crypto/public_key.rs b/sdk/core/src/crypto/public_key.rs
index 89b5211262..448bf57e9d 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 multiversx_chain_core::types::Address;
 use serde::{
     de::{Deserialize, Deserializer},
     ser::{Serialize, Serializer},
@@ -22,9 +22,8 @@ impl PublicKey {
         &self.0
     }
 
-    pub fn to_address(&self) -> Result<String> {
-        let address = bech32::encode("erd", self.0.to_base32(), Variant::Bech32)?;
-        Ok(address)
+    pub fn to_address(&self) -> Address {
+        self.0.into()
     }
 
     pub fn from_hex_str(pk: &str) -> Result<Self> {
diff --git a/sdk/core/src/data/mod.rs b/sdk/core/src/data.rs
similarity index 82%
rename from sdk/core/src/data/mod.rs
rename to sdk/core/src/data.rs
index 797ec6e1ce..ce4af36eca 100644
--- a/sdk/core/src/data/mod.rs
+++ b/sdk/core/src/data.rs
@@ -1,10 +1,11 @@
 pub mod account;
 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;
+pub mod sdk_address;
 pub mod transaction;
 pub mod vm;
diff --git a/sdk/core/src/data/account.rs b/sdk/core/src/data/account.rs
index cf3f4caa8c..dae88a83c7 100644
--- a/sdk/core/src/data/account.rs
+++ b/sdk/core/src/data/account.rs
@@ -1,11 +1,11 @@
-use super::address::Address;
+use super::sdk_address::SdkAddress;
 use serde::{Deserialize, Serialize};
 
 // Account holds an Account's information
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Account {
-    pub address: Address,
+    pub address: SdkAddress,
     pub nonce: u64,
     pub balance: String,
     pub username: String,
diff --git a/sdk/core/src/data/keystore.rs b/sdk/core/src/data/keystore.rs
new file mode 100644
index 0000000000..31e6b6538a
--- /dev/null
+++ b/sdk/core/src/data/keystore.rs
@@ -0,0 +1,61 @@
+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,
+    InvalidKdf,
+    InvalidCipher,
+}
+
+#[derive(Debug)]
+pub enum InsertPassword {
+    Plaintext(String),
+    StandardInput,
+}
+
+#[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,
+}
+
+#[derive(Clone, Debug)]
+pub struct DecryptionParams {
+    pub derived_key_first_half: Vec<u8>,
+    pub iv: Vec<u8>,
+    pub data: Vec<u8>,
+}
diff --git a/sdk/core/src/data/network_status.rs b/sdk/core/src/data/network_status.rs
index 3f19b29a00..954fc02db0 100644
--- a/sdk/core/src/data/network_status.rs
+++ b/sdk/core/src/data/network_status.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 // NetworkStatus holds the network status details of a specified shard
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct NetworkStatus {
     #[serde(rename = "erd_current_round")]
     pub current_round: u64,
diff --git a/sdk/core/src/data/address.rs b/sdk/core/src/data/sdk_address.rs
similarity index 55%
rename from sdk/core/src/data/address.rs
rename to sdk/core/src/data/sdk_address.rs
index f8ac4212c3..0f995faab2 100644
--- a/sdk/core/src/data/address.rs
+++ b/sdk/core/src/data/sdk_address.rs
@@ -1,75 +1,74 @@
 use std::fmt::{Debug, Display};
 
-use crate::crypto::public_key::PublicKey;
 use anyhow::Result;
-use bech32::{FromBase32, ToBase32, Variant};
+use multiversx_chain_core::types::Address;
 use serde::{
     de::{Deserialize, Deserializer},
     ser::{Serialize, Serializer},
 };
 
+/// Wrapper around a regular Address.
+///
+/// Provides:
+/// - serde serialization/deserialization as bech32
+/// - conversions to/from bech32
+///
+/// It should only be used in the sdk, to serialize/deserialize to JSON as bech32.
+///
+/// It exists primarily because it is currently inconvenient to provide
+/// bech32 and serde functionality to the base Address directly.
 #[derive(Clone)]
-pub struct Address([u8; 32]);
+pub struct SdkAddress(pub Address);
 
-impl Address {
+impl SdkAddress {
     pub fn from_bytes(bytes: [u8; 32]) -> Self {
-        Self(bytes)
+        Self(Address::from(bytes))
     }
 
     pub fn to_bytes(&self) -> [u8; 32] {
-        self.0
+        *self.0.as_array()
     }
 
     pub fn from_bech32_string(bech32: &str) -> Result<Self> {
-        let (_, data, _) = bech32::decode(bech32)?;
-        let data = Vec::<u8>::from_base32(&data)?;
-
-        let mut bits: [u8; 32] = [0u8; 32];
-        bits.copy_from_slice(&data);
-
-        Ok(Self(bits))
+        Ok(SdkAddress(crate::bech32::decode(bech32)))
     }
 
     pub fn to_bech32_string(&self) -> Result<String> {
-        let address = bech32::encode("erd", self.0.to_base32(), Variant::Bech32)?;
-        Ok(address)
+        Ok(crate::bech32::encode(&self.0))
     }
+}
 
-    pub fn is_valid(&self) -> bool {
-        self.0.len() == 32
+impl From<multiversx_chain_core::types::Address> for SdkAddress {
+    fn from(value: multiversx_chain_core::types::Address) -> Self {
+        SdkAddress(value)
     }
 }
 
-impl<'a> From<&'a PublicKey> for Address {
-    fn from(public_key: &PublicKey) -> Address {
-        let bytes = public_key.to_bytes();
-
-        let mut bits: [u8; 32] = [0u8; 32];
-        bits.copy_from_slice(&bytes);
-
-        Address(bits)
+impl From<SdkAddress> for multiversx_chain_core::types::Address {
+    fn from(value: SdkAddress) -> Self {
+        value.0
     }
 }
 
-impl Display for Address {
+impl Display for SdkAddress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.to_bech32_string().unwrap().as_str())
     }
 }
 
-impl Debug for Address {
+impl Debug for SdkAddress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.to_bech32_string().unwrap().as_str())
     }
 }
 
-impl Default for Address {
+impl Default for SdkAddress {
     fn default() -> Self {
-        Address::from_bytes([0u8; 32])
+        SdkAddress(Address::zero())
     }
 }
 
-impl Serialize for Address {
+impl Serialize for SdkAddress {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
@@ -78,7 +77,7 @@ impl Serialize for Address {
     }
 }
 
-impl<'de> Deserialize<'de> for Address {
+impl<'de> Deserialize<'de> for SdkAddress {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
@@ -94,11 +93,11 @@ pub mod tests {
 
     #[test]
     fn test_decode_address() {
-        let addr = Address::from_bech32_string(
+        let addr = SdkAddress::from_bech32_string(
             "erd1qqqqqqqqqqqqqpgqyfjjn43spw7teklwtpz4x5waygq2mluyj9ts0mdwn6",
         )
         .unwrap();
-        let encode = hex::encode(addr.to_bytes());
+        let encode = hex::encode(addr.0.as_bytes());
         assert_eq!(
             encode,
             "00000000000000000500226529d6300bbcbcdbee58455351dd2200adff849157"
diff --git a/sdk/core/src/data/transaction.rs b/sdk/core/src/data/transaction.rs
index 3ee2f25684..450057a7b7 100644
--- a/sdk/core/src/data/transaction.rs
+++ b/sdk/core/src/data/transaction.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use super::{address::Address, vm::CallType};
+use super::{sdk_address::SdkAddress, vm::CallType};
 use serde::{Deserialize, Serialize};
 
 // Transaction holds the fields of a transaction to be broadcasted to the network
@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};
 pub struct Transaction {
     pub nonce: u64,
     pub value: String,
-    pub receiver: Address,
-    pub sender: Address,
+    pub receiver: SdkAddress,
+    pub sender: SdkAddress,
     pub gas_price: u64,
     pub gas_limit: u64,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -58,10 +58,13 @@ pub struct TransactionOnNetwork {
     pub round: u64,
     pub epoch: u64,
     pub value: String,
-    pub receiver: Address,
-    pub sender: Address,
+    pub receiver: SdkAddress,
+    pub sender: SdkAddress,
     pub gas_price: u64,
     pub gas_limit: u64,
+    #[serde(default)]
+    pub gas_used: u64,
+    #[serde(default)]
     pub signature: String,
     pub source_shard: u32,
     pub destination_shard: u32,
@@ -89,17 +92,37 @@ pub struct TransactionOnNetwork {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Events {
-    pub address: Address,
+    pub address: SdkAddress,
     pub identifier: String,
     pub topics: Option<Vec<String>>,
-    pub data: Option<String>,
+    #[serde(default)]
+    pub data: LogData,
+}
+
+#[derive(Default, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[serde(untagged)]
+pub enum LogData {
+    #[default]
+    Empty,
+    String(String),
+    Vec(Vec<String>),
+}
+
+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),
+        }
+    }
 }
 
 // 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")]
 pub struct ApiLogs {
-    pub address: Address,
+    pub address: SdkAddress,
     pub events: Vec<Events>,
 }
 
@@ -109,8 +132,9 @@ pub struct ApiSmartContractResult {
     pub hash: String,
     pub nonce: u64,
     pub value: u64,
-    pub receiver: Address,
-    pub sender: Address,
+    pub receiver: SdkAddress,
+    pub sender: SdkAddress,
+    #[serde(default)]
     pub data: String,
     pub prev_tx_hash: String,
     pub original_tx_hash: String,
@@ -152,13 +176,27 @@ 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 {
     pub nonce: u64,
     pub value: String,
-    pub rcv_addr: Address,
-    pub snd_addr: Address,
+    pub rcv_addr: SdkAddress,
+    pub snd_addr: SdkAddress,
     pub gas_price: u64,
     pub gas_limit: u64,
     pub data: Option<String>,
@@ -197,3 +235,141 @@ 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()])
+        );
+    }
+
+    #[test]
+    fn parse_transaction_info_no_signature() {
+        let data = r#"
+{
+    "data": {
+        "transaction": {
+            "type": "unsigned",
+            "processingTypeOnSource": "SCInvoking",
+            "processingTypeOnDestination": "SCInvoking",
+            "hash": "34cd9c6d0f68c0975971352ed4dcaacc1acd9a2dbd8f5840a2866d09b1d72298",
+            "nonce": 0,
+            "round": 5616535,
+            "epoch": 2314,
+            "value": "0",
+            "receiver": "erd1qqqqqqqqqqqqqpgq0mhy244pyr9pzdhahvvyze4rw3xl29q4kklszyzq72",
+            "sender": "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u",
+            "gasPrice": 1000000000,
+            "gasLimit": 25411165,
+            "gasUsed": 1197500,
+            "data": "",
+            "previousTransactionHash": "6c105dc2bb6ca8b89cfcac910a46310812b51312a281837096fc94dd771bb652",
+            "originalTransactionHash": "100d1edd0434938ec39e6cb5059601b4618a1ca25b91c38e5be9e75444b3c4f5",
+            "originalSender": "erd1wavgcxq9tfyrw49k3s3h34085mayu82wqvpd4h6akyh8559pkklsknwhwh",
+            "sourceShard": 4294967295,
+            "destinationShard": 1,
+            "blockNonce": 5547876,
+            "blockHash": "0d7caaf8f2bf46e913f91867527d44cd1c77453c9aee50d91a10739bd272d00c",
+            "notarizedAtSourceInMetaNonce": 5551265,
+            "NotarizedAtSourceInMetaHash": "4c87bc5161925a3902e43a7f9f186e63f21f827ef1129ad0e609a0d45dca016a",
+            "notarizedAtDestinationInMetaNonce": 5551269,
+            "notarizedAtDestinationInMetaHash": "83bfa8463558ee6d2c90b34ee03782619b699fea667acfb98924227bacbba93d",
+            "miniblockType": "SmartContractResultBlock",
+            "miniblockHash": "c12693db88e3b69b68d5279fd8939ec75b7f0d8e529e7fd950c83b5716a436bd",
+            "hyperblockNonce": 5551269,
+            "hyperblockHash": "83bfa8463558ee6d2c90b34ee03782619b699fea667acfb98924227bacbba93d",
+            "timestamp": 1727699210,
+            "logs": {
+                "address": "erd1qqqqqqqqqqqqqpgq0mhy244pyr9pzdhahvvyze4rw3xl29q4kklszyzq72",
+                "events": [
+                    {
+                        "address": "erd1qqqqqqqqqqqqqpgq0mhy244pyr9pzdhahvvyze4rw3xl29q4kklszyzq72",
+                        "identifier": "transferValueOnly",
+                        "topics": [
+                            "I4byb8EAAA==",
+                            "AAAAAAAAAAAFAMMiO8pDAH5z5hUCqfc+N03C7UI6tb8="
+                        ],
+                        "data": "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                        "additionalData": [
+                            "RXhlY3V0ZU9uRGVzdENvbnRleHQ=",
+                            "ZGVwbG95SW50ZXJjaGFpblRva2Vu",
+                            "GeLN3wLxaJKDPbaxdmqkIh0pFNi1l8WJeqy9TofeG40=",
+                            "YXZhbGFuY2hlLWZ1amk=",
+                            "SVRTVGVzdFRva2Vu",
+                            "SVRTVFQ=",
+                            "Bg==",
+                            "d1iMGAVaSDdUtowjeNXnpvpOHU4DAtrfXbEuelChtb8="
+                        ]
+                    }
+                ]
+            },
+            "status": "success",
+            "operation": "transfer",
+            "fee": "0",
+            "callType": "asynchronousCallBack",
+            "options": 0
+        }
+    },
+    "error": "",
+    "code": "successful"
+}
+        "#;
+
+        let transaction = serde_json::from_str::<TransactionInfo>(data).unwrap();
+        assert_eq!(
+            transaction.data.unwrap().transaction.hash.unwrap(),
+            "34cd9c6d0f68c0975971352ed4dcaacc1acd9a2dbd8f5840a2866d09b1d72298"
+        );
+    }
+}
diff --git a/sdk/core/src/data/vm.rs b/sdk/core/src/data/vm.rs
index 4b6e15539d..4b63afed68 100644
--- a/sdk/core/src/data/vm.rs
+++ b/sdk/core/src/data/vm.rs
@@ -1,4 +1,4 @@
-use super::address::Address;
+use super::sdk_address::SdkAddress;
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 use std::collections::HashMap;
@@ -25,11 +25,9 @@ pub enum CallType {
 // VmValueRequest defines the request struct for values available in a VM
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct VmValueRequest {
-    pub sc_address: Address,
+pub struct VMQueryInput {
+    pub sc_address: SdkAddress,
     pub func_name: String,
-    pub caller: Address,
-    pub value: String,
     pub args: Vec<String>,
 }
 
@@ -38,7 +36,7 @@ pub struct VmValueRequest {
 #[serde(rename_all = "camelCase")]
 pub struct LogEntryApi {
     pub identifier: String,
-    pub address: Address,
+    pub address: SdkAddress,
     pub topics: Vec<String>,
     pub data: String,
 }
@@ -51,14 +49,14 @@ pub struct OutputTransferApi {
     pub gas_limit: u64,
     pub data: String,
     pub call_type: CallType,
-    pub sender_address: Address,
+    pub sender_address: SdkAddress,
 }
 
 // OutputAccountApi is a wrapper over vmcommon's OutputAccount
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct OutputAccountApi {
-    address: Address,
+    address: SdkAddress,
     nonce: u64,
 
     // TODO: unknow type of data
@@ -85,6 +83,7 @@ pub struct StorageUpdateApi {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct VMOutputApi {
+    #[serde(default)]
     pub return_data: Vec<String>,
     pub return_code: String,
     pub return_message: String,
diff --git a/sdk/core/src/gateway.rs b/sdk/core/src/gateway.rs
index 35e2668b50..1512717a85 100644
--- a/sdk/core/src/gateway.rs
+++ b/sdk/core/src/gateway.rs
@@ -1,11 +1,38 @@
 mod gateway_account;
+mod gateway_account_esdt_roles;
+mod gateway_account_esdt_tokens;
+mod gateway_account_storage;
 mod gateway_block;
-mod gateway_network;
-mod gateway_proxy;
-mod gateway_tx;
-mod gateway_tx_retrieve;
+mod gateway_chain_simulator_blocks;
+mod gateway_chain_simulator_send_funds;
+mod gateway_network_config;
+mod gateway_network_economics;
+mod gateway_network_status;
+mod gateway_tx_cost;
+mod gateway_tx_info;
+mod gateway_tx_process_status;
+mod gateway_tx_send;
+mod gateway_tx_send_multi;
+mod gateway_tx_status;
+mod gateway_tx_vmquery;
 
-pub use gateway_proxy::GatewayProxy;
+pub use gateway_account::GetAccountRequest;
+pub use gateway_account_esdt_roles::GetAccountEsdtRolesRequest;
+pub use gateway_account_esdt_tokens::GetAccountEsdtTokensRequest;
+pub use gateway_account_storage::GetAccountStorageRequest;
+pub use gateway_block::GetHyperBlockRequest;
+pub use gateway_chain_simulator_blocks::ChainSimulatorGenerateBlocksRequest;
+pub use gateway_chain_simulator_send_funds::ChainSimulatorSendFundsRequest;
+pub use gateway_network_config::NetworkConfigRequest;
+pub use gateway_network_economics::NetworkEconimicsRequest;
+pub use gateway_network_status::NetworkStatusRequest;
+pub use gateway_tx_cost::GetTxCost;
+pub use gateway_tx_info::GetTxInfo;
+pub use gateway_tx_process_status::GetTxProcessStatus;
+pub use gateway_tx_send::SendTxRequest;
+pub use gateway_tx_send_multi::SendMultiTxRequest;
+pub use gateway_tx_status::GetTxStatus;
+pub use gateway_tx_vmquery::VMQueryRequest;
 
 pub const MAINNET_GATEWAY: &str = "https://gateway.multiversx.com";
 pub const TESTNET_GATEWAY: &str = "https://testnet-gateway.multiversx.com";
@@ -13,3 +40,68 @@ 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 ACCOUNT_ENDPOINT: &str = "address";
+const KEYS_ENDPOINT: &str = "keys";
+const NETWORK_CONFIG_ENDPOINT: &str = "network/config";
+const NETWORK_ECONOMICS_ENDPOINT: &str = "network/economics";
+const GET_NETWORK_STATUS_ENDPOINT: &str = "network/status";
+const GET_HYPER_BLOCK_BY_NONCE_ENDPOINT: &str = "hyperblock/by-nonce";
+const GET_HYPER_BLOCK_BY_HASH_ENDPOINT: &str = "hyperblock/by-hash";
+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";
+
+const SEND_USER_FUNDS_ENDPOINT: &str = "transaction/send-user-funds";
+const GENERATE_BLOCKS_ENDPOINT: &str = "simulator/generate-blocks";
+const GENERATE_BLOCKS_UNTIL_TX_PROCESSED_ENDPOINT: &str =
+    "simulator/generate-blocks-until-transaction-processed";
+const GENERATE_BLOCKS_UNTIL_EPOCH_REACHED_ENDPOINT: &str =
+    "simulator/generate-blocks-until-epoch-reached";
+
+pub enum GatewayRequestType {
+    Get,
+    Post,
+}
+
+/// Models requests to the gateway.
+pub trait GatewayRequest {
+    type Payload: serde::ser::Serialize + ?Sized;
+
+    type DecodedJson: serde::de::DeserializeOwned;
+
+    type Result;
+
+    fn request_type(&self) -> GatewayRequestType;
+
+    fn get_endpoint(&self) -> String;
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        None
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result>;
+}
+
+pub trait GatewayAsyncService {
+    /// Keeps track of elapsed time.
+    type Instant;
+
+    fn from_uri(uri: &str) -> Self;
+
+    fn request<G>(
+        &self,
+        request: G,
+    ) -> impl std::future::Future<Output = anyhow::Result<G::Result>>
+    where
+        G: GatewayRequest;
+
+    fn sleep(&self, millis: u64) -> impl std::future::Future<Output = ()>;
+
+    fn now(&self) -> Self::Instant;
+
+    fn elapsed_seconds(&self, instant: &Self::Instant) -> f32;
+}
diff --git a/sdk/core/src/gateway/gateway_account.rs b/sdk/core/src/gateway/gateway_account.rs
index 7d72258544..76eee4c736 100644
--- a/sdk/core/src/gateway/gateway_account.rs
+++ b/sdk/core/src/gateway/gateway_account.rs
@@ -1,112 +1,38 @@
-use crate::data::{
-    account::{Account, AccountResponse},
-    account_storage::AccountStorageResponse,
-    address::Address,
-    esdt::{EsdtBalance, EsdtBalanceResponse, EsdtRolesResponse},
-};
-use anyhow::{anyhow, Result};
-use std::collections::HashMap;
+use crate::data::account::{Account, AccountResponse};
+use anyhow::anyhow;
+use multiversx_chain_core::types::Address;
 
-use super::GatewayProxy;
+use super::ACCOUNT_ENDPOINT;
+use super::{GatewayRequest, GatewayRequestType};
 
-const ACCOUNT_ENDPOINT: &str = "address/";
-const KEYS_ENDPOINT: &str = "/keys/";
-
-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() {
-            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?;
+/// Retrieves an account info from the network (nonce, balance).
+pub struct GetAccountRequest<'a> {
+    pub address: &'a Address,
+}
 
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.account),
-        }
+impl<'a> GetAccountRequest<'a> {
+    pub fn new(address: &'a Address) -> Self {
+        Self { address }
     }
+}
 
-    // 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?;
+impl<'a> GatewayRequest for GetAccountRequest<'a> {
+    type Payload = ();
+    type DecodedJson = AccountResponse;
+    type Result = Account;
 
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.roles),
-        }
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
     }
 
-    // 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),
-        }
+    fn get_endpoint(&self) -> String {
+        format!("{ACCOUNT_ENDPOINT}/{}", crate::bech32::encode(self.address))
     }
 
-    // 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),
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.account),
         }
     }
 }
diff --git a/sdk/core/src/gateway/gateway_account_esdt_roles.rs b/sdk/core/src/gateway/gateway_account_esdt_roles.rs
new file mode 100644
index 0000000000..421edd81b2
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_account_esdt_roles.rs
@@ -0,0 +1,41 @@
+use crate::data::esdt::EsdtRolesResponse;
+use anyhow::anyhow;
+use multiversx_chain_core::types::Address;
+use std::collections::HashMap;
+
+use super::{GatewayRequest, GatewayRequestType, ACCOUNT_ENDPOINT};
+
+/// Retrieves an all esdt roles of an account from the network.
+pub struct GetAccountEsdtRolesRequest<'a> {
+    pub address: &'a Address,
+}
+
+impl<'a> GetAccountEsdtRolesRequest<'a> {
+    pub fn new(address: &'a Address) -> Self {
+        Self { address }
+    }
+}
+
+impl<'a> GatewayRequest for GetAccountEsdtRolesRequest<'a> {
+    type Payload = ();
+    type DecodedJson = EsdtRolesResponse;
+    type Result = HashMap<String, Vec<String>>;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!(
+            "{ACCOUNT_ENDPOINT}/{}/esdts/roles",
+            crate::bech32::encode(self.address)
+        )
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.roles),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_account_esdt_tokens.rs b/sdk/core/src/gateway/gateway_account_esdt_tokens.rs
new file mode 100644
index 0000000000..72e27e54a9
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_account_esdt_tokens.rs
@@ -0,0 +1,41 @@
+use crate::data::esdt::{EsdtBalance, EsdtBalanceResponse};
+use anyhow::anyhow;
+use multiversx_chain_core::types::Address;
+use std::collections::HashMap;
+
+use super::{GatewayRequest, GatewayRequestType, ACCOUNT_ENDPOINT};
+
+/// Retrieves an all esdt tokens of an account from the network.
+pub struct GetAccountEsdtTokensRequest<'a> {
+    pub address: &'a Address,
+}
+
+impl<'a> GetAccountEsdtTokensRequest<'a> {
+    pub fn new(address: &'a Address) -> Self {
+        Self { address }
+    }
+}
+
+impl<'a> GatewayRequest for GetAccountEsdtTokensRequest<'a> {
+    type Payload = ();
+    type DecodedJson = EsdtBalanceResponse;
+    type Result = HashMap<String, EsdtBalance>;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!(
+            "{ACCOUNT_ENDPOINT}/{}/esdt",
+            crate::bech32::encode(self.address)
+        )
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.esdts),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_account_storage.rs b/sdk/core/src/gateway/gateway_account_storage.rs
new file mode 100644
index 0000000000..6c1bffe55f
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_account_storage.rs
@@ -0,0 +1,41 @@
+use crate::data::account_storage::AccountStorageResponse;
+use anyhow::anyhow;
+use multiversx_chain_core::types::Address;
+use std::collections::HashMap;
+
+use super::{GatewayRequest, GatewayRequestType, ACCOUNT_ENDPOINT, KEYS_ENDPOINT};
+
+/// Retrieves an account storage from the network.
+pub struct GetAccountStorageRequest<'a> {
+    pub address: &'a Address,
+}
+
+impl<'a> GetAccountStorageRequest<'a> {
+    pub fn new(address: &'a Address) -> Self {
+        Self { address }
+    }
+}
+
+impl<'a> GatewayRequest for GetAccountStorageRequest<'a> {
+    type Payload = ();
+    type DecodedJson = AccountStorageResponse;
+    type Result = HashMap<String, String>;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!(
+            "{ACCOUNT_ENDPOINT}/{}/{KEYS_ENDPOINT}",
+            crate::bech32::encode(self.address)
+        )
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.pairs),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_block.rs b/sdk/core/src/gateway/gateway_block.rs
index b6daf57abb..7131584a20 100644
--- a/sdk/core/src/gateway/gateway_block.rs
+++ b/sdk/core/src/gateway/gateway_block.rs
@@ -1,66 +1,47 @@
-use crate::data::{
-    hyperblock::{HyperBlock, HyperBlockResponse},
-    network_status::NetworkStatusResponse,
-};
-use anyhow::{anyhow, Result};
-
-use super::GatewayProxy;
-use super::METACHAIN_SHARD_ID;
+use crate::data::hyperblock::{HyperBlock, HyperBlockResponse};
+use anyhow::anyhow;
 
-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";
+use super::{
+    GatewayRequest, GatewayRequestType, GET_HYPER_BLOCK_BY_HASH_ENDPOINT,
+    GET_HYPER_BLOCK_BY_NONCE_ENDPOINT,
+};
 
-impl GatewayProxy {
-    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?;
+/// Retrieves the data of a hyper block.
+pub struct GetHyperBlockRequest {
+    pub query: String,
+}
 
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.hyperblock),
+impl GetHyperBlockRequest {
+    pub fn by_nonce(nonce: u64) -> Self {
+        Self {
+            query: format!("{GET_HYPER_BLOCK_BY_NONCE_ENDPOINT}/{nonce}"),
         }
     }
 
-    // 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
+    pub fn by_hash(hash: &str) -> Self {
+        Self {
+            query: format!("{GET_HYPER_BLOCK_BY_HASH_ENDPOINT}/{hash}"),
+        }
     }
+}
 
-    // 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}");
-        }
+impl GatewayRequest for GetHyperBlockRequest {
+    type Payload = ();
+    type DecodedJson = HyperBlockResponse;
+    type Result = HyperBlock;
 
-        let endpoint = self.get_endpoint(endpoint.as_str());
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
 
-        let resp = self
-            .client
-            .get(endpoint)
-            .send()
-            .await?
-            .json::<NetworkStatusResponse>()
-            .await?;
+    fn get_endpoint(&self) -> String {
+        self.query.clone()
+    }
 
-        match resp.data {
-            None => Err(anyhow!("{}", resp.error)),
-            Some(b) => Ok(b.status.nonce),
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.hyperblock),
         }
     }
 }
diff --git a/sdk/core/src/gateway/gateway_chain_simulator_blocks.rs b/sdk/core/src/gateway/gateway_chain_simulator_blocks.rs
new file mode 100644
index 0000000000..9faecf0327
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_chain_simulator_blocks.rs
@@ -0,0 +1,67 @@
+use anyhow::anyhow;
+use serde::{Deserialize, Serialize};
+
+use super::{
+    GatewayRequest, GatewayRequestType, GENERATE_BLOCKS_ENDPOINT,
+    GENERATE_BLOCKS_UNTIL_EPOCH_REACHED_ENDPOINT, GENERATE_BLOCKS_UNTIL_TX_PROCESSED_ENDPOINT,
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GenerateBlocksResponse {
+    pub data: serde_json::Value,
+    pub error: String,
+    pub code: String,
+}
+
+/// Generates blocks using the chain simulator API.
+pub struct ChainSimulatorGenerateBlocksRequest {
+    pub query: String,
+}
+
+impl ChainSimulatorGenerateBlocksRequest {
+    pub fn num_blocks(num_blocks: u64) -> Self {
+        Self {
+            query: format!("{}/{}", GENERATE_BLOCKS_ENDPOINT, num_blocks),
+        }
+    }
+
+    pub fn until_epoch(epoch_number: u64) -> Self {
+        Self {
+            query: format!(
+                "{}/{}",
+                GENERATE_BLOCKS_UNTIL_EPOCH_REACHED_ENDPOINT, epoch_number
+            ),
+        }
+    }
+
+    /// TODO: convert arg to H256
+    pub fn until_tx_processed(tx_hash: &str) -> Self {
+        Self {
+            query: format!(
+                "{}/{}",
+                GENERATE_BLOCKS_UNTIL_TX_PROCESSED_ENDPOINT, tx_hash
+            ),
+        }
+    }
+}
+
+impl GatewayRequest for ChainSimulatorGenerateBlocksRequest {
+    type Payload = ();
+    type DecodedJson = GenerateBlocksResponse;
+    type Result = String;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_endpoint(&self) -> String {
+        self.query.clone()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.code.as_str() {
+            "successful" => Ok(decoded.code),
+            _ => Err(anyhow!("{}", decoded.error)),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_chain_simulator_send_funds.rs b/sdk/core/src/gateway/gateway_chain_simulator_send_funds.rs
new file mode 100644
index 0000000000..bcebd60aec
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_chain_simulator_send_funds.rs
@@ -0,0 +1,47 @@
+use std::collections::HashMap;
+
+use anyhow::anyhow;
+use multiversx_chain_core::types::Address;
+
+use super::{
+    gateway_chain_simulator_blocks::GenerateBlocksResponse, GatewayRequest, GatewayRequestType,
+    SEND_USER_FUNDS_ENDPOINT,
+};
+
+/// Generates blocks using the chain simulator API.
+pub struct ChainSimulatorSendFundsRequest {
+    payload: HashMap<&'static str, String>,
+}
+
+impl ChainSimulatorSendFundsRequest {
+    pub fn to_address(receiver: &Address) -> Self {
+        let mut payload = HashMap::new();
+        payload.insert("receiver", crate::bech32::encode(receiver));
+        Self { payload }
+    }
+}
+
+impl GatewayRequest for ChainSimulatorSendFundsRequest {
+    type Payload = HashMap<&'static str, String>;
+    type DecodedJson = GenerateBlocksResponse;
+    type Result = String;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_endpoint(&self) -> String {
+        SEND_USER_FUNDS_ENDPOINT.to_owned()
+    }
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        Some(&self.payload)
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.code.as_str() {
+            "successful" => Ok(decoded.code),
+            _ => Err(anyhow!("{}", decoded.error)),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_network.rs b/sdk/core/src/gateway/gateway_network.rs
deleted file mode 100644
index 8b02a57d0d..0000000000
--- a/sdk/core/src/gateway/gateway_network.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::data::{
-    network_config::{NetworkConfig, NetworkConfigResponse},
-    network_economics::{NetworkEconomics, NetworkEconomicsResponse},
-};
-use anyhow::{anyhow, Result};
-
-use super::GatewayProxy;
-
-const NETWORK_CONFIG_ENDPOINT: &str = "network/config";
-const NETWORK_ECONOMICS_ENDPOINT: &str = "network/economics";
-
-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);
-        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/gateway/gateway_network_config.rs b/sdk/core/src/gateway/gateway_network_config.rs
new file mode 100644
index 0000000000..342c92046b
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_network_config.rs
@@ -0,0 +1,28 @@
+use crate::data::network_config::{NetworkConfig, NetworkConfigResponse};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, NETWORK_CONFIG_ENDPOINT};
+
+/// Retrieves the network configuration from the proxy.
+pub struct NetworkConfigRequest;
+
+impl GatewayRequest for NetworkConfigRequest {
+    type Payload = ();
+    type DecodedJson = NetworkConfigResponse;
+    type Result = NetworkConfig;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        NETWORK_CONFIG_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.config),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_network_economics.rs b/sdk/core/src/gateway/gateway_network_economics.rs
new file mode 100644
index 0000000000..e8faf3946a
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_network_economics.rs
@@ -0,0 +1,28 @@
+use crate::data::network_economics::{NetworkEconomics, NetworkEconomicsResponse};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, NETWORK_ECONOMICS_ENDPOINT};
+
+/// Retrieves the network economics from the proxy.
+pub struct NetworkEconimicsRequest;
+
+impl GatewayRequest for NetworkEconimicsRequest {
+    type Payload = ();
+    type DecodedJson = NetworkEconomicsResponse;
+    type Result = NetworkEconomics;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        NETWORK_ECONOMICS_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.metrics),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_network_status.rs b/sdk/core/src/gateway/gateway_network_status.rs
new file mode 100644
index 0000000000..48484ec816
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_network_status.rs
@@ -0,0 +1,44 @@
+use crate::data::network_status::{NetworkStatus, NetworkStatusResponse};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, GET_NETWORK_STATUS_ENDPOINT, METACHAIN_SHARD_ID};
+
+/// Retrieves the network status from the proxy.
+pub struct NetworkStatusRequest {
+    shard: u32,
+}
+
+impl NetworkStatusRequest {
+    pub fn new(shard: u32) -> Self {
+        NetworkStatusRequest { shard }
+    }
+}
+
+impl Default for NetworkStatusRequest {
+    fn default() -> Self {
+        Self {
+            shard: METACHAIN_SHARD_ID,
+        }
+    }
+}
+
+impl GatewayRequest for NetworkStatusRequest {
+    type Payload = ();
+    type DecodedJson = NetworkStatusResponse;
+    type Result = NetworkStatus;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!("{GET_NETWORK_STATUS_ENDPOINT}/{}", self.shard)
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.status),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_proxy.rs b/sdk/core/src/gateway/gateway_proxy.rs
deleted file mode 100644
index 47925cd79f..0000000000
--- a/sdk/core/src/gateway/gateway_proxy.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use reqwest::Client;
-
-/// Allows communication with the MultiversX gateway API.
-#[derive(Clone, Debug)]
-pub struct GatewayProxy {
-    pub(crate) proxy_url: String,
-    pub(crate) client: Client,
-}
-
-impl GatewayProxy {
-    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/gateway/gateway_tx.rs b/sdk/core/src/gateway/gateway_tx.rs
deleted file mode 100644
index 47aa8b5a83..0000000000
--- a/sdk/core/src/gateway/gateway_tx.rs
+++ /dev/null
@@ -1,184 +0,0 @@
-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::GatewayProxy;
-
-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 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);
-        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),
-        }
-    }
-}
diff --git a/sdk/core/src/gateway/gateway_tx_cost.rs b/sdk/core/src/gateway/gateway_tx_cost.rs
new file mode 100644
index 0000000000..333b0324c5
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_cost.rs
@@ -0,0 +1,34 @@
+use crate::data::transaction::{ResponseTxCost, Transaction, TxCostResponseData};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, COST_TRANSACTION_ENDPOINT};
+
+/// Verifies the cost of a transaction.
+///
+/// Note: it is a POST request.
+pub struct GetTxCost<'a>(pub &'a Transaction);
+
+impl<'a> GatewayRequest for GetTxCost<'a> {
+    type Payload = Transaction;
+    type DecodedJson = ResponseTxCost;
+    type Result = TxCostResponseData;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        Some(self.0)
+    }
+
+    fn get_endpoint(&self) -> String {
+        COST_TRANSACTION_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_info.rs b/sdk/core/src/gateway/gateway_tx_info.rs
new file mode 100644
index 0000000000..f4d26e9d44
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_info.rs
@@ -0,0 +1,55 @@
+use crate::data::transaction::{TransactionInfo, TransactionOnNetwork};
+use anyhow::anyhow;
+
+use super::{
+    GatewayRequest, GatewayRequestType, GET_TRANSACTION_INFO_ENDPOINT, WITH_RESULTS_QUERY_PARAM,
+};
+
+/// Retrieves transaction data from the network.
+pub struct GetTxInfo<'a> {
+    pub hash: &'a str,
+    pub with_results: bool,
+}
+
+impl<'a> GetTxInfo<'a> {
+    pub fn new(hash: &'a str) -> Self {
+        Self {
+            hash,
+            with_results: true,
+        }
+    }
+
+    pub fn with_results(self) -> Self {
+        Self {
+            hash: self.hash,
+            with_results: true,
+        }
+    }
+}
+
+impl<'a> GatewayRequest for GetTxInfo<'a> {
+    type Payload = ();
+    type DecodedJson = TransactionInfo;
+    type Result = TransactionOnNetwork;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        let mut endpoint = format!("{GET_TRANSACTION_INFO_ENDPOINT}/{}", self.hash);
+
+        if self.with_results {
+            endpoint += WITH_RESULTS_QUERY_PARAM;
+        }
+
+        endpoint
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.transaction),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_process_status.rs b/sdk/core/src/gateway/gateway_tx_process_status.rs
new file mode 100644
index 0000000000..d829cb60fe
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_process_status.rs
@@ -0,0 +1,36 @@
+use crate::data::transaction::TransactionProcessStatus;
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType};
+
+/// Retrieves a transaction's status from the network using process-status API.
+pub struct GetTxProcessStatus<'a> {
+    pub hash: &'a str,
+}
+
+impl<'a> GetTxProcessStatus<'a> {
+    pub fn new(hash: &'a str) -> Self {
+        Self { hash }
+    }
+}
+
+impl<'a> GatewayRequest for GetTxProcessStatus<'a> {
+    type Payload = ();
+    type DecodedJson = TransactionProcessStatus;
+    type Result = (String, String);
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!("transaction/{}/process-status", self.hash)
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok((b.status, b.reason)),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_retrieve.rs b/sdk/core/src/gateway/gateway_tx_retrieve.rs
deleted file mode 100644
index 821713f972..0000000000
--- a/sdk/core/src/gateway/gateway_tx_retrieve.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use crate::data::transaction::TransactionOnNetwork;
-use log::info;
-use std::time::{Duration, Instant};
-
-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 GatewayProxy {
-    /// Retrieves a transaction from the network.
-    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.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
-                                .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;
-                    if retries >= MAX_RETRIES {
-                        info!("Transaction failed, max retries exceeded: {}", err);
-                        println!("Transaction failed, max retries exceeded: {}", err);
-                        break;
-                    }
-
-                    let backoff_time = backoff_delay.min(MAX_BACKOFF_DELAY);
-                    tokio::time::sleep(backoff_time).await;
-                    backoff_delay *= 2; // exponential backoff
-                },
-            }
-        }
-
-        // 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()
-    }
-}
diff --git a/sdk/core/src/gateway/gateway_tx_send.rs b/sdk/core/src/gateway/gateway_tx_send.rs
new file mode 100644
index 0000000000..a76354df8e
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_send.rs
@@ -0,0 +1,32 @@
+use crate::data::transaction::{SendTransactionResponse, Transaction};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, SEND_TRANSACTION_ENDPOINT};
+
+/// Sends a single transaction.
+pub struct SendTxRequest<'a>(pub &'a Transaction);
+
+impl<'a> GatewayRequest for SendTxRequest<'a> {
+    type Payload = Transaction;
+    type DecodedJson = SendTransactionResponse;
+    type Result = String;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        Some(self.0)
+    }
+
+    fn get_endpoint(&self) -> String {
+        SEND_TRANSACTION_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.tx_hash),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_send_multi.rs b/sdk/core/src/gateway/gateway_tx_send_multi.rs
new file mode 100644
index 0000000000..472beaf5ba
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_send_multi.rs
@@ -0,0 +1,40 @@
+use crate::data::transaction::{SendTransactionsResponse, Transaction};
+use anyhow::anyhow;
+use itertools::Itertools;
+
+use super::{GatewayRequest, GatewayRequestType, SEND_MULTIPLE_TRANSACTIONS_ENDPOINT};
+
+/// Sends multiple transactions at once.
+pub struct SendMultiTxRequest<'a>(pub &'a [Transaction]);
+
+impl<'a> GatewayRequest for SendMultiTxRequest<'a> {
+    type Payload = [Transaction];
+    type DecodedJson = SendTransactionsResponse;
+    type Result = Vec<String>;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        Some(self.0)
+    }
+
+    fn get_endpoint(&self) -> String {
+        SEND_MULTIPLE_TRANSACTIONS_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.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)
+            },
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_status.rs b/sdk/core/src/gateway/gateway_tx_status.rs
new file mode 100644
index 0000000000..ac4e37e6b4
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_status.rs
@@ -0,0 +1,36 @@
+use crate::data::transaction::TransactionStatus;
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType};
+
+/// Retrieves a transaction's status from the network.
+pub struct GetTxStatus<'a> {
+    pub hash: &'a str,
+}
+
+impl<'a> GetTxStatus<'a> {
+    pub fn new(hash: &'a str) -> Self {
+        Self { hash }
+    }
+}
+
+impl<'a> GatewayRequest for GetTxStatus<'a> {
+    type Payload = ();
+    type DecodedJson = TransactionStatus;
+    type Result = String;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Get
+    }
+
+    fn get_endpoint(&self) -> String {
+        format!("transaction/{}/status", self.hash)
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b.status),
+        }
+    }
+}
diff --git a/sdk/core/src/gateway/gateway_tx_vmquery.rs b/sdk/core/src/gateway/gateway_tx_vmquery.rs
new file mode 100644
index 0000000000..e1523571da
--- /dev/null
+++ b/sdk/core/src/gateway/gateway_tx_vmquery.rs
@@ -0,0 +1,32 @@
+use crate::data::vm::{ResponseVmValue, VMQueryInput, VmValuesResponseData};
+use anyhow::anyhow;
+
+use super::{GatewayRequest, GatewayRequestType, VM_VALUES_ENDPOINT};
+
+/// Executes a VM query.
+pub struct VMQueryRequest<'a>(pub &'a VMQueryInput);
+
+impl<'a> GatewayRequest for VMQueryRequest<'a> {
+    type Payload = VMQueryInput;
+    type DecodedJson = ResponseVmValue;
+    type Result = VmValuesResponseData;
+
+    fn request_type(&self) -> GatewayRequestType {
+        GatewayRequestType::Post
+    }
+
+    fn get_payload(&self) -> Option<&Self::Payload> {
+        Some(self.0)
+    }
+
+    fn get_endpoint(&self) -> String {
+        VM_VALUES_ENDPOINT.to_owned()
+    }
+
+    fn process_json(&self, decoded: Self::DecodedJson) -> anyhow::Result<Self::Result> {
+        match decoded.data {
+            None => Err(anyhow!("{}", decoded.error)),
+            Some(b) => Ok(b),
+        }
+    }
+}
diff --git a/sdk/core/src/lib.rs b/sdk/core/src/lib.rs
index 3a1db99fd7..6d89ecf6c3 100644
--- a/sdk/core/src/lib.rs
+++ b/sdk/core/src/lib.rs
@@ -1,5 +1,11 @@
+pub mod bech32;
 pub mod crypto;
 pub mod data;
 pub mod gateway;
+pub mod retrieve_tx_on_network;
+pub mod test_wallets;
 pub mod utils;
 pub mod wallet;
+
+pub use multiversx_chain_core as chain_core;
+pub use retrieve_tx_on_network::retrieve_tx_on_network;
diff --git a/sdk/core/src/retrieve_tx_on_network.rs b/sdk/core/src/retrieve_tx_on_network.rs
new file mode 100644
index 0000000000..3cfcf9fc77
--- /dev/null
+++ b/sdk/core/src/retrieve_tx_on_network.rs
@@ -0,0 +1,160 @@
+use crate::{
+    data::{
+        sdk_address::SdkAddress,
+        transaction::{ApiLogs, Events, LogData, TransactionOnNetwork},
+    },
+    gateway::{GetTxInfo, GetTxProcessStatus},
+};
+use log::info;
+use multiversx_chain_core::types::{Address, ReturnCode};
+
+use crate::gateway::GatewayAsyncService;
+
+const INITIAL_BACKOFF_DELAY: u64 = 1400;
+const MAX_RETRIES: usize = 8;
+const MAX_BACKOFF_DELAY: u64 = 6000;
+const LOG_IDENTIFIER_SIGNAL_ERROR: &str = "signalError";
+
+/// Retrieves a transaction from the network.
+pub async fn retrieve_tx_on_network<GatewayProxy: GatewayAsyncService>(
+    proxy: &GatewayProxy,
+    tx_hash: String,
+) -> (TransactionOnNetwork, ReturnCode) {
+    let mut retries = 0;
+    let mut backoff_delay = INITIAL_BACKOFF_DELAY;
+    let start_time = proxy.now();
+
+    loop {
+        match proxy.request(GetTxProcessStatus::new(&tx_hash)).await {
+            Ok((status, reason)) => {
+                // checks if transaction status is final
+                match status.as_str() {
+                    "success" => {
+                        // retrieve transaction info with results
+                        let transaction_info_with_results = proxy
+                            .request(GetTxInfo::new(&tx_hash).with_results())
+                            .await
+                            .unwrap();
+
+                        info!(
+                            "Transaction retrieved successfully, with status {}: {:#?}",
+                            status, transaction_info_with_results
+                        );
+                        return (transaction_info_with_results, ReturnCode::Success);
+                    },
+                    "fail" => {
+                        let (error_code, error_message) = parse_reason(&reason);
+                        let failed_transaction_info: TransactionOnNetwork =
+                            create_tx_failed(&error_message);
+
+                        info!(
+                            "Transaction failed with error code: {} and message: {error_message}",
+                            error_code.as_u64()
+                        );
+                        return (failed_transaction_info, error_code);
+                    },
+                    _ => {
+                        continue;
+                    },
+                }
+            },
+            Err(err) => {
+                retries += 1;
+                if retries >= MAX_RETRIES {
+                    info!("Transaction failed, max retries exceeded: {}", err);
+                    println!("Transaction failed, max retries exceeded: {}", err);
+                    break;
+                }
+
+                let backoff_time = backoff_delay.min(MAX_BACKOFF_DELAY);
+                proxy.sleep(backoff_time).await;
+                backoff_delay *= 2; // exponential backoff
+            },
+        }
+    }
+
+    // retries have been exhausted
+    println!(
+            "Fetching transaction failed and retries exhausted, returning default transaction. Total elapsed time: {:?}s",
+            proxy.elapsed_seconds(&start_time)
+        );
+
+    let error_message = ReturnCode::message(ReturnCode::NetworkTimeout);
+    let failed_transaction: TransactionOnNetwork = create_tx_failed(error_message);
+
+    (failed_transaction, ReturnCode::NetworkTimeout)
+}
+
+pub fn parse_reason(reason: &str) -> (ReturnCode, String) {
+    if reason.is_empty() {
+        return (ReturnCode::UserError, "invalid transaction".to_string());
+    }
+
+    let (code, mut message) = find_code_and_message(reason);
+
+    match code {
+        Some(return_code) => {
+            if message.is_empty() {
+                ReturnCode::message(return_code).clone_into(&mut message);
+            }
+
+            (return_code, message)
+        },
+        None => {
+            if message.is_empty() {
+                message = extract_message_from_string_reason(reason);
+            }
+            let return_code = ReturnCode::from_message(&message).unwrap_or(ReturnCode::UserError);
+
+            (return_code, message)
+        },
+    }
+}
+
+pub fn find_code_and_message(reason: &str) -> (Option<ReturnCode>, String) {
+    let mut error_code: Option<ReturnCode> = None;
+    let mut error_message: String = String::new();
+    let parts: Vec<&str> = reason.split('@').filter(|part| !part.is_empty()).collect();
+
+    for part in &parts {
+        if let Ok(code) = u64::from_str_radix(part, 16) {
+            if error_code.is_none() {
+                error_code = ReturnCode::from_u64(code);
+            }
+        } else if let Ok(hex_decode_error_message) = hex::decode(part) {
+            if let Ok(str) = String::from_utf8(hex_decode_error_message.clone()) {
+                error_message = str;
+            }
+        }
+    }
+
+    (error_code, error_message)
+}
+
+pub fn extract_message_from_string_reason(reason: &str) -> String {
+    let contract_error: Vec<&str> = reason.split('[').filter(|part| !part.is_empty()).collect();
+    if contract_error.len() == 3 {
+        let message: Vec<&str> = contract_error[1].split(']').collect();
+        return message[0].to_string();
+    }
+
+    return contract_error.last().unwrap_or(&"").split(']').collect();
+}
+
+fn create_tx_failed(error_message: &str) -> TransactionOnNetwork {
+    let mut failed_transaction_info = TransactionOnNetwork::default();
+
+    let log: ApiLogs = ApiLogs {
+        address: SdkAddress(Address::zero()),
+        events: vec![Events {
+            address: SdkAddress(Address::zero()),
+            identifier: LOG_IDENTIFIER_SIGNAL_ERROR.to_string(),
+            topics: Some(vec![error_message.to_string()]),
+            data: LogData::default(),
+        }],
+    };
+
+    failed_transaction_info.logs = Some(log);
+
+    failed_transaction_info
+}
diff --git a/framework/snippets/src/test_wallets.rs b/sdk/core/src/test_wallets.rs
similarity index 97%
rename from framework/snippets/src/test_wallets.rs
rename to sdk/core/src/test_wallets.rs
index 341f93ef29..c83d93eaf6 100644
--- a/framework/snippets/src/test_wallets.rs
+++ b/sdk/core/src/test_wallets.rs
@@ -1,4 +1,4 @@
-use multiversx_sdk::wallet::Wallet;
+use crate::wallet::Wallet;
 
 fn test_wallet(pem_file_contents: &str) -> Wallet {
     Wallet::from_pem_file_contents(pem_file_contents.to_string()).unwrap()
diff --git a/framework/snippets/src/test_wallets/alice.pem b/sdk/core/src/test_wallets/alice.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/alice.pem
rename to sdk/core/src/test_wallets/alice.pem
diff --git a/framework/snippets/src/test_wallets/bob.pem b/sdk/core/src/test_wallets/bob.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/bob.pem
rename to sdk/core/src/test_wallets/bob.pem
diff --git a/framework/snippets/src/test_wallets/carol.pem b/sdk/core/src/test_wallets/carol.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/carol.pem
rename to sdk/core/src/test_wallets/carol.pem
diff --git a/framework/snippets/src/test_wallets/dan.pem b/sdk/core/src/test_wallets/dan.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/dan.pem
rename to sdk/core/src/test_wallets/dan.pem
diff --git a/framework/snippets/src/test_wallets/eve.pem b/sdk/core/src/test_wallets/eve.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/eve.pem
rename to sdk/core/src/test_wallets/eve.pem
diff --git a/framework/snippets/src/test_wallets/frank.pem b/sdk/core/src/test_wallets/frank.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/frank.pem
rename to sdk/core/src/test_wallets/frank.pem
diff --git a/framework/snippets/src/test_wallets/grace.pem b/sdk/core/src/test_wallets/grace.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/grace.pem
rename to sdk/core/src/test_wallets/grace.pem
diff --git a/framework/snippets/src/test_wallets/heidi.pem b/sdk/core/src/test_wallets/heidi.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/heidi.pem
rename to sdk/core/src/test_wallets/heidi.pem
diff --git a/framework/snippets/src/test_wallets/ivan.pem b/sdk/core/src/test_wallets/ivan.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/ivan.pem
rename to sdk/core/src/test_wallets/ivan.pem
diff --git a/framework/snippets/src/test_wallets/judy.pem b/sdk/core/src/test_wallets/judy.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/judy.pem
rename to sdk/core/src/test_wallets/judy.pem
diff --git a/framework/snippets/src/test_wallets/mallory.pem b/sdk/core/src/test_wallets/mallory.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/mallory.pem
rename to sdk/core/src/test_wallets/mallory.pem
diff --git a/framework/snippets/src/test_wallets/mike.pem b/sdk/core/src/test_wallets/mike.pem
similarity index 100%
rename from framework/snippets/src/test_wallets/mike.pem
rename to sdk/core/src/test_wallets/mike.pem
diff --git a/sdk/core/src/wallet.rs b/sdk/core/src/wallet.rs
index ab1b0a2f37..d846b803a4 100644
--- a/sdk/core/src/wallet.rs
+++ b/sdk/core/src/wallet.rs
@@ -1,11 +1,22 @@
 extern crate rand;
 
+use core::str;
+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 multiversx_chain_core::types::Address;
 use pbkdf2::pbkdf2;
+use rand::RngCore;
+use scrypt::{scrypt, Params};
 use serde_json::json;
-use sha2::{Digest, Sha512};
+use sha2::{Digest, Sha256, Sha512};
 use sha3::Keccak256;
 use zeroize::Zeroize;
 
@@ -14,13 +25,19 @@ use crate::{
         private_key::{PrivateKey, PRIVATE_KEY_LENGTH},
         public_key::PublicKey,
     },
-    data::{address::Address, transaction::Transaction},
+    data::{keystore::*, transaction::Transaction},
+    utils::*,
 };
 
+use uuid::Uuid;
+
 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 {
@@ -63,7 +80,8 @@ 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");
+        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 +101,8 @@ 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");
+            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();
@@ -93,9 +112,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> {
@@ -111,9 +141,68 @@ impl Wallet {
         Ok(Self { priv_key: pri_key })
     }
 
-    pub fn address(&self) -> Address {
-        let public_key = PublicKey::from(&self.priv_key);
-        Address::from(&public_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, 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(decryption_params)).as_str(),
+        )?;
+        Ok(Self { priv_key })
+    }
+
+    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)
+    }
+
+    #[deprecated(
+        since = "0.54.0",
+        note = "Renamed to `to_address`, type changed to multiversx_chain_core::types::Address"
+    )]
+    pub fn address(&self) -> crate::data::sdk_address::SdkAddress {
+        crate::data::sdk_address::SdkAddress(self.to_address())
+    }
+
+    pub fn to_address(&self) -> Address {
+        PublicKey::from(&self.priv_key).to_address()
     }
 
     pub fn sign_tx(&self, unsign_tx: &Transaction) -> [u8; 64] {
@@ -131,4 +220,155 @@ impl Wallet {
 
         self.priv_key.sign(tx_bytes)
     }
+
+    pub 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();
+
+        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,
+                data: ciphertext,
+            })
+        } else {
+            println!("Password is incorrect");
+            Err(WalletError::InvalidPassword)
+        }
+    }
+
+    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.data.to_vec();
+        cipher.apply_keystream(&mut decrypted);
+
+        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: crate::bech32::encode(address),
+        };
+
+        let mut keystore_json: String = serde_json::to_string_pretty(&keystore).unwrap();
+        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 address_bech32 = crate::bech32::encode(address);
+        let pem_content = format!(
+            "-----BEGIN PRIVATE KEY for {address_bech32}-----\n{formatted_key}\n-----END PRIVATE KEY for {address_bech32}-----\n"
+        );
+
+        pem_content
+    }
 }
diff --git a/sdk/core/tests/retrieve_tx_on_network_test.rs b/sdk/core/tests/retrieve_tx_on_network_test.rs
new file mode 100644
index 0000000000..11c8f6bf4a
--- /dev/null
+++ b/sdk/core/tests/retrieve_tx_on_network_test.rs
@@ -0,0 +1,66 @@
+use multiversx_chain_core::types::ReturnCode;
+use multiversx_sdk::retrieve_tx_on_network::{
+    extract_message_from_string_reason, find_code_and_message, parse_reason,
+};
+
+#[test]
+fn parse_reason_only_message_test() {
+    let reason = "@6f7574206f662066756e6473";
+    let (code, message) = find_code_and_message(reason);
+    assert!(code.is_none());
+    assert_eq!("out of funds", message);
+
+    let (code, message) = parse_reason(reason);
+    assert_eq!(ReturnCode::OutOfFunds, code);
+    assert_eq!("out of funds", message);
+}
+
+#[test]
+fn parse_reason_empty_test() {
+    let (code, message) = parse_reason("");
+    assert_eq!(ReturnCode::UserError, code);
+    assert_eq!("invalid transaction", message);
+}
+
+#[test]
+fn parse_reason_test() {
+    let reason = "@04@63616c6c56616c7565206e6f7420657175616c732077697468206261736549737375696e67436f7374@20248548f50a8fda29910e851c07c6c331a7f9e7784201ff2486be0934dbf612@bce4fac4ef67b79dbd2ce619b96fc7f51a3d36f68d5989b16b6fc1e47bde345d@ea64ae9803ff02ad12d496ab9e2838cc3ec3f9197973749610b4ccd4def8c1d1@00";
+
+    let (code, message) = find_code_and_message(reason);
+    assert_eq!(Some(ReturnCode::UserError), code);
+    assert_eq!("callValue not equals with baseIssuingCost", message);
+
+    let (code, message) = parse_reason(reason);
+    assert_eq!(ReturnCode::UserError, code);
+    assert_eq!("callValue not equals with baseIssuingCost", message);
+}
+
+#[test]
+fn parse_reason_sc_panic_test() {
+    let reason = "\n\truntime.go:856 [error signalled by smartcontract] [compoundRewards]\n\truntime.go:856 [error signalled by smartcontract] [compoundRewards]\n\truntime.go:853 [Guild closing]";
+    let (code, message) = find_code_and_message(reason);
+    assert!(code.is_none());
+    assert!(message.is_empty());
+
+    let message = extract_message_from_string_reason(reason);
+    assert_eq!("Guild closing", message);
+
+    let (code, message) = parse_reason(reason);
+    assert_eq!(ReturnCode::UserError, code);
+    assert_eq!("Guild closing", message);
+}
+
+#[test]
+fn parse_reason_invalid_contract_test() {
+    let reason = "\n\truntime.go:831 [invalid contract code (not found)] [buyCards]";
+    let (code, message) = find_code_and_message(reason);
+    assert!(code.is_none());
+    assert!(message.is_empty());
+
+    let message = extract_message_from_string_reason(reason);
+    assert_eq!("invalid contract code (not found)", message);
+
+    let (code, message) = parse_reason(reason);
+    assert_eq!(ReturnCode::UserError, code);
+    assert_eq!("invalid contract code (not found)", message);
+}
diff --git a/sdk/core/tests/wallet_test.rs b/sdk/core/tests/wallet_test.rs
index d076980084..e82c6aa689 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 multiversx_chain_core::types::Address;
+use multiversx_sdk::bech32;
+use multiversx_sdk::{crypto::public_key::PublicKey, wallet::Wallet};
+use std::fs::{self, File};
+use std::io::Write;
+
+const ALICE_PEM_PATH: &str = "tests/alice.pem";
+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";
+const ALICE_PRIVATE_KEY: &str = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9";
 
 #[test]
 fn test_private_key_from_mnemonic() {
@@ -8,7 +20,7 @@ fn test_private_key_from_mnemonic() {
 
     let private_key = Wallet::get_private_key_from_mnemonic(mnemonic.clone(), 0, 0);
     let public_key = PublicKey::from(&private_key);
-    let address = Address::from(&public_key);
+    let address = public_key.to_address();
     assert_eq!(
         "0b7966138e80b8f3bb64046f56aea4250fd7bacad6ed214165cea6767fd0bc2c",
         private_key.to_string()
@@ -19,12 +31,12 @@ fn test_private_key_from_mnemonic() {
     );
     assert_eq!(
         "erd1mlh7q3fcgrjeq0et65vaaxcw6m5ky8jhu296pdxpk9g32zga6uhsemxx2a",
-        address.to_string()
+        bech32::encode(&address)
     );
 
     let private_key = Wallet::get_private_key_from_mnemonic(mnemonic, 0, 1);
     let public_key = PublicKey::from(&private_key);
-    let address = Address::from(&public_key);
+    let address = public_key.to_address();
     assert_eq!(
         "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0",
         private_key.to_string()
@@ -35,16 +47,72 @@ fn test_private_key_from_mnemonic() {
     );
     assert_eq!(
         "erd147877pc2tqv88yfvewhmdfuth845uqpsskky8kaalglzp6unem0qpwh982",
-        address.to_string()
+        bech32::encode(&address)
     );
 }
 
 #[test]
 fn test_load_from_pem() {
     let wallet = Wallet::from_pem_file("tests/alice.pem").unwrap();
-    let addr = wallet.address();
+    let address = wallet.to_address();
     assert_eq!(
-        addr.to_bech32_string().unwrap(),
-        "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+        "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+        bech32::encode(&address)
     );
 }
+
+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(file: &str) -> Address {
+    let wallet = Wallet::from_private_key(ALICE_PRIVATE_KEY).unwrap();
+    let address = wallet.to_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, file);
+    address
+}
+
+#[test]
+fn test_wallet_convert_pem_to_keystore() {
+    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_1, KEYSTORE_PASSWORD)
+            .unwrap()
+            .to_string(),
+        private_key_pem
+    );
+    fs::remove_file(ALICE_KEYSTORE_PATH_TEST_1).unwrap();
+}
+
+#[test]
+fn test_wallet_convert_keystore_to_pem() {
+    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_2, 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_2).unwrap();
+}
diff --git a/sdk/dapp/Cargo.toml b/sdk/dapp/Cargo.toml
new file mode 100644
index 0000000000..9b204c08e6
--- /dev/null
+++ b/sdk/dapp/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "multiversx-sdk-dapp"
+version = "0.7.0"
+edition = "2021"
+
+authors = ["MultiversX <contact@multiversx.com>"]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/multiversx/mx-sdk-rs"
+homepage = "https://multiversx.com/"
+documentation = "https://docs.multiversx.com/"
+description = "SDK for interacting with the MultiversX blockchain for wasm-bindgen environments"
+categories = ["cryptography::cryptocurrencies", "api-bindings"]
+keywords = ["multiversx", "blockchain", "sdk", "wasm", "wasm-bindgen"]
+
+[dependencies]
+getrandom = { version = "0.2.15", features = ["js"] } # js feature overrides import from sdk
+web-sys = { version = "0.3.70" }
+js-sys = { version = "0.3.70" }
+wasm-bindgen = { version = "0.2.93" }
+wasm-bindgen-futures = { version = "0.4.43" }
+gloo-net = { version = "0.6.0" }
+anyhow = "1.0.44"
+hex = "0.4.3"
+itertools = "0.13.0"
+log = "0.4.17"
+
+[dependencies.multiversx-sdk]
+version = "=0.7.0"
+path = "../core"
diff --git a/sdk/dapp/README.md b/sdk/dapp/README.md
new file mode 100644
index 0000000000..adaf311e41
--- /dev/null
+++ b/sdk/dapp/README.md
@@ -0,0 +1,5 @@
+# MultiversX SDK for Rust
+
+General purpose collection of tools & SDKs to interact with the MultiversX blockchain from Rust projects, wasm-bindgen compatible.
+
+More examples in `./examples`.
diff --git a/sdk/dapp/src/gateway_dapp_proxy.rs b/sdk/dapp/src/gateway_dapp_proxy.rs
new file mode 100644
index 0000000000..885e489803
--- /dev/null
+++ b/sdk/dapp/src/gateway_dapp_proxy.rs
@@ -0,0 +1,80 @@
+use gloo_net::http::Request;
+use multiversx_sdk::gateway::{GatewayAsyncService, GatewayRequest, GatewayRequestType};
+
+/// Allows communication with the MultiversX gateway API.
+#[derive(Clone, Debug)]
+pub struct GatewayDappProxy {
+    pub(crate) proxy_url: String,
+}
+
+impl GatewayDappProxy {
+    pub fn new(proxy_url: String) -> Self {
+        Self { proxy_url }
+    }
+
+    /// Performs a request to the gateway.
+    /// Can be either GET or POST, depending on the argument.
+    pub async fn http_request<G>(&self, request: G) -> anyhow::Result<G::Result>
+    where
+        G: GatewayRequest,
+    {
+        let url = format!("{}/{}", self.proxy_url, request.get_endpoint());
+        let request_builder = match request.request_type() {
+            GatewayRequestType::Get => Request::get(&url),
+            GatewayRequestType::Post => Request::post(&url),
+        };
+
+        let response = if let Some(payload) = request.get_payload() {
+            request_builder.json(&payload)?.send().await?
+        } else {
+            request_builder.send().await?
+        };
+
+        let decoded = response.json::<G::DecodedJson>().await?;
+
+        request.process_json(decoded)
+    }
+}
+
+impl GatewayAsyncService for GatewayDappProxy {
+    type Instant = f64;
+
+    fn from_uri(uri: &str) -> Self {
+        Self::new(uri.to_owned())
+    }
+
+    fn request<G>(&self, request: G) -> impl std::future::Future<Output = anyhow::Result<G::Result>>
+    where
+        G: multiversx_sdk::gateway::GatewayRequest,
+    {
+        self.http_request(request)
+    }
+
+    fn sleep(&self, millis: u64) -> impl std::future::Future<Output = ()> {
+        sleep(millis as f32 * 1000f32)
+    }
+
+    fn now(&self) -> Self::Instant {
+        js_sys::Date::now()
+    }
+
+    fn elapsed_seconds(&self, instant: &Self::Instant) -> f32 {
+        ((js_sys::Date::now() - instant) / 1000.0) as f32
+    }
+}
+
+async fn sleep(seconds: f32) {
+    let promise = js_sys::Promise::new(&mut |resolve, _| {
+        if let Some(win) = web_sys::window() {
+            let _ = win
+                .set_timeout_with_callback_and_timeout_and_arguments_0(
+                    &resolve,
+                    (seconds * 1000.0) as i32,
+                )
+                .expect("Failed to set timeout");
+        } else {
+            panic!("No global window object available");
+        }
+    });
+    wasm_bindgen_futures::JsFuture::from(promise).await.unwrap();
+}
diff --git a/sdk/dapp/src/lib.rs b/sdk/dapp/src/lib.rs
new file mode 100644
index 0000000000..4ca9648fd7
--- /dev/null
+++ b/sdk/dapp/src/lib.rs
@@ -0,0 +1,6 @@
+mod gateway_dapp_proxy;
+pub use gateway_dapp_proxy::GatewayDappProxy;
+
+pub use multiversx_sdk as core;
+
+pub use multiversx_sdk::{data, utils, wallet};
diff --git a/sdk/http/Cargo.toml b/sdk/http/Cargo.toml
new file mode 100644
index 0000000000..da4078f288
--- /dev/null
+++ b/sdk/http/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "multiversx-sdk-http"
+version = "0.7.0"
+edition = "2021"
+
+authors = [
+    "MultiversX <contact@multiversx.com>",
+]
+license = "MIT"
+readme = "README.md"
+repository = "https://github.com/multiversx/mx-sdk-rs"
+homepage = "https://multiversx.com/"
+documentation = "https://docs.multiversx.com/"
+description = "SDK for interacting with the MultiversX blockchain"
+categories = ["cryptography::cryptocurrencies", "api-bindings"]
+keywords = ["multiversx", "blockchain", "sdk", "api"]
+
+[features]
+default = ["default-tls"]
+default-tls = ["reqwest/default-tls"]
+static-tls = ["reqwest/rustls-tls"]
+chain_simulator = []
+
+[dependencies]
+tokio = { version = "1.24", features = ["full"] }
+reqwest = { version = "0.12", features = ["blocking", "json"], default-features = false }
+anyhow = "1.0.44"
+hex = "0.4.3"
+itertools = "0.13.0"
+log = "0.4.17"
+
+[dependencies.multiversx-sdk]
+version = "=0.7.0"
+path = "../core"
\ No newline at end of file
diff --git a/sdk/http/README.md b/sdk/http/README.md
new file mode 100644
index 0000000000..af0a28716a
--- /dev/null
+++ b/sdk/http/README.md
@@ -0,0 +1,21 @@
+# MultiversX SDK for Rust
+
+[![Crates.io](https://img.shields.io/crates/v/multiversx-sdk)](https://crates.io/crates/multiversx-sdk)
+
+General purpose collection of tools & SDKs to interact with the MultiversX blockchain from Rust projects.
+
+## Example
+
+```rust
+use multiversx_sdk::blockchain::rpc::{CommunicationProxy, DEVNET_GATEWAY};
+
+#[tokio::test]
+async fn get_network_config() {
+    let blockchain = CommunicationProxy::new(DEVNET_GATEWAY.to_string());
+    let network_config = blockchain.get_network_config().await.unwrap();
+
+    println!("network_config: {:?}", network_config)
+}
+```
+
+More examples in `./examples`.
diff --git a/sdk/http/examples/account.rs b/sdk/http/examples/account.rs
new file mode 100644
index 0000000000..c9020b79ce
--- /dev/null
+++ b/sdk/http/examples/account.rs
@@ -0,0 +1,15 @@
+use multiversx_sdk::data::sdk_address::SdkAddress;
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let addr = SdkAddress::from_bech32_string(
+        "erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts",
+    )
+    .unwrap();
+
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let account = blockchain.get_account(&addr.0).await.unwrap();
+
+    println!("account: {account:#?}");
+}
diff --git a/sdk/http/examples/account_storage.rs b/sdk/http/examples/account_storage.rs
new file mode 100644
index 0000000000..2a91ba34c2
--- /dev/null
+++ b/sdk/http/examples/account_storage.rs
@@ -0,0 +1,15 @@
+use multiversx_sdk::data::sdk_address::SdkAddress;
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let addr = SdkAddress::from_bech32_string(
+        "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+    )
+    .unwrap();
+
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let account_storage = blockchain.get_account_storage_keys(&addr.0).await.unwrap();
+
+    println!("Account Storage: {account_storage:#?}");
+}
diff --git a/sdk/http/examples/get_esdt_tokens.rs b/sdk/http/examples/get_esdt_tokens.rs
new file mode 100644
index 0000000000..a95e810507
--- /dev/null
+++ b/sdk/http/examples/get_esdt_tokens.rs
@@ -0,0 +1,15 @@
+use multiversx_sdk::data::sdk_address::SdkAddress;
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let addr = SdkAddress::from_bech32_string(
+        "erd1pdv0h3ddqyzlraek02y5rhmjnwwapjyhqm983kfcdfzmr6axqhdsfg4akx",
+    )
+    .unwrap();
+
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let balances = blockchain.get_account_esdt_tokens(&addr.0).await.unwrap();
+
+    println!("{balances:#?}");
+}
diff --git a/sdk/http/examples/get_hyper_block_by_hash.rs b/sdk/http/examples/get_hyper_block_by_hash.rs
new file mode 100644
index 0000000000..db42e77599
--- /dev/null
+++ b/sdk/http/examples/get_hyper_block_by_hash.rs
@@ -0,0 +1,11 @@
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let result = blockchain
+        .get_hyper_block_by_hash("d59e0dc7d407b1175655357cb8056ec3bb77961192753cddda2fb700c6ce71c6")
+        .await;
+
+    println!("block by hash result: {result:#?}");
+}
diff --git a/sdk/http/examples/get_hyper_block_by_nonce.rs b/sdk/http/examples/get_hyper_block_by_nonce.rs
new file mode 100644
index 0000000000..39c88dd14f
--- /dev/null
+++ b/sdk/http/examples/get_hyper_block_by_nonce.rs
@@ -0,0 +1,9 @@
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let blockchain = GatewayHttpProxy::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/http/examples/get_hyper_block_latest.rs b/sdk/http/examples/get_hyper_block_latest.rs
new file mode 100644
index 0000000000..522a7aa52b
--- /dev/null
+++ b/sdk/http/examples/get_hyper_block_latest.rs
@@ -0,0 +1,9 @@
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let result = blockchain.get_latest_hyper_block_nonce().await;
+
+    println!("latest block result: {result:?}")
+}
diff --git a/sdk/core/examples/get_network_config.rs b/sdk/http/examples/get_network_config.rs
similarity index 54%
rename from sdk/core/examples/get_network_config.rs
rename to sdk/http/examples/get_network_config.rs
index d53e0e7ce1..daea7e5baf 100644
--- a/sdk/core/examples/get_network_config.rs
+++ b/sdk/http/examples/get_network_config.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayHttpProxy::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/http/examples/get_network_economics.rs
similarity index 56%
rename from sdk/core/examples/get_network_economics.rs
rename to sdk/http/examples/get_network_economics.rs
index bb0410c8f0..5e1bc6de93 100644
--- a/sdk/core/examples/get_network_economics.rs
+++ b/sdk/http/examples/get_network_economics.rs
@@ -1,8 +1,8 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayHttpProxy::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/http/examples/sign_tx.rs
similarity index 74%
rename from sdk/core/examples/sign_tx.rs
rename to sdk/http/examples/sign_tx.rs
index aa3f977321..c0106abf87 100644
--- a/sdk/core/examples/sign_tx.rs
+++ b/sdk/http/examples/sign_tx.rs
@@ -1,8 +1,8 @@
 use multiversx_sdk::{
-    data::transaction::Transaction,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
+    data::{sdk_address::SdkAddress, transaction::Transaction},
     wallet::Wallet,
 };
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
@@ -10,8 +10,8 @@ async fn main() {
         "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0",
     )
     .unwrap();
-    let addr = wl.address();
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let addr = wl.to_address();
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
 
     let arg = blockchain
@@ -22,8 +22,8 @@ async fn main() {
     let mut unsign_tx = Transaction {
         nonce: arg.nonce,
         value: "0".to_string(),
-        receiver: addr.clone(),
-        sender: addr.clone(),
+        receiver: SdkAddress(addr.clone()),
+        sender: SdkAddress(addr.clone()),
         gas_price: arg.gas_price,
         gas_limit: arg.gas_limit,
         data: arg.data,
diff --git a/sdk/core/examples/sign_txs.rs b/sdk/http/examples/sign_txs.rs
similarity index 79%
rename from sdk/core/examples/sign_txs.rs
rename to sdk/http/examples/sign_txs.rs
index 2860d528f7..2ac2715591 100644
--- a/sdk/core/examples/sign_txs.rs
+++ b/sdk/http/examples/sign_txs.rs
@@ -1,8 +1,8 @@
 use multiversx_sdk::{
-    data::transaction::Transaction,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
+    data::{sdk_address::SdkAddress, transaction::Transaction},
     wallet::Wallet,
 };
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
@@ -10,8 +10,8 @@ async fn main() {
         "1648ad209d6b157a289884933e3bb30f161ec7113221ec16f87c3578b05830b0",
     )
     .unwrap();
-    let addr = wl.address();
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let addr = wl.to_address();
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
 
     let arg = blockchain
@@ -22,8 +22,8 @@ async fn main() {
     let mut unsign_tx = Transaction {
         nonce: arg.nonce,
         value: "1000000000000000000".to_string(),
-        receiver: addr.clone(),
-        sender: addr.clone(),
+        receiver: SdkAddress(addr.clone()),
+        sender: SdkAddress(addr.clone()),
         gas_price: arg.gas_price,
         gas_limit: arg.gas_limit,
         data: arg.data,
diff --git a/sdk/core/examples/tx_cost.rs b/sdk/http/examples/tx_cost.rs
similarity index 73%
rename from sdk/core/examples/tx_cost.rs
rename to sdk/http/examples/tx_cost.rs
index a982b130ec..8fd15decd6 100644
--- a/sdk/core/examples/tx_cost.rs
+++ b/sdk/http/examples/tx_cost.rs
@@ -1,19 +1,19 @@
 use multiversx_sdk::{
-    data::{address::Address, transaction::Transaction},
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
+    data::{sdk_address::SdkAddress, transaction::Transaction},
     utils::base64_encode,
 };
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
     let tx = Transaction {
         nonce: 1,
         value: "50".to_string(),
-        receiver: Address::from_bech32_string(
+        receiver: SdkAddress::from_bech32_string(
             "erd1rh5ws22jxm9pe7dtvhfy6j3uttuupkepferdwtmslms5fydtrh5sx3xr8r",
         )
         .unwrap(),
-        sender: Address::from_bech32_string(
+        sender: SdkAddress::from_bech32_string(
             "erd1rh5ws22jxm9pe7dtvhfy6j3uttuupkepferdwtmslms5fydtrh5sx3xr8r",
         )
         .unwrap(),
@@ -26,7 +26,7 @@ async fn main() {
         signature: None,
     };
 
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayHttpProxy::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/http/examples/tx_default_args.rs
similarity index 50%
rename from sdk/core/examples/tx_default_args.rs
rename to sdk/http/examples/tx_default_args.rs
index 01b91aa5a6..6dc3e90f17 100644
--- a/sdk/core/examples/tx_default_args.rs
+++ b/sdk/http/examples/tx_default_args.rs
@@ -1,19 +1,17 @@
-use multiversx_sdk::{
-    data::address::Address,
-    gateway::{GatewayProxy, DEVNET_GATEWAY},
-};
+use multiversx_sdk::data::sdk_address::SdkAddress;
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
     let network_config = blockchain.get_network_config().await.unwrap();
-    let addr = Address::from_bech32_string(
+    let addr = SdkAddress::from_bech32_string(
         "erd1qqqqqqqqqqqqqpgqfzydqmdw7m2vazsp6u5p95yxz76t2p9rd8ss0zp9ts",
     )
     .unwrap();
 
     let arg = blockchain
-        .get_default_transaction_arguments(&addr, &network_config)
+        .get_default_transaction_arguments(&addr.0, &network_config)
         .await
         .unwrap();
 
diff --git a/sdk/core/examples/tx_info.rs b/sdk/http/examples/tx_info.rs
similarity index 61%
rename from sdk/core/examples/tx_info.rs
rename to sdk/http/examples/tx_info.rs
index f7126daca9..b5dd818354 100644
--- a/sdk/core/examples/tx_info.rs
+++ b/sdk/http/examples/tx_info.rs
@@ -1,9 +1,9 @@
-use multiversx_sdk::gateway::{GatewayProxy, DEVNET_GATEWAY};
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
 
 #[tokio::main]
 async fn main() {
-    let tx_hash = "49edb289892a655a0e988b360c19326c21107f9696c6197b435667c6e8c6e1a3";
-    let blockchain = GatewayProxy::new(DEVNET_GATEWAY.to_string());
+    let tx_hash = "fd21782ddb9e2217a3239e849e39d1d2c8fa74142a73f2dda3adb3028c0514e9";
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
 
     let status = blockchain.get_transaction_status(tx_hash).await;
     println!("tx status: {status:?}");
diff --git a/sdk/http/examples/vm_query.rs b/sdk/http/examples/vm_query.rs
new file mode 100644
index 0000000000..1845b25ff2
--- /dev/null
+++ b/sdk/http/examples/vm_query.rs
@@ -0,0 +1,18 @@
+use multiversx_sdk::data::{sdk_address::SdkAddress, vm::VMQueryInput};
+use multiversx_sdk_http::{GatewayHttpProxy, DEVNET_GATEWAY};
+
+#[tokio::main]
+async fn main() {
+    let blockchain = GatewayHttpProxy::new(DEVNET_GATEWAY.to_string());
+    let sc_address = SdkAddress::from_bech32_string(
+        "erd1qqqqqqqqqqqqqpgq5dvvkmka7sujfsx7cfmygnx0n7luv8k0d8sskpqcec",
+    )
+    .unwrap();
+    let req = VMQueryInput {
+        sc_address: sc_address.clone(),
+        func_name: "empty".to_string(),
+        args: vec![],
+    };
+    let result = blockchain.execute_vmquery(&req).await;
+    println!("{result:#?}");
+}
diff --git a/sdk/http/src/gateway_http_proxy.rs b/sdk/http/src/gateway_http_proxy.rs
new file mode 100644
index 0000000000..3cbe19a454
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy.rs
@@ -0,0 +1,82 @@
+mod http_account;
+mod http_block;
+mod http_chain_simulator;
+mod http_network;
+mod http_tx;
+
+use std::time::Duration;
+
+use multiversx_sdk::gateway::{GatewayAsyncService, GatewayRequest};
+
+/// Allows communication with the MultiversX gateway API.
+#[derive(Clone, Debug)]
+pub struct GatewayHttpProxy {
+    pub(crate) proxy_uri: String,
+    pub(crate) client: reqwest::Client,
+}
+
+impl GatewayHttpProxy {
+    pub fn new(proxy_uri: String) -> Self {
+        Self {
+            proxy_uri,
+            client: reqwest::Client::new(),
+        }
+    }
+
+    /// Performs a request to the gateway.
+    /// Can be either GET or POST, depending on the argument.
+    pub async fn http_request<G>(&self, request: G) -> anyhow::Result<G::Result>
+    where
+        G: GatewayRequest,
+    {
+        let url = format!("{}/{}", self.proxy_uri, request.get_endpoint());
+        let mut request_builder;
+        match request.request_type() {
+            multiversx_sdk::gateway::GatewayRequestType::Get => {
+                request_builder = self.client.get(url);
+            },
+            multiversx_sdk::gateway::GatewayRequestType::Post => {
+                request_builder = self.client.post(url);
+            },
+        }
+
+        if let Some(payload) = request.get_payload() {
+            request_builder = request_builder.json(&payload);
+        }
+
+        let decoded = request_builder
+            .send()
+            .await?
+            .json::<G::DecodedJson>()
+            .await?;
+
+        request.process_json(decoded)
+    }
+}
+
+impl GatewayAsyncService for GatewayHttpProxy {
+    type Instant = std::time::Instant;
+
+    fn from_uri(uri: &str) -> Self {
+        Self::new(uri.to_owned())
+    }
+
+    fn request<G>(&self, request: G) -> impl std::future::Future<Output = anyhow::Result<G::Result>>
+    where
+        G: multiversx_sdk::gateway::GatewayRequest,
+    {
+        self.http_request(request)
+    }
+
+    fn sleep(&self, millis: u64) -> impl std::future::Future<Output = ()> {
+        tokio::time::sleep(Duration::from_millis(millis))
+    }
+
+    fn now(&self) -> Self::Instant {
+        std::time::Instant::now()
+    }
+
+    fn elapsed_seconds(&self, instant: &Self::Instant) -> f32 {
+        instant.elapsed().as_secs_f32()
+    }
+}
diff --git a/sdk/http/src/gateway_http_proxy/http_account.rs b/sdk/http/src/gateway_http_proxy/http_account.rs
new file mode 100644
index 0000000000..95001afd73
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy/http_account.rs
@@ -0,0 +1,46 @@
+use anyhow::Result;
+use multiversx_sdk::{
+    chain_core::types::Address,
+    data::{account::Account, esdt::EsdtBalance},
+    gateway::{
+        GetAccountEsdtRolesRequest, GetAccountEsdtTokensRequest, GetAccountRequest,
+        GetAccountStorageRequest,
+    },
+};
+use std::collections::HashMap;
+
+use super::GatewayHttpProxy;
+
+impl GatewayHttpProxy {
+    // get_account retrieves an account info from the network (nonce, balance)
+    pub async fn get_account(&self, address: &Address) -> Result<Account> {
+        self.http_request(GetAccountRequest::new(address)).await
+    }
+
+    // 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>>> {
+        self.http_request(GetAccountEsdtRolesRequest::new(address))
+            .await
+    }
+
+    // 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>> {
+        self.http_request(GetAccountEsdtTokensRequest::new(address))
+            .await
+    }
+
+    // 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>> {
+        self.http_request(GetAccountStorageRequest::new(address))
+            .await
+    }
+}
diff --git a/sdk/http/src/gateway_http_proxy/http_block.rs b/sdk/http/src/gateway_http_proxy/http_block.rs
new file mode 100644
index 0000000000..4acaf04a67
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy/http_block.rs
@@ -0,0 +1,26 @@
+use anyhow::Result;
+use multiversx_sdk::{
+    data::hyperblock::HyperBlock,
+    gateway::{GetHyperBlockRequest, NetworkStatusRequest},
+};
+
+use super::GatewayHttpProxy;
+
+impl GatewayHttpProxy {
+    // 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> {
+        self.http_request(GetHyperBlockRequest::by_hash(hash)).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> {
+        self.http_request(GetHyperBlockRequest::by_nonce(nonce))
+            .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) -> Result<u64> {
+        let network_status = self.http_request(NetworkStatusRequest::default()).await?;
+        Ok(network_status.nonce)
+    }
+}
diff --git a/sdk/http/src/gateway_http_proxy/http_chain_simulator.rs b/sdk/http/src/gateway_http_proxy/http_chain_simulator.rs
new file mode 100644
index 0000000000..32cc83ef3a
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy/http_chain_simulator.rs
@@ -0,0 +1,34 @@
+use super::GatewayHttpProxy;
+use anyhow::Error;
+use multiversx_sdk::{
+    chain_core::types::Address,
+    gateway::{
+        ChainSimulatorGenerateBlocksRequest, ChainSimulatorSendFundsRequest, GatewayAsyncService,
+    },
+};
+
+impl GatewayHttpProxy {
+    pub async fn send_user_funds(&self, receiver: &Address) -> Result<String, Error> {
+        self.request(ChainSimulatorSendFundsRequest::to_address(receiver))
+            .await
+    }
+
+    pub async fn generate_blocks(&self, num_blocks: u64) -> Result<String, Error> {
+        self.request(ChainSimulatorGenerateBlocksRequest::num_blocks(num_blocks))
+            .await
+    }
+
+    pub async fn generate_blocks_until_epoch(&self, epoch_number: u64) -> Result<String, Error> {
+        self.request(ChainSimulatorGenerateBlocksRequest::until_epoch(
+            epoch_number,
+        ))
+        .await
+    }
+
+    pub async fn generate_blocks_until_tx_processed(&self, tx_hash: &str) -> Result<String, Error> {
+        self.request(ChainSimulatorGenerateBlocksRequest::until_tx_processed(
+            tx_hash,
+        ))
+        .await
+    }
+}
diff --git a/sdk/http/src/gateway_http_proxy/http_network.rs b/sdk/http/src/gateway_http_proxy/http_network.rs
new file mode 100644
index 0000000000..d6808689c9
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy/http_network.rs
@@ -0,0 +1,19 @@
+use anyhow::Result;
+use multiversx_sdk::{
+    data::{network_config::NetworkConfig, network_economics::NetworkEconomics},
+    gateway::{NetworkConfigRequest, NetworkEconimicsRequest},
+};
+
+use super::GatewayHttpProxy;
+
+impl GatewayHttpProxy {
+    // get_network_config retrieves the network configuration from the proxy
+    pub async fn get_network_config(&self) -> Result<NetworkConfig> {
+        self.http_request(NetworkConfigRequest).await
+    }
+
+    // get_network_economics retrieves the network economics from the proxy
+    pub async fn get_network_economics(&self) -> Result<NetworkEconomics> {
+        self.http_request(NetworkEconimicsRequest).await
+    }
+}
diff --git a/sdk/http/src/gateway_http_proxy/http_tx.rs b/sdk/http/src/gateway_http_proxy/http_tx.rs
new file mode 100644
index 0000000000..1c0ffaf60c
--- /dev/null
+++ b/sdk/http/src/gateway_http_proxy/http_tx.rs
@@ -0,0 +1,86 @@
+use anyhow::Result;
+use multiversx_sdk::{
+    chain_core::types::Address,
+    data::{
+        network_config::NetworkConfig,
+        sdk_address::SdkAddress,
+        transaction::{
+            ArgCreateTransaction, Transaction, TransactionOnNetwork, TxCostResponseData,
+        },
+        vm::{VMQueryInput, VmValuesResponseData},
+    },
+    gateway::{
+        GetTxCost, GetTxInfo, GetTxProcessStatus, GetTxStatus, SendMultiTxRequest, SendTxRequest,
+        VMQueryRequest,
+    },
+};
+
+use super::GatewayHttpProxy;
+
+impl GatewayHttpProxy {
+    // request_transaction_cost retrieves how many gas a transaction will consume
+    pub async fn request_transaction_cost(&self, tx: &Transaction) -> Result<TxCostResponseData> {
+        self.http_request(GetTxCost(tx)).await
+    }
+
+    // get_transaction_info retrieves a transaction's details from the network
+    pub async fn get_transaction_info(&self, hash: &str) -> Result<TransactionOnNetwork> {
+        self.http_request(GetTxInfo::new(hash)).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.http_request(GetTxInfo::new(hash).with_results()).await
+    }
+
+    // get_transaction_status retrieves a transaction's status from the network
+    pub async fn get_transaction_status(&self, hash: &str) -> Result<String> {
+        self.http_request(GetTxStatus::new(hash)).await
+    }
+
+    // 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)> {
+        self.http_request(GetTxProcessStatus::new(hash)).await
+    }
+
+    // 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: SdkAddress(address.clone()),
+            snd_addr: SdkAddress(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> {
+        self.http_request(SendTxRequest(tx)).await
+    }
+
+    #[allow(clippy::ptr_arg)]
+    pub async fn send_transactions(&self, txs: &Vec<Transaction>) -> Result<Vec<String>> {
+        self.http_request(SendMultiTxRequest(txs)).await
+    }
+
+    // execute_vmquery retrieves data from existing SC trie through the use of a VM
+    pub async fn execute_vmquery(&self, vm_request: &VMQueryInput) -> Result<VmValuesResponseData> {
+        self.http_request(VMQueryRequest(vm_request)).await
+    }
+}
diff --git a/sdk/http/src/lib.rs b/sdk/http/src/lib.rs
new file mode 100644
index 0000000000..c4a1579143
--- /dev/null
+++ b/sdk/http/src/lib.rs
@@ -0,0 +1,15 @@
+mod gateway_http_proxy;
+
+pub use gateway_http_proxy::GatewayHttpProxy;
+
+pub use multiversx_sdk as core;
+
+pub const MAINNET_GATEWAY: &str = "https://gateway.multiversx.com";
+pub const TESTNET_GATEWAY: &str = "https://testnet-gateway.multiversx.com";
+pub const DEVNET_GATEWAY: &str = "https://devnet-gateway.multiversx.com";
+pub const CHAIN_SIMULATOR_GATEWAY: &str = "http://localhost:8085";
+
+// MetachainShardId will be used to identify a shard ID as metachain
+pub const METACHAIN_SHARD_ID: u32 = 0xFFFFFFFF;
+
+pub const DEFAULT_USE_CHAIN_SIMULATOR: bool = false;
diff --git a/sdk/http/tests/get_network_config_test.rs b/sdk/http/tests/get_network_config_test.rs
new file mode 100644
index 0000000000..f13b5c7170
--- /dev/null
+++ b/sdk/http/tests/get_network_config_test.rs
@@ -0,0 +1,15 @@
+use multiversx_sdk::gateway::NetworkConfigRequest;
+use multiversx_sdk_http::{GatewayHttpProxy, CHAIN_SIMULATOR_GATEWAY};
+
+#[tokio::test]
+#[cfg_attr(not(feature = "chain_simulator"), ignore)]
+async fn get_network_config_test() {
+    let blockchain = GatewayHttpProxy::new(CHAIN_SIMULATOR_GATEWAY.to_string());
+    let network_config = blockchain.http_request(NetworkConfigRequest).await.unwrap();
+
+    assert_eq!(network_config.chain_id, "chain");
+    assert_eq!(network_config.denomination, 18);
+    assert_eq!(network_config.num_shards_without_meta, 3);
+    assert_eq!(network_config.round_duration, 6000);
+    assert_eq!(network_config.shard_consensus_group_size, 1);
+}
diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml
index b66e3403ce..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>"]
@@ -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/interactor-system-func-calls/.gitignore b/tools/interactor-system-func-calls/.gitignore
new file mode 100644
index 0000000000..ae87d15dcd
--- /dev/null
+++ b/tools/interactor-system-func-calls/.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
\ No newline at end of file
diff --git a/tools/interactor-system-func-calls/Cargo.toml b/tools/interactor-system-func-calls/Cargo.toml
new file mode 100644
index 0000000000..db6c653698
--- /dev/null
+++ b/tools/interactor-system-func-calls/Cargo.toml
@@ -0,0 +1,26 @@
+[[bin]]
+name = "system-sc-interact"
+path = "src/system_sc_interact.rs"
+
+[package]
+name = "system-sc-interact"
+version = "0.0.0"
+publish = false
+edition = "2021"
+authors = ["you"]
+
+[dependencies]
+toml = "0.8.6"
+tokio = { version = "1.24" }
+
+[dependencies.clap]
+version = "4.4.7"
+features = ["derive"]
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
+
+[dependencies.multiversx-sc-snippets]
+version = "=0.54.1"
+path = "../../framework/snippets"
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/config.toml b/tools/interactor-system-func-calls/config.toml
new file mode 100644
index 0000000000..c6f9a97a1d
--- /dev/null
+++ b/tools/interactor-system-func-calls/config.toml
@@ -0,0 +1,5 @@
+# chain_type = 'simulator'
+# gateway_uri = 'http://localhost:8085'
+
+chain_type = 'real'
+gateway_uri = 'https://devnet-gateway.multiversx.com'
diff --git a/tools/interactor-system-func-calls/src/system_sc_interact.rs b/tools/interactor-system-func-calls/src/system_sc_interact.rs
new file mode 100644
index 0000000000..97d3005c97
--- /dev/null
+++ b/tools/interactor-system-func-calls/src/system_sc_interact.rs
@@ -0,0 +1,769 @@
+#![allow(deprecated)] // TODO: move prepare_async calls to a test for backwards compatibility and delete from here
+
+mod system_sc_interact_cli;
+mod system_sc_interact_config;
+mod system_sc_interact_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::*;
+
+#[tokio::main]
+async fn main() {
+    env_logger::init();
+
+    let mut basic_interact = SysFuncCallsInteract::init().await;
+
+    let cli = system_sc_interact_cli::InteractCli::parse();
+    match &cli.command {
+        Some(system_sc_interact_cli::InteractCliCommand::IssueToken(args)) => {
+            basic_interact
+                .issue_token(
+                    args.cost.clone(),
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
+                    args.num_decimals,
+                    args.token_type.into(),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::Mint(args)) => {
+            basic_interact
+                .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.as_bytes(),
+                    args.roles
+                        .clone()
+                        .into_iter()
+                        .map(EsdtLocalRole::from)
+                        .collect(),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::Burn(args)) => {
+            basic_interact
+                .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.as_bytes()).await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::UnpauseToken(args)) => {
+            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.as_bytes(),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::UnfreezeToken(args)) => {
+            basic_interact
+                .unfreeze_token(
+                    args.token_id.as_bytes(),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::FreezeNFT(args)) => {
+            basic_interact
+                .freeze_nft(
+                    args.token_id.as_bytes(),
+                    args.nft_nonce,
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::UnfreezeNFT(args)) => {
+            basic_interact
+                .unfreeze_nft(
+                    args.token_id.as_bytes(),
+                    args.nft_nonce,
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::WipeToken(args)) => {
+            basic_interact
+                .wipe_token(
+                    args.token_id.as_bytes(),
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::WipeNFT(args)) => {
+            basic_interact
+                .wipe_nft(
+                    args.token_id.as_bytes(),
+                    args.nft_nonce,
+                    &Bech32Address::from_bech32_string(args.address.clone()),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::IssueNFTCollection(args)) => {
+            basic_interact
+                .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.as_bytes(),
+                    args.amount.clone(),
+                    args.name.as_bytes(),
+                    args.royalties,
+                    args.hash.as_bytes(),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::IssueFungible(args)) => {
+            basic_interact
+                .issue_fungible_token(
+                    args.cost.clone(),
+                    args.display_name.as_bytes(),
+                    args.ticker.as_bytes(),
+                    args.supply.clone(),
+                    args.num_decimals,
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::IssueSftCollection(args)) => {
+            basic_interact
+                .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.as_bytes(),
+                    args.amount.clone(),
+                    args.name.as_bytes(),
+                    args.royalties,
+                    args.hash.as_bytes(),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::RegisterMetaEsdt(args)) => {
+            basic_interact
+                .register_meta_esdt(
+                    args.cost.clone(),
+                    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.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.as_bytes(),
+                    args.roles
+                        .clone()
+                        .into_iter()
+                        .map(EsdtLocalRole::from)
+                        .collect(),
+                )
+                .await;
+        },
+        Some(system_sc_interact_cli::InteractCliCommand::TransferOwnership(args)) => {
+            basic_interact
+                .transfer_ownership(
+                    args.token_id.as_bytes(),
+                    &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.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.as_bytes())
+                .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_uri())
+            .await
+            .use_chain_simulator(config.use_chain_simulator());
+
+        interactor.set_current_dir_from_workspace("tools/interactor-system-func-calls");
+        let wallet_address = interactor.register_wallet(test_wallets::alice()).await;
+
+        // generate blocks until ESDTSystemSCAddress is enabled
+        interactor.generate_blocks_until_epoch(1).await.unwrap();
+
+        Self {
+            interactor,
+            wallet_address: wallet_address.into(),
+            state: State::load_state(),
+        }
+    }
+
+    async fn issue_fungible_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
+        initial_supply: RustBigUint,
+        num_decimals: usize,
+    ) {
+        println!("Issuing fungible token...");
+
+        let res = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_fungible(
+                issue_cost.into(),
+                token_display_name,
+                token_ticker,
+                initial_supply,
+                FungibleTokenProperties {
+                    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,
+                },
+            )
+            .returns(ReturnsNewTokenIdentifier)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("TOKEN ID: {:?}", res);
+    }
+
+    async fn issue_non_fungible_collection(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
+    ) {
+        println!("Issuing NFT Collection...");
+
+        let nft_collection_id = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_non_fungible(
+                issue_cost.into(),
+                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,
+                },
+            )
+            .returns(ReturnsNewTokenIdentifier)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("NFT Collection ID: {:?}", nft_collection_id);
+    }
+
+    async fn issue_semi_fungible_collection(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
+    ) {
+        println!("Issuing SFT Collection...");
+
+        let sft_collection_id = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_semi_fungible(
+                issue_cost.into(),
+                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,
+                },
+            )
+            .returns(ReturnsNewTokenIdentifier)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("SFT Collection ID: {:?}", sft_collection_id);
+    }
+
+    async fn issue_token(
+        &mut self,
+        issue_cost: RustBigUint,
+        token_display_name: &[u8],
+        token_ticker: &[u8],
+        num_decimals: usize,
+        token_type: EsdtTokenType,
+    ) {
+        println!("Registering token...");
+
+        let token_id = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .issue_and_set_all_roles(
+                issue_cost.into(),
+                token_display_name,
+                token_ticker,
+                token_type,
+                num_decimals,
+            )
+            .returns(ReturnsNewTokenIdentifier)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("TOKEN ID: {:?}", token_id);
+    }
+
+    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);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .set_special_roles(
+                ManagedAddress::from_address(wallet_address),
+                TokenIdentifier::from(token_id),
+                roles.into_iter(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn mint_sft(
+        &mut self,
+        token_id: &[u8],
+        amount: RustBigUint,
+        name: &[u8],
+        royalties: u64,
+        hash: &[u8],
+    ) {
+        println!("Minting SFT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_nft_create(
+                token_id,
+                amount,
+                name,
+                royalties,
+                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: &[u8],
+        token_ticker: &[u8],
+        num_decimals: usize,
+    ) {
+        println!("Registering meta ESDT...");
+
+        let meta_esdt = self
+            .interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .register_meta_esdt(
+                issue_cost.into(),
+                token_display_name,
+                token_ticker,
+                MetaTokenProperties {
+                    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(ReturnsNewTokenIdentifier)
+            .prepare_async()
+            .run()
+            .await;
+
+        println!("Meta-ESDT ID: {:?}", meta_esdt);
+    }
+
+    async fn change_sft_meta_esdt(&mut self, token_id: &[u8], num_decimals: usize) {
+        println!("Changing SFT to Meta-ESDT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .change_sft_to_meta_esdt(token_id, num_decimals)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn mint_token(&mut self, token_id: &[u8], nonce: u64, amount: RustBigUint) {
+        println!("Minting tokens...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_local_mint(token_id, nonce, amount)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn burn_token(&mut self, token_id: &[u8], nonce: u64, amount: RustBigUint) {
+        println!("Burning tokens...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_local_burn(token_id, nonce, amount)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn pause_token(&mut self, token_id: &[u8]) {
+        println!("Pausing token...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .pause(token_id)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unpause_token(&mut self, token_id: &[u8]) {
+        println!("Unpausing token...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unpause(token_id)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn freeze_token(&mut self, token_id: &[u8], address: &Bech32Address) {
+        println!("Freezing token...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .freeze(token_id, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unfreeze_token(&mut self, token_id: &[u8], address: &Bech32Address) {
+        println!("Unfreezing token...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unfreeze(token_id, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn freeze_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
+        println!("Freezing NFT/SFT/Meta-ESDT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .freeze_nft(token_id, nonce, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unfreeze_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
+        println!("Unfreezing NFT/SFT/Meta-ESDT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unfreeze_nft(token_id, nonce, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn wipe_token(&mut self, token_id: &[u8], address: &Bech32Address) {
+        println!("Wiping token...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .wipe(token_id, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn wipe_nft(&mut self, token_id: &[u8], nonce: u64, address: &Bech32Address) {
+        println!("Wiping NFT/SFT/Meta-ESDT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .wipe_nft(token_id, nonce, address)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn mint_nft(
+        &mut self,
+        token_id: &[u8],
+        amount: RustBigUint,
+        name: &[u8],
+        royalties: u64,
+        hash: &[u8],
+    ) {
+        println!("Minting NFT...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(&self.wallet_address)
+            .gas(100_000_000u64)
+            .typed(UserBuiltinProxy)
+            .esdt_nft_create(
+                token_id,
+                amount,
+                name,
+                royalties,
+                hash,
+                &NftDummyAttributes {
+                    creation_epoch: 2104,
+                    cool_factor: 5,
+                },
+                &ManagedVec::new(),
+            )
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn unset_roles(
+        &mut self,
+        address: &Bech32Address,
+        token_id: &[u8],
+        roles: Vec<EsdtLocalRole>,
+    ) {
+        println!("Unsetting the following roles: {:?}", roles);
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .unset_special_roles(address, token_id, roles.into_iter())
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn transfer_ownership(&mut self, token_id: &[u8], new_owner: &Bech32Address) {
+        println!("Transferring token ownership...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .transfer_ownership(token_id, new_owner)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn transfer_nft_create_role(
+        &mut self,
+        token_id: &[u8],
+        old_owner: &Bech32Address,
+        new_owner: &Bech32Address,
+    ) {
+        println!("Transferring NFT create role...");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .transfer_nft_create_role(token_id, old_owner, new_owner)
+            .prepare_async()
+            .run()
+            .await;
+    }
+
+    async fn control_changes(&mut self, token_id: &[u8]) {
+        println!("Control changes");
+
+        self.interactor
+            .tx()
+            .from(&self.wallet_address)
+            .to(ESDTSystemSCAddress)
+            .gas(100_000_000u64)
+            .typed(ESDTSystemSCProxy)
+            .control_changes(
+                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/src/system_sc_interact_cli.rs b/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
new file mode 100644
index 0000000000..6e958fbdb3
--- /dev/null
+++ b/tools/interactor-system-func-calls/src/system_sc_interact_cli.rs
@@ -0,0 +1,286 @@
+use clap::{Args, Parser, Subcommand};
+use multiversx_sc_snippets::{imports::*, multiversx_sc::proxy_imports::*};
+
+/// 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 = "issue-token", about = "Issues a token")]
+    IssueToken(IssueTokenArgs),
+    #[command(name = "mint", about = "Mints fungible tokens")]
+    Mint(MintArgs),
+    #[command(name = "set-roles", about = "Sets roles")]
+    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-nft-collection", about = "Create a NFT Collection")]
+    IssueNFTCollection(IssueNftCollectionArgs),
+    #[command(name = "create-nft", about = "Issue a NFT")]
+    CreateNFT(CreateNFTArgs),
+    #[command(
+        name = "issue-fungible",
+        about = "Issues fungible tokens and sends them to your wallet"
+    )]
+    IssueFungible(IssueFungibleArgs),
+    #[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")]
+    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),
+    #[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),
+    #[command(name = "control-changes", about = "Controls changes")]
+    ControlChanges(ControlChangesArgs),
+}
+
+#[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,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+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,
+}
+
+#[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(short = 'n', long = "nonce")]
+    pub nonce: u64,
+    #[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 IssueNftCollectionArgs {
+    #[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")]
+    pub cost: RustBigUint,
+    #[arg(short = 'd', long = "display-name")]
+    pub display_name: String,
+    #[arg(long = "token-ticker")]
+    pub ticker: String,
+}
+
+#[derive(TopEncode, 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: u64,
+    #[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(short = 'd', 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,
+}
+
+#[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>,
+}
+
+#[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,
+}
+
+#[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 {
+    #[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,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Args)]
+pub struct ControlChangesArgs {
+    #[arg(long = "token-id")]
+    pub token_id: String,
+}
diff --git a/tools/interactor-system-func-calls/src/system_sc_interact_config.rs b/tools/interactor-system-func-calls/src/system_sc_interact_config.rs
new file mode 100644
index 0000000000..c61059d57e
--- /dev/null
+++ b/tools/interactor-system-func-calls/src/system_sc_interact_config.rs
@@ -0,0 +1,42 @@
+use serde::Deserialize;
+use std::io::Read;
+
+/// Config file
+const CONFIG_FILE: &str = "config.toml";
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ChainType {
+    Real,
+    Simulator,
+}
+
+/// SysFuncCalls Interact configuration
+#[derive(Debug, Deserialize)]
+pub struct Config {
+    gateway_uri: String,
+    chain_type: ChainType,
+}
+
+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 URI
+    pub fn gateway_uri(&self) -> &str {
+        &self.gateway_uri
+    }
+
+    // Returns if chain type is chain simulator
+    pub fn use_chain_simulator(&self) -> bool {
+        match self.chain_type {
+            ChainType::Real => false,
+            ChainType::Simulator => true,
+        }
+    }
+}
diff --git a/tools/interactor-system-func-calls/src/system_sc_interact_state.rs b/tools/interactor-system-func-calls/src/system_sc_interact_state.rs
new file mode 100644
index 0000000000..459b6f0bf5
--- /dev/null
+++ b/tools/interactor-system-func-calls/src/system_sc_interact_state.rs
@@ -0,0 +1,38 @@
+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()
+        }
+    }
+}
+
+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/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml
index 95b4de29fb..8f6e0de411 100644
--- a/tools/mxpy-snippet-generator/Cargo.toml
+++ b/tools/mxpy-snippet-generator/Cargo.toml
@@ -10,11 +10,11 @@ name = "mxpy-snippet-generator"
 path = "src/mxpy_snippet_generator.rs"
 
 [dependencies.multiversx-sc]
-version = "0.51.1"
+version = "0.54.1"
 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")
     }
diff --git a/tools/plotter/Cargo.toml b/tools/plotter/Cargo.toml
index 0374e0184b..0ed820b203 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.54.1"
 path = "../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../../framework/scenario"
 default-features = false
 
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",
diff --git a/tools/rust-debugger/README.md b/tools/rust-debugger/README.md
index 0c9ea41abe..ef5646d9e9 100644
--- a/tools/rust-debugger/README.md
+++ b/tools/rust-debugger/README.md
@@ -1,3 +1,30 @@
 # Smart contract IDE debugging helper
 
 A collection of scripts that help the IDE display relevant data, especially from managed types.
+
+## LLDB Pretty-Printer Script for Smart Contracts
+
+The LLDB pretty-printer script allows you to view managed types such as `BigUint` and `ManagedBuffer` in a readable format during debugging sessions.
+
+### Prerequisites
+
+- [**Visual Studio Code**](https://code.visualstudio.com/)
+- [**CodeLLDB**](https://marketplace.visualstudio.com/items?itemName=vadimcn.vscode-lldb) (LLDB Debugger extension for Visual Studio Code)
+
+
+### Installation
+
+First, download the [**MultiversX LLDB Pretty-Printer Script**](https://github.com/multiversx/mx-sdk-rs/blob/master/tools/rust-debugger/pretty-printers/multiversx_sc_lldb_pretty_printers.py) to a known directory on your system.
+
+Then, adjust the `lldb.launch.initCommands` entry in your Visual Studio Code settings to import the pretty-printer script:
+
+
+```json
+{
+    "lldb.launch.initCommands": [
+        "command script import /path/to/pretty-printers/multiversx_sc_lldb_pretty_printers.py"
+    ]
+}
+```
+
+Once you have completed the steps above, you can start debugging your smart contract in Visual Studio Code. The pretty-printer script will automatically format managed types for you.
diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml
index 2f070058da..04e5af5c40 100644
--- a/tools/rust-debugger/format-tests/Cargo.toml
+++ b/tools/rust-debugger/format-tests/Cargo.toml
@@ -9,16 +9,16 @@ name = "format-tests"
 path = "src/format_tests.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../../../framework/base"
 
 [dependencies.multiversx-sc-scenario]
-version = "=0.51.1"
+version = "=0.54.1"
 path = "../../../framework/scenario"
 
 [dependencies.multiversx-chain-vm]
-version = "=0.9.0"
-path = "../../../vm"
+version = "=0.11.0"
+path = "../../../chain/vm"
 
 [dev-dependencies]
 glob = "0.3.0"
diff --git a/tools/rust-debugger/format-tests/src/check_debugger_values.py b/tools/rust-debugger/format-tests/src/check_debugger_values.py
index 15929e564f..75925f0f50 100644
--- a/tools/rust-debugger/format-tests/src/check_debugger_values.py
+++ b/tools/rust-debugger/format-tests/src/check_debugger_values.py
@@ -30,7 +30,8 @@ def end_of_main_breakpoint_handler(frame: SBFrame, bp_loc: SBBreakpointLocation,
     incorrect = 0
     duplicate = 0
     checked = set()
-    for item in lldb.value(to_check):
+    to_check_value = lldb.value(to_check)
+    for item in to_check_value:
         variable_name_string, value_to_check_string = item
         variable_name = get_string(variable_name_string)
         value_to_check = get_string(value_to_check_string)
diff --git a/tools/rust-debugger/format-tests/src/format_tests.rs b/tools/rust-debugger/format-tests/src/format_tests.rs
index 2c72e4acda..755bbbda17 100644
--- a/tools/rust-debugger/format-tests/src/format_tests.rs
+++ b/tools/rust-debugger/format-tests/src/format_tests.rs
@@ -181,7 +181,7 @@ fn main() {
 
     let invalid_handle = DebugHandle::from(-1000);
     let biguint_with_invalid_handle: BigUint<DebugApi> =
-        BigUint::from_handle(invalid_handle.clone());
+        unsafe { BigUint::from_handle(invalid_handle.clone()) };
     push!(
         to_check,
         biguint_with_invalid_handle,
@@ -189,7 +189,7 @@ fn main() {
     );
 
     let big_float_with_invalid_handle: BigFloat<DebugApi> =
-        BigFloat::from_handle(invalid_handle.clone());
+        unsafe { BigFloat::from_handle(invalid_handle.clone()) };
     push!(
         to_check,
         big_float_with_invalid_handle,
@@ -197,7 +197,7 @@ fn main() {
     );
 
     let managed_buffer_with_invalid_handle: ManagedBuffer<DebugApi> =
-        ManagedBuffer::from_handle(invalid_handle.clone());
+        unsafe { ManagedBuffer::from_handle(invalid_handle.clone()) };
     push!(
         to_check,
         managed_buffer_with_invalid_handle,
@@ -205,7 +205,7 @@ fn main() {
     );
 
     let token_identifier_with_invalid_handle: TokenIdentifier<DebugApi> =
-        TokenIdentifier::from_handle(invalid_handle.clone());
+        unsafe { TokenIdentifier::from_handle(invalid_handle.clone()) };
     push!(
         to_check,
         token_identifier_with_invalid_handle,
@@ -213,7 +213,7 @@ fn main() {
     );
 
     let optional_value_some_with_invalid_handle: OptionalValue<BigUint<DebugApi>> =
-        OptionalValue::Some(BigUint::from_handle(invalid_handle.clone()));
+        OptionalValue::Some(unsafe { BigUint::from_handle(invalid_handle.clone()) });
     push!(
         to_check,
         optional_value_some_with_invalid_handle,
diff --git a/tools/rust-debugger/format-tests/src/init_internal_dict.py b/tools/rust-debugger/format-tests/src/init_internal_dict.py
new file mode 100644
index 0000000000..e5f91d5e26
--- /dev/null
+++ b/tools/rust-debugger/format-tests/src/init_internal_dict.py
@@ -0,0 +1,4 @@
+import sys
+
+def __lldb_init_module(debugger, internal_dict):
+    internal_dict['adapter_settings'] = {'sourceLanguages': ['rust'], 'evaluateForHovers': True, 'commandCompletions': True, 'displayFormat': 'auto', 'showDisassembly': 'auto', 'dereferencePointers': True, 'evaluationTimeout': 5.0, 'suppressMissingSourceFiles': True, 'consoleMode': 'commands', 'scriptConfig': {}, 'reproducer': False}
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 6d61931f39..6b49caf295 100644
--- a/tools/rust-debugger/format-tests/tests/run_format_tests.rs
+++ b/tools/rust-debugger/format-tests/tests/run_format_tests.rs
@@ -6,7 +6,7 @@ fn run_format_tests() {
     let home_dir = home::home_dir().unwrap();
 
     let mut vscode_lldb_plugin_lookup = home_dir.clone();
-    vscode_lldb_plugin_lookup.push(".vscode/extensions/vadimcn.vscode-lldb-*");
+    vscode_lldb_plugin_lookup.push(".vscode/extensions/vadimcn.vscode-lldb-1.11.0*");
 
     let vscode_lldb_plugin = glob::glob(vscode_lldb_plugin_lookup.as_os_str().to_str().unwrap())
         .expect("Failed to read glob pattern")
@@ -27,9 +27,18 @@ fn run_format_tests() {
         .unwrap();
     check_path(&format_tests_path);
 
-    let mut rust_formatters = vscode_lldb_plugin.clone();
-    rust_formatters.push("formatters");
-    check_path(&rust_formatters);
+    let init_internal_dict = Path::new("./src/init_internal_dict.py")
+        .canonicalize()
+        .unwrap();
+    check_path(&init_internal_dict);
+
+    let mut codelldb = vscode_lldb_plugin.clone();
+    codelldb.push("adapter/scripts/codelldb");
+    check_path(&codelldb);
+
+    let mut lang_support = vscode_lldb_plugin.clone();
+    lang_support.push("lang_support");
+    check_path(&lang_support);
 
     let pretty_printers = Path::new("../pretty-printers/multiversx_sc_lldb_pretty_printers.py")
         .canonicalize()
@@ -44,7 +53,11 @@ fn run_format_tests() {
     let debugger_output = Command::new(lldb)
         .arg(format_tests_path)
         .arg("-o")
-        .arg(command_script_import(&rust_formatters))
+        .arg(command_script_import(&init_internal_dict))
+        .arg("-o")
+        .arg(command_script_import(&codelldb))
+        .arg("-o")
+        .arg(command_script_import(&lang_support))
         .arg("-o")
         .arg(command_script_import(&pretty_printers))
         .arg("-o")
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 1232201e28..297c4c50be 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
@@ -7,7 +7,6 @@
 import struct
 
 DEBUG_API_TYPE = "multiversx_sc_scenario::api::impl_vh::vm_hooks_api::VMHooksApi<multiversx_sc_scenario::api::impl_vh::debug_api::DebugApiBackend>"
-ANY_NUMBER = "[0-9]+"
 ANY_TYPE = ".*"
 SOME_OR_NONE = "(Some|None)"
 
@@ -18,25 +17,24 @@
 # 2. SC wasm - Managed basic types
 MOD_PATH = "multiversx_sc::types::managed::basic"
 
-BIG_INT_TYPE = f"{MOD_PATH}::big_int::BigInt<{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}>"
+BIG_INT_TYPE = f"{MOD_PATH}::big_int::BigInt<{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}>"
+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} ?>"
 
 # ManagedOption
 MANAGED_OPTION_INNER_TYPE_INDEX = 1
 MANAGED_OPTION_NONE_HANDLE = 2147483646  # i32::MAX - 1
 MANAGED_OPTION_TYPE = f"{MOD_PATH}::managed_option::ManagedOption<{DEBUG_API_TYPE}, {ANY_TYPE}>"
-
-ESDT_TOKEN_PAYMENT_TYPE = f"{MOD_PATH}::esdt_token_payment::EsdtTokenPayment<{DEBUG_API_TYPE}>"
-EGLD_OR_ESDT_TOKEN_IDENTIFIER_TYPE = f"{MOD_PATH}::egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier<{DEBUG_API_TYPE}>"
+ESDT_TOKEN_PAYMENT_TYPE = f"{MOD_PATH}::esdt_token_payment::EsdtTokenPayment<{DEBUG_API_TYPE} ?>"
+EGLD_OR_ESDT_TOKEN_IDENTIFIER_TYPE = f"{MOD_PATH}::egld_or_esdt_token_identifier::EgldOrEsdtTokenIdentifier<{DEBUG_API_TYPE} ?>"
 
 # ManagedVec
 MANAGED_VEC_INNER_TYPE_INDEX = 1
@@ -44,16 +42,16 @@
 
 # 4. SC wasm - Managed multi value types
 
-# 5. SC wasm - heap
-MOD_PATH = "multiversx_sc::types::heap"
+# 5. VM core types
+MOD_PATH = "multiversx_chain_core::types"
 
-HEAP_ADDRESS_TYPE = f"{MOD_PATH}::h256_address::Address"
+HEAP_ADDRESS_TYPE = f"{MOD_PATH}::address::Address"
 BOXED_BYTES_TYPE = f"{MOD_PATH}::boxed_bytes::BoxedBytes"
 
 # 6. MultiversX codec - Multi-types
 MOD_PATH = "multiversx_sc_codec::multi_types"
 
-OPTIONAL_VALUE_TYPE = f"{MOD_PATH}::multi_value_optional::OptionalValue<{ANY_TYPE}>::{SOME_OR_NONE}"
+OPTIONAL_VALUE_TYPE = f"{MOD_PATH}::multi_value_optional::OptionalValue<{ANY_TYPE}>"
 
 
 class InvalidHandle(Exception):
@@ -241,7 +239,7 @@ def lookup(self, full_value: lldb.value) -> lldb.value:
         return full_value
 
     def extract_value_from_raw_handle(self, context: lldb.value, raw_handle: int, map_picker: Callable) -> lldb.value:
-        managed_types = context.managed_types
+        managed_types = context[0].managed_types.data.value
         chosen_map = map_picker(managed_types)
         value = map_lookup(chosen_map, raw_handle)
         return value
@@ -288,7 +286,7 @@ def summarize_item(self, handle_bytes: List[int], context: lldb.value, type_info
 class NumBigInt(Handler):
     def summary(self, num_big_int: lldb.value) -> str:
         value_int = num_bigint_data_to_int(num_big_int.data.data)
-        if num_big_int.sign.sbvalue.GetValue() == 'num_bigint::bigint::Sign::Minus':
+        if num_big_int.sign.sbvalue.GetValue() == 'Minus':
             return str(-value_int)
         return str(value_int)
 
@@ -461,13 +459,14 @@ def summary(self, boxed_bytes: lldb.value) -> str:
 
 class OptionalValue(Handler):
     def summary(self, optional_value: lldb.value) -> str:
-        if optional_value.sbvalue.GetType().GetName().endswith('::Some'):
-            summary = optional_value.sbvalue.GetChildAtIndex(0).GetSummary()
+        base_type = optional_value.sbvalue.GetType().GetName()
+        if optional_value.value.sbvalue.GetType().GetName().startswith(f'{base_type}::Some'):
+            summary = optional_value.value.sbvalue.GetChildAtIndex(0).GetSummary()
             return f"OptionalValue::Some({summary})"
         return "OptionalValue::None"
 
 
-ELROND_WASM_TYPE_HANDLERS = [
+MULTIVERSX_WASM_TYPE_HANDLERS = [
     # 1. num_bigint library
     (NUM_BIG_INT_TYPE, NumBigInt),
     (NUM_BIG_UINT_TYPE, NumBigUint),
@@ -505,7 +504,7 @@ def get_inner_type_handler(type_info: lldb.SBType, inner_type_index: int) -> Tup
 
 
 def get_handler(type_name: str) -> Handler:
-    for rust_type, handler_class in ELROND_WASM_TYPE_HANDLERS:
+    for rust_type, handler_class in MULTIVERSX_WASM_TYPE_HANDLERS:
         if re.fullmatch(rust_type, type_name) is not None:
             return handler_class()
     raise UnknownType(type_name)
@@ -520,7 +519,7 @@ def summarize_handler(handler_type: Type[Handler], valobj: SBValue, dictionary)
 def __lldb_init_module(debugger: SBDebugger, dict):
     python_module_name = Path(__file__).with_suffix('').name
 
-    for rust_type, handler_class in ELROND_WASM_TYPE_HANDLERS:
+    for rust_type, handler_class in MULTIVERSX_WASM_TYPE_HANDLERS:
         # Add summary binding
         summary_function_name = f"handle{handler_class.__name__}"
         globals()[summary_function_name] = partial(summarize_handler, handler_class)
diff --git a/vm/src/crypto_functions.rs b/vm/src/crypto_functions.rs
deleted file mode 100644
index 9d61e9ccc9..0000000000
--- a/vm/src/crypto_functions.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use sha2::Sha256;
-use sha3::{Digest, Keccak256};
-
-pub const SHA256_RESULT_LEN: usize = 32;
-pub const KECCAK256_RESULT_LEN: usize = 32;
-
-pub fn sha256(data: &[u8]) -> [u8; SHA256_RESULT_LEN] {
-    let mut hasher = Sha256::new();
-    hasher.update(data);
-    hasher.finalize().into()
-}
-
-pub fn keccak256(data: &[u8]) -> [u8; KECCAK256_RESULT_LEN] {
-    let mut hasher = Keccak256::new();
-    hasher.update(data);
-    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;
-    }
-
-    let sig = Signature::from_bytes(signature);
-    if sig.is_err() {
-        return false;
-    }
-
-    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_execution/builtin_function_mocks/vm_builtin_function_names.rs b/vm/src/tx_execution/builtin_function_mocks/vm_builtin_function_names.rs
deleted file mode 100644
index 108ed29016..0000000000
--- a/vm/src/tx_execution/builtin_function_mocks/vm_builtin_function_names.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-pub const ESDT_LOCAL_MINT_FUNC_NAME: &str = "ESDTLocalMint";
-pub const ESDT_LOCAL_BURN_FUNC_NAME: &str = "ESDTLocalBurn";
-pub const ESDT_MULTI_TRANSFER_FUNC_NAME: &str = "MultiESDTNFTTransfer";
-pub const ESDT_NFT_TRANSFER_FUNC_NAME: &str = "ESDTNFTTransfer";
-pub const ESDT_NFT_CREATE_FUNC_NAME: &str = "ESDTNFTCreate";
-pub const ESDT_NFT_ADD_QUANTITY_FUNC_NAME: &str = "ESDTNFTAddQuantity";
-pub const ESDT_NFT_ADD_URI_FUNC_NAME: &str = "ESDTNFTAddURI";
-pub const ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME: &str = "ESDTNFTUpdateAttributes";
-pub const ESDT_NFT_BURN_FUNC_NAME: &str = "ESDTNFTBurn";
-pub const ESDT_TRANSFER_FUNC_NAME: &str = "ESDTTransfer";
-pub const CHANGE_OWNER_BUILTIN_FUNC_NAME: &str = "ChangeOwnerAddress";
-pub const CLAIM_DEVELOPER_REWARDS_FUNC_NAME: &str = "ClaimDeveloperRewards";
-pub const SET_USERNAME_FUNC_NAME: &str = "SetUserName";
-pub const MIGRATE_USERNAME_FUNC_NAME: &str = "migrateUserName";
-pub const DELETE_USERNAME_FUNC_NAME: &str = "DeleteUserName";
-pub const UPGRADE_CONTRACT_FUNC_NAME: &str = "upgradeContract";
diff --git a/vm/src/types/vm_address.rs b/vm/src/types/vm_address.rs
deleted file mode 100644
index 75786787cc..0000000000
--- a/vm/src/types/vm_address.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use super::H256;
-
-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] = &[5, 0];
-
-/// Address type being used in the VM only.
-///
-/// Its implementation is similar to that of the heap Address in the framework,
-/// but we have a separate implementation for the VM, because it is a separate component.
-#[derive(Hash, PartialEq, Eq, Clone, Debug)]
-pub struct VMAddress(H256);
-
-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 = [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 start_index = NUM_INT_CHARACTERS_FOR_ADDRESS - VM_TYPE_LEN;
-        result[start_index..(start_index + DEFAULT_VM_TYPE.len())].copy_from_slice(DEFAULT_VM_TYPE);
-
-        VMAddress::from(result)
-    }
-}
-
-impl From<H256> for VMAddress {
-    fn from(hash: H256) -> Self {
-        VMAddress(hash)
-    }
-}
-
-impl From<VMAddress> for H256 {
-    fn from(address: VMAddress) -> Self {
-        address.0
-    }
-}
-
-impl<'a> From<&'a VMAddress> for &'a H256 {
-    fn from(address: &'a VMAddress) -> Self {
-        &address.0
-    }
-}
-
-impl From<[u8; 32]> for VMAddress {
-    fn from(arr: [u8; 32]) -> Self {
-        VMAddress(H256::from(arr))
-    }
-}
-
-impl From<&[u8; 32]> for VMAddress {
-    fn from(bytes: &[u8; 32]) -> Self {
-        VMAddress(H256::from(bytes))
-    }
-}
-
-impl From<&mut [u8; 32]> for VMAddress {
-    fn from(bytes: &mut [u8; 32]) -> Self {
-        VMAddress(H256::from(bytes))
-    }
-}
-
-impl From<Box<[u8; 32]>> for VMAddress {
-    fn from(bytes: Box<[u8; 32]>) -> Self {
-        VMAddress(H256::from(bytes))
-    }
-}
-
-impl VMAddress {
-    pub fn from_slice(slice: &[u8]) -> Self {
-        VMAddress(H256::from_slice(slice))
-    }
-}
-
-impl From<VMAddress> for [u8; 32] {
-    fn from(addr: VMAddress) -> Self {
-        addr.0.into()
-    }
-}
-
-impl AsRef<[u8]> for VMAddress {
-    fn as_ref(&self) -> &[u8] {
-        self.0.as_ref()
-    }
-}
-
-impl AsMut<[u8]> for VMAddress {
-    fn as_mut(&mut self) -> &mut [u8] {
-        self.0.as_mut()
-    }
-}
-
-impl VMAddress {
-    /// Returns a new address of 32 zeros.
-    /// Allocates directly in heap.
-    /// Minimal resulting wasm code (14 bytes if not inlined).
-    pub fn zero() -> Self {
-        VMAddress(H256::zero())
-    }
-
-    /// Extracts a byte slice containing the entire fixed hash.
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_bytes()
-    }
-
-    pub fn as_array(&self) -> &[u8; 32] {
-        self.0.as_array()
-    }
-
-    pub fn to_vec(&self) -> Vec<u8> {
-        self.0.to_vec()
-    }
-
-    pub fn is_smart_contract_address(&self) -> bool {
-        self.as_bytes()
-            .iter()
-            .take(SC_ADDRESS_NUM_LEADING_ZEROS.into())
-            .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),
-            "0x00000000000000000500111111116f776e65725f5f5f5f5f5f5f5f5f5f015f5f"
-        );
-    }
-}
diff --git a/vm/src/types/vm_code_metadata.rs b/vm/src/types/vm_code_metadata.rs
deleted file mode 100644
index 5073d9ffe1..0000000000
--- a/vm/src/types/vm_code_metadata.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-#![allow(clippy::bad_bit_mask)]
-
-use bitflags::bitflags;
-
-bitflags! {
-    #[derive(Default, PartialEq, Debug, Clone, Copy)]
-    pub struct VMCodeMetadata: u16 {
-        const DEFAULT = 0;
-        const UPGRADEABLE = 0b0000_0001_0000_0000; // LSB of first byte
-        const READABLE = 0b0000_0100_0000_0000; // 3rd LSB of first byte
-        const PAYABLE = 0b0000_0000_0000_0010; // 2nd LSB of second byte
-        const PAYABLE_BY_SC = 0b0000_0000_0000_0100; // 3rd LSB of second byte
-    }
-}
-
-impl VMCodeMetadata {
-    pub fn is_upgradeable(&self) -> bool {
-        *self & VMCodeMetadata::UPGRADEABLE != VMCodeMetadata::DEFAULT
-    }
-
-    pub fn is_payable(&self) -> bool {
-        *self & VMCodeMetadata::PAYABLE != VMCodeMetadata::DEFAULT
-    }
-
-    pub fn is_payable_by_sc(&self) -> bool {
-        *self & VMCodeMetadata::PAYABLE_BY_SC != VMCodeMetadata::DEFAULT
-    }
-
-    pub fn is_readable(&self) -> bool {
-        *self & VMCodeMetadata::READABLE != VMCodeMetadata::DEFAULT
-    }
-
-    pub fn to_byte_array(&self) -> [u8; 2] {
-        self.bits().to_be_bytes()
-    }
-
-    pub fn to_vec(&self) -> Vec<u8> {
-        self.to_byte_array().to_vec()
-    }
-}
-
-impl From<[u8; 2]> for VMCodeMetadata {
-    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 {
-        VMCodeMetadata::from_bits_truncate(value)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_default() {
-        assert!(!VMCodeMetadata::DEFAULT.is_upgradeable());
-        assert!(!VMCodeMetadata::DEFAULT.is_payable());
-        assert!(!VMCodeMetadata::DEFAULT.is_readable());
-    }
-
-    #[test]
-    fn test_all() {
-        let all = VMCodeMetadata::UPGRADEABLE
-            | VMCodeMetadata::PAYABLE
-            | VMCodeMetadata::PAYABLE_BY_SC
-            | VMCodeMetadata::READABLE;
-        assert!(all.is_upgradeable());
-        assert!(all.is_payable());
-        assert!(all.is_payable_by_sc());
-        assert!(all.is_readable());
-
-        assert_eq!(all.bits(), 0x0506);
-
-        assert_eq!(VMCodeMetadata::from_bits_truncate(0xffff), all);
-    }
-
-    #[test]
-    fn test_each() {
-        assert!(VMCodeMetadata::UPGRADEABLE.is_upgradeable());
-        assert!(!VMCodeMetadata::PAYABLE.is_upgradeable());
-        assert!(!VMCodeMetadata::PAYABLE_BY_SC.is_upgradeable());
-        assert!(!VMCodeMetadata::READABLE.is_upgradeable());
-
-        assert!(!VMCodeMetadata::UPGRADEABLE.is_payable());
-        assert!(VMCodeMetadata::PAYABLE.is_payable());
-        assert!(!VMCodeMetadata::PAYABLE_BY_SC.is_payable());
-        assert!(!VMCodeMetadata::READABLE.is_payable());
-
-        assert!(!VMCodeMetadata::UPGRADEABLE.is_payable_by_sc());
-        assert!(!VMCodeMetadata::PAYABLE.is_payable_by_sc());
-        assert!(VMCodeMetadata::PAYABLE_BY_SC.is_payable_by_sc());
-        assert!(!VMCodeMetadata::READABLE.is_payable_by_sc());
-
-        assert!(!VMCodeMetadata::UPGRADEABLE.is_readable());
-        assert!(!VMCodeMetadata::PAYABLE.is_readable());
-        assert!(!VMCodeMetadata::PAYABLE_BY_SC.is_readable());
-        assert!(VMCodeMetadata::READABLE.is_readable());
-    }
-
-    /// Translated from vm-wasm.
-    #[test]
-    fn test_from_array() {
-        assert!(VMCodeMetadata::from([1, 0]).is_upgradeable());
-        assert!(!VMCodeMetadata::from([1, 0]).is_readable());
-        assert!(VMCodeMetadata::from([0, 2]).is_payable());
-        assert!(VMCodeMetadata::from([4, 0]).is_readable());
-        assert!(!VMCodeMetadata::from([4, 0]).is_upgradeable());
-        assert!(!VMCodeMetadata::from([0, 0]).is_upgradeable());
-        assert!(!VMCodeMetadata::from([0, 0]).is_payable());
-        assert!(!VMCodeMetadata::from([0, 0]).is_readable());
-    }
-}
diff --git a/vm/src/types/vm_esdt_local_role_flags.rs b/vm/src/types/vm_esdt_local_role_flags.rs
deleted file mode 100644
index 2b47879ec8..0000000000
--- a/vm/src/types/vm_esdt_local_role_flags.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-#![allow(clippy::bad_bit_mask)]
-
-use super::EsdtLocalRole;
-use bitflags::bitflags;
-
-bitflags! {
-    /// The VM implementation for EsdtLocalRoleFlags, used internally in builtin functions.
-    ///
-    /// 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;
-        const BURN                  = 0b00000010;
-        const NFT_CREATE            = 0b00000100;
-        const NFT_ADD_QUANTITY      = 0b00001000;
-        const NFT_BURN              = 0b00010000;
-        const NFT_ADD_URI           = 0b00100000;
-        const NFT_UPDATE_ATTRIBUTES = 0b01000000;
-        const TRANSFER              = 0b10000000;
-    }
-}
-
-impl EsdtLocalRoleFlags {
-    pub fn has_role(&self, role: &EsdtLocalRole) -> bool {
-        *self & role.to_flag() != EsdtLocalRoleFlags::NONE
-    }
-
-    pub fn iter_roles(&self) -> impl Iterator<Item = &EsdtLocalRole> {
-        EsdtLocalRole::iter_all().filter(move |role| self.has_role(role))
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use super::*;
-    use alloc::vec::Vec;
-
-    #[test]
-    fn test_flags_has_role() {
-        let flags = EsdtLocalRoleFlags::MINT;
-        assert!(flags.has_role(&EsdtLocalRole::Mint));
-        let flags = EsdtLocalRoleFlags::MINT | EsdtLocalRoleFlags::BURN;
-        assert!(flags.has_role(&EsdtLocalRole::Mint));
-        let flags = EsdtLocalRoleFlags::NONE;
-        assert!(!flags.has_role(&EsdtLocalRole::Mint));
-        let flags = EsdtLocalRoleFlags::BURN;
-        assert!(!flags.has_role(&EsdtLocalRole::Mint));
-    }
-
-    #[test]
-    fn test_flags_iter_role() {
-        let flags = EsdtLocalRoleFlags::MINT;
-        assert_eq!(
-            flags.iter_roles().collect::<Vec<&EsdtLocalRole>>(),
-            alloc::vec![&EsdtLocalRole::Mint],
-        );
-
-        let flags = EsdtLocalRoleFlags::MINT | EsdtLocalRoleFlags::BURN;
-        assert_eq!(
-            flags.iter_roles().collect::<Vec<&EsdtLocalRole>>(),
-            alloc::vec![&EsdtLocalRole::Mint, &EsdtLocalRole::Burn],
-        );
-
-        let flags = EsdtLocalRoleFlags::NONE;
-        assert_eq!(
-            flags.iter_roles().collect::<Vec<&EsdtLocalRole>>(),
-            Vec::<&EsdtLocalRole>::new(),
-        );
-    }
-}
diff --git a/vm/src/types/vm_h256.rs b/vm/src/types/vm_h256.rs
deleted file mode 100644
index 58e8dd7eda..0000000000
--- a/vm/src/types/vm_h256.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use core::fmt::Debug;
-
-// const ERR_BAD_H256_LENGTH: &str = "bad H256 length";
-const ZERO_32: &[u8] = &[0u8; 32];
-
-/// Type that holds 32 bytes of data.
-/// Data is kept on the heap to keep wasm size low and avoid copies.
-#[derive(Hash, PartialEq, Eq, Clone, Debug)]
-pub struct H256([u8; 32]);
-
-impl H256 {
-    pub const fn new(bytes: [u8; 32]) -> Self {
-        H256(bytes)
-    }
-}
-
-impl From<[u8; 32]> for H256 {
-    /// Constructs a hash type from the given bytes array of fixed length.
-    ///
-    /// # Note
-    ///
-    /// The given bytes are interpreted in big endian order.
-    fn from(arr: [u8; 32]) -> Self {
-        H256(arr)
-    }
-}
-
-impl<'a> From<&'a [u8; 32]> for H256 {
-    /// Constructs a hash type from the given reference
-    /// to the bytes array of fixed length.
-    ///
-    /// # Note
-    ///
-    /// The given bytes are interpreted in big endian order.
-    fn from(bytes: &'a [u8; 32]) -> Self {
-        H256(*bytes)
-    }
-}
-
-impl<'a> From<&'a mut [u8; 32]> for H256 {
-    /// Constructs a hash type from the given reference
-    /// to the mutable bytes array of fixed length.
-    ///
-    /// # Note
-    ///
-    /// The given bytes are interpreted in big endian order.
-    fn from(bytes: &'a mut [u8; 32]) -> Self {
-        H256(*bytes)
-    }
-}
-
-impl From<Box<[u8; 32]>> for H256 {
-    fn from(bytes: Box<[u8; 32]>) -> Self {
-        H256(*bytes)
-    }
-}
-
-impl H256 {
-    pub fn from_slice(slice: &[u8]) -> Self {
-        let mut arr = [0u8; 32];
-        let len = core::cmp::min(slice.len(), 32);
-        arr[..len].copy_from_slice(&slice[..len]);
-        H256(arr)
-    }
-}
-
-impl From<H256> for [u8; 32] {
-    fn from(s: H256) -> Self {
-        s.0
-    }
-}
-
-impl AsRef<[u8]> for H256 {
-    fn as_ref(&self) -> &[u8] {
-        self.as_bytes()
-    }
-}
-
-impl AsMut<[u8]> for H256 {
-    fn as_mut(&mut self) -> &mut [u8] {
-        self.0.as_mut()
-    }
-}
-
-impl H256 {
-    /// Returns a new zero-initialized fixed hash.
-    pub fn zero() -> Self {
-        H256([0u8; 32])
-    }
-
-    /// Extracts a byte slice containing the entire fixed hash.
-    pub fn as_bytes(&self) -> &[u8] {
-        self.0.as_ref()
-    }
-
-    pub fn as_array(&self) -> &[u8; 32] {
-        &self.0
-    }
-
-    pub fn to_vec(&self) -> Vec<u8> {
-        self.0[..].to_vec()
-    }
-
-    /// True if all 32 bytes of the hash are zero.
-    pub fn is_zero(&self) -> bool {
-        self.as_bytes() == ZERO_32
-    }
-}