Merge branch 'master' into sc-meta-snippets-fixes

Author: andrei-marinica

.github/workflows/actions-nightly.yml

@@ -16,7 +16,7 @@ jobs:
     name: Contracts (nightly)
     uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v3.2.0
     with:
-      rust-toolchain: nightly-2023-12-11
+      rust-toolchain: nightly-2024-05-22
       path-to-sc-meta: framework/meta
       enable-contracts-size-report: false
       mx-scenario-go-version: v2.1.0-alpha

.github/workflows/proxy-compare.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  proxy_compare:
+    name: Proxy compare - newly generated vs present in file tree
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          default: true
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Install prerequisites
+        run: |
+          cargo install --path framework/meta
+
+      - name: Run proxy compare
+        run: |
+          cd contracts
+          sc-meta all proxy --compare

contracts/benchmarks/large-storage/tests/large_storage_scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/large-storage");
     blockchain.register_contract(
         "mxsc:output/large-storage.mxsc.json",
         large_storage::ContractBuilder,

contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs

@@ -8,7 +8,6 @@ const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json";
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/linked-list-repeat");
 
     blockchain.register_contract(WASM_PATH_EXPR, linked_list_repeat::ContractBuilder);
     blockchain

contracts/benchmarks/mappers/linked-list-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/linked-list-repeat");
 
     blockchain.register_contract(
         "mxsc:output/linked-list-repeat.mxsc.json",

contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/map-repeat");
 
     blockchain.register_contract(
         "mxsc:output/map-repeat.mxsc.json",

contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/queue-repeat");
 
     blockchain.register_contract(
         "mxsc:output/queue-repeat.mxsc.json",

contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/set-repeat");
 
     blockchain.register_contract(
         "mxsc:output/set-repeat.mxsc.json",

contracts/benchmarks/mappers/single-value-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/single-value-repeat");
 
     blockchain.register_contract(
         "mxsc:output/single-value-repeat.mxsc.json",

contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs

@@ -2,7 +2,6 @@ use multiversx_sc_scenario::*;
 
 fn world() -> ScenarioWorld {
     let mut blockchain = ScenarioWorld::new();
-    blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/vec-repeat");
 
     blockchain.register_contract(
         "mxsc:output/vec-repeat.mxsc.json",