Merge pull request #1082 from multiversx/rc/v0.42

Release candidate v0.42

Cargo.toml

@@ -48,6 +48,7 @@ members = [
 
   "contracts/examples/adder",
   "contracts/examples/adder/meta",
+  "contracts/examples/adder/interact",
   "contracts/examples/esdt-transfer-with-fee",
   "contracts/examples/esdt-transfer-with-fee/meta",
   "contracts/examples/bonding-curve-contract",
@@ -78,7 +79,7 @@ members = [
   "contracts/examples/lottery-esdt/meta",
   "contracts/examples/multisig",
   "contracts/examples/multisig/meta",
-  "contracts/examples/multisig/interact-rs",
+  "contracts/examples/multisig/interact",
   "contracts/examples/nft-minter",
   "contracts/examples/nft-minter/meta",
   "contracts/examples/nft-storage-prepay",
@@ -104,9 +105,11 @@ members = [
   "contracts/feature-tests/alloc-features/meta",
   "contracts/feature-tests/basic-features",
   "contracts/feature-tests/basic-features/meta",
+  "contracts/feature-tests/basic-features/interact",
   "contracts/feature-tests/big-float-features",
   "contracts/feature-tests/big-float-features/meta",
   "contracts/feature-tests/composability",
+  "contracts/feature-tests/composability/interact",
   "contracts/feature-tests/composability/esdt-contract-pair",
   "contracts/feature-tests/composability/esdt-contract-pair/first-contract",
   "contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta",
@@ -118,6 +121,8 @@ members = [
   "contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta",
   "contracts/feature-tests/composability/forwarder",
   "contracts/feature-tests/composability/forwarder/meta",
+  "contracts/feature-tests/composability/forwarder-queue",
+  "contracts/feature-tests/composability/forwarder-queue/meta",
   "contracts/feature-tests/composability/forwarder-raw",
   "contracts/feature-tests/composability/forwarder-raw/meta",
   "contracts/feature-tests/composability/local-esdt-and-nft",
@@ -152,8 +157,8 @@ members = [
   "contracts/feature-tests/esdt-system-sc-mock/meta",
   "contracts/feature-tests/formatted-message-features",
   "contracts/feature-tests/formatted-message-features/meta",
-  "contracts/feature-tests/legacy-examples/crypto-bubbles-legacy",
-  "contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/meta",
+  "contracts/feature-tests/managed-map-features",
+  "contracts/feature-tests/managed-map-features/meta",
   "contracts/feature-tests/multi-contract-features",
   "contracts/feature-tests/multi-contract-features/meta",
   "contracts/feature-tests/panic-message-features",
@@ -167,4 +172,3 @@ members = [
   "contracts/feature-tests/use-module",
   "contracts/feature-tests/use-module/meta",
 ]
-

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

@@ -0,0 +1,10 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
+#[test]
+fn large_storage_go() {
+    world().run("scenarios/large_storage.scen.json");
+}

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

@@ -12,5 +12,5 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn large_storage_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/large_storage.scen.json", world());
+    world().run("scenarios/large_storage.scen.json");
 }

contracts/benchmarks/large-storage/wasm/src/lib.rs

@@ -18,9 +18,10 @@ multiversx_sc_wasm_adapter::panic_handler!();
 multiversx_sc_wasm_adapter::endpoints! {
     large_storage
     (
-        saveStructure
-        savedStructure
+        init => init
+        saveStructure => save_structure
+        savedStructure => structure
     )
 }
 
-multiversx_sc_wasm_adapter::empty_callback! {}
+multiversx_sc_wasm_adapter::async_callback_empty! {}

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

@@ -1,9 +1,15 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
 #[test]
 fn linked_list_repeat_go() {
-    multiversx_sc_scenario::run_go("scenarios/linked_list_repeat.scen.json");
+    world().run("scenarios/linked_list_repeat.scen.json");
 }
 
 #[test]
 fn linked_list_repeat_struct_go() {
-    multiversx_sc_scenario::run_go("scenarios/linked_list_repeat_struct.scen.json");
+    world().run("scenarios/linked_list_repeat_struct.scen.json");
 }

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

@@ -13,10 +13,10 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn linked_list_repeat_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/linked_list_repeat.scen.json", world());
+    world().run("scenarios/linked_list_repeat.scen.json");
 }
 
 #[test]
 fn linked_list_repeat_struct_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/linked_list_repeat_struct.scen.json", world());
+    world().run("scenarios/linked_list_repeat_struct.scen.json");
 }

contracts/benchmarks/mappers/linked-list-repeat/wasm/src/lib.rs

@@ -18,15 +18,16 @@ multiversx_sc_wasm_adapter::panic_handler!();
 multiversx_sc_wasm_adapter::endpoints! {
     linked_list_repeat
     (
-        add
-        count
-        remove
-        bench
-        add_struct
-        count_struct
-        remove_struct
-        bench_struct
+        init => init
+        add => add
+        count => count
+        remove => remove
+        bench => bench
+        add_struct => add_struct
+        count_struct => count_struct
+        remove_struct => remove_struct
+        bench_struct => bench_struct
     )
 }
 
-multiversx_sc_wasm_adapter::empty_callback! {}
+multiversx_sc_wasm_adapter::async_callback_empty! {}

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

@@ -1,9 +1,15 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
 #[test]
 fn map_repeat_go() {
-    multiversx_sc_scenario::run_go("scenarios/map_repeat.scen.json");
+    world().run("scenarios/map_repeat.scen.json");
 }
 
 #[test]
 fn map_repeat_struct_go() {
-    multiversx_sc_scenario::run_go("scenarios/map_repeat_struct.scen.json");
+    world().run("scenarios/map_repeat_struct.scen.json");
 }

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

@@ -10,10 +10,10 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn map_repeat_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/map_repeat.scen.json", world());
+    world().run("scenarios/map_repeat.scen.json");
 }
 
 #[test]
 fn map_repeat_struct_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/map_repeat_struct.scen.json", world());
+    world().run("scenarios/map_repeat_struct.scen.json");
 }

contracts/benchmarks/mappers/map-repeat/wasm/src/lib.rs

@@ -18,13 +18,14 @@ multiversx_sc_wasm_adapter::panic_handler!();
 multiversx_sc_wasm_adapter::endpoints! {
     map_repeat
     (
-        add
-        count
-        remove
-        add_struct
-        count_struct
-        remove_struct
+        init => init
+        add => add
+        count => count
+        remove => remove
+        add_struct => add_struct
+        count_struct => count_struct
+        remove_struct => remove_struct
     )
 }
 
-multiversx_sc_wasm_adapter::empty_callback! {}
+multiversx_sc_wasm_adapter::async_callback_empty! {}

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

@@ -1,9 +1,15 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
 #[test]
 fn queue_repeat_go() {
-    multiversx_sc_scenario::run_go("scenarios/queue_repeat.scen.json");
+    world().run("scenarios/queue_repeat.scen.json");
 }
 
 #[test]
 fn queue_repeat_struct_go() {
-    multiversx_sc_scenario::run_go("scenarios/queue_repeat_struct.scen.json");
+    world().run("scenarios/queue_repeat_struct.scen.json");
 }

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

@@ -13,10 +13,10 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn queue_repeat_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/queue_repeat.scen.json", world());
+    world().run("scenarios/queue_repeat.scen.json");
 }
 
 #[test]
 fn queue_repeat_struct_rs() {
-    multiversx_sc_scenario::run_rs("scenarios/queue_repeat_struct.scen.json", world());
+    world().run("scenarios/queue_repeat_struct.scen.json");
 }