Merge pull request #2027 from multiversx/rc/0.57.1

Release candidate: 0.57.1

Author: andrei-marinica

contracts/examples/adder/interactor/set_state.json

@@ -1,87 +1,96 @@
 [
   {
     "address": "erd1uv40ahysflse896x4ktnh6ecx43u7cmy9wnxnvcyp7deg299a4sq6vaywa",
-    "nonce": 6221,
-    "balance": "37980784869999986",
+    "nonce": 6608,
+    "balance": "3017433794349999985",
     "pairs": {
-      "454c524f4e44657364745453542d343265356138": "1209004563918244f40000",
-      "454c524f4e44657364745453542d393836646663": "12020064",
-      "454c524f4e4465736474544553542d61366131663601": "080512020001223a080112056d794e46541a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60201e32003a090000000000000002032a0510e2f09003",
-      "454c524f4e44657364745453542d306632306637": "12020064",
-      "454c524f4e44657364745453542d656338383735": "12020064",
-      "454c524f4e4465736474544553542d65373261666101": "080512020001223a080112056d794e46541a200139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1201e32003a09000000000000000203",
+      "454c524f4e44657364745453542d623136363735": "1209004563918244f40000",
       "454c524f4e44657364745453542d303362373664": "12020064",
-      "454c524f4e44726f6c6565736474544553542d396262623231": "0a1545534454526f6c654d6f6469667943726561746f72",
-      "454c524f4e4465736474544553542d39626262323101": "080512020001223a080112056d794e46541a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60201e32003a090000000000000002032a0510f9f5ae03",
-      "454c524f4e44657364745453542d336339363762": "12020064",
-      "454c524f4e44657364745453542d343562383235": "12020064",
-      "454c524f4e44657364745453542d363437383930": "1209004563918244f40000",
-      "454c524f4e4465736474424358535542542d33393264366172": "080112020001",
-      "454c524f4e44726f6c656573647450544d2d353336666162": "0a1145534454526f6c654e46544372656174650a0f45534454526f6c654e46544275726e",
-      "454c524f4e44657364744c5453542d346638343965": "1209000de0b6b3a763fc19",
-      "454c524f4e44657364745453542d353966316165": "1209004563918244f40000",
+      "454c524f4e44657364745453542d346230653865": "1209004563918244f40000",
       "454c524f4e44657364745453542d343138613232": "1209004563918244f40000",
-      "454c524f4e44657364745453542d363434633935": "12020064",
-      "454c524f4e44657364745453542d633636666535": "1209004563918244f40000",
-      "454c524f4e44657364745453542d643862306438": "12020064",
-      "454c524f4e44657364745453542d333639646531": "1209004563918244f40000",
-      "454c524f4e44657364744c5453542d376266336431": "1209000de0b6b3a763fc19",
-      "454c524f4e44657364745453542d643964336136": "1209004563918244f40000",
-      "454c524f4e44657364745453542d393864633566": "1209004563918244f40000",
-      "454c524f4e4465736474475245454e2d306531363163": "120b00152d02c7e14af67fffdc",
-      "454c524f4e44657364745453542d353538616434": "12020064",
-      "454c524f4e44657364745453542d623136363735": "1209004563918244f40000",
-      "454c524f4e446573647450544d2d35333666616201": "08021202000122ef0108011212546573742d5061696e742d486172766573741a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed6020c4132a2e516d57564239575362674b52655a64615a434344766b454b70705a6b4d696d397563736e7857565041414c6a4374324368747470733a2f2f697066732e696f2f697066732f516d57564239575362674b52655a64615a434344766b454b70705a6b4d696d397563736e7857565041414c6a43743a3d746167733a3b6d657461646174613a516d52635039346b5872357a5a6a52477669376d4a36756e374c7078556859565234523452706963787a67596b74",
-      "454c524f4e44657364745453542d303637373232": "1209004563918244f40000",
+      "454c524f4e44657364745453542d333331386638": "1209004563918244f40000",
+      "454c524f4e4465736474544553542d326130616532": "12020064",
       "454c524f4e44657364745453542d396230323030": "1209004563918244f40000",
-      "454c524f4e44657364745453542d623830663863": "1209004563918244f40000",
       "454c524f4e446573647455544b2d313464353764": "120b0001e6ce88d5ebbfd00000",
+      "454c524f4e4465736474544553542d65373261666101": "080512020001223a080112056d794e46541a200139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1201e32003a09000000000000000203",
+      "454c524f4e44657364745453542d643862306438": "12020064",
+      "454c524f4e44657364745453542d336339363762": "12020064",
+      "454c524f4e44657364745453542d643964336136": "1209004563918244f40000",
+      "454c524f4e44657364745453542d393836646663": "12020064",
       "454c524f4e44657364745453542d363835303064": "1209004563918244f40000",
-      "454c524f4e44657364745453542d373639313337": "1209004563918244f40000",
-      "454c524f4e44657364745453542d613562663131": "12020064",
-      "454c524f4e44657364745453542d386564363538": "1209004563918244f40000",
-      "454c524f4e44657364745453542d333331386638": "1209004563918244f40000",
+      "454c524f4e44726f6c6565736474544553542d396262623231": "0a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44726f6c656573647450544d2d353336666162": "0a1145534454526f6c654e46544372656174650a0f45534454526f6c654e46544275726e",
       "454c524f4e44657364745745474c442d613238633539": "120900389351ce08f09e12",
-      "454c524f4e4465736474544553542d393236313861": "1202005a",
-      "454c524f4e44657364745453542d346634303238": "12020064",
-      "454c524f4e44726f6c6565736474544553542d613661316636": "0a1545534454526f6c654d6f6469667943726561746f72",
-      "454c524f4e44657364745453542d346230653865": "1209004563918244f40000",
+      "454c524f4e4465736474475245454e2d306531363163": "120b00152d02c7e14af67ffe38",
+      "454c524f4e44657364745453542d656338383735": "12020064",
+      "454c524f4e44657364745453542d393864633566": "1209004563918244f40000",
       "454c524f4e44657364745453542d623130616461": "1209004563918244f40000",
-      "454c524f4e4465736474544553542d326130616532": "12020064",
-      "454c524f4e446e6f6e636550544d2d353336666162": "01",
+      "454c524f4e44726f6c6565736474544553542d653864643263": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d633933336139": "1209004563918244f40000",
+      "454c524f4e44657364745453542d343562383235": "12020064",
+      "454c524f4e4465736474544553542d61366131663601": "080512020001223a080112056d794e46541a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60201e32003a090000000000000002032a0510e2f09003",
+      "454c524f4e4465736474544553542d39626262323101": "080512020001223a080112056d794e46541a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60201e32003a090000000000000002032a0510f9f5ae03",
+      "454c524f4e44657364744c5453542d376266336431": "1209000de0b6b3a763fc19",
+      "454c524f4e4465736474544553542d393236313861": "1202005a",
       "454c524f4e44657364745453542d323833633361": "12020064",
+      "454c524f4e44726f6c6565736474544553542d306262343562": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d623830663863": "1209004563918244f40000",
+      "454c524f4e44657364745453542d343265356138": "1209004563918244f40000",
+      "454c524f4e44657364745453542d363437383930": "1209004563918244f40000",
+      "454c524f4e44657364745453542d333639646531": "1209004563918244f40000",
+      "454c524f4e44657364745453542d386564363538": "1209004563918244f40000",
+      "454c524f4e44726f6c6565736474544553542d313432353663": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44726f6c6565736474544553542d373733313365": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d353538616434": "12020064",
       "454c524f4e44657364745453542d633565303835": "1209004563918244f40000",
-      "454c524f4e44657364745453542d633933336139": "1209004563918244f40000"
+      "454c524f4e446e6f6e636550544d2d353336666162": "01",
+      "454c524f4e4465736474494e5445524e532d656161643135": "120b00152d02c7e14af67ffc16",
+      "454c524f4e4465736474424358535542542d33393264366172": "080112020001",
+      "454c524f4e44726f6c6565736474544553542d353265376364": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d306632306637": "12020064",
+      "454c524f4e44657364744c5453542d346638343965": "1209000de0b6b3a763f2b9",
+      "454c524f4e44657364745453542d373639313337": "1209004563918244f40000",
+      "454c524f4e446573647450544d2d35333666616201": "08021202000122ef0108011212546573742d5061696e742d486172766573741a20e32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed6020c4132a2e516d57564239575362674b52655a64615a434344766b454b70705a6b4d696d397563736e7857565041414c6a4374324368747470733a2f2f697066732e696f2f697066732f516d57564239575362674b52655a64615a434344766b454b70705a6b4d696d397563736e7857565041414c6a43743a3d746167733a3b6d657461646174613a516d52635039346b5872357a5a6a52477669376d4a36756e374c7078556859565234523452706963787a67596b74",
+      "454c524f4e44657364745453542d363434633935": "12020064",
+      "454c524f4e44726f6c6565736474544553542d643264333539": "0a1145534454526f6c654e46544372656174650a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d633636666535": "1209004563918244f40000",
+      "454c524f4e44726f6c6565736474544553542d613661316636": "0a1545534454526f6c654d6f6469667943726561746f72",
+      "454c524f4e44657364745453542d353966316165": "1209004563918244f40000",
+      "454c524f4e44657364745453542d346634303238": "12020064",
+      "454c524f4e44657364745453542d613562663131": "12020064",
+      "454c524f4e44657364745453542d303637373232": "1209004563918244f40000"
     },
     "code": "",
     "code_hash": "",
-    "root_hash": "bm7koGXVtATCN5jJdsU2nmEx9MQGQ3Szb9Gq/Yb7Di0=",
+    "root_hash": "sRJ9NofX80V7elbUblyFUeMUuAGRXKZrjMXjZgd6G+I=",
     "code_metadata": "",
     "owner_address": "",
     "developer_reward": "0"
   },
   {
     "address": "erd13x29rvmp4qlgn4emgztd8jgvyzdj0p6vn37tqxas3v9mfhq4dy7shalqrx",
-    "nonce": 1550,
-    "balance": "4950745448587014056",
+    "nonce": 1763,
+    "balance": "1971212795616943856",
     "pairs": {
-      "454c524f4e446573647445564e544e4f544946592d393634383835": "120b00152d02c7e14af6800000",
-      "454c524f4e44657364744e4943552d393730323932": "120b00d3c21bcecceda1000000",
-      "454c524f4e4465736474424358535542542d3339326436616e": "080112020001",
-      "454c524f4e4465736474494e5445524e532d63393332356601": "0801120b0013097d1fb962e12fff47",
-      "454c524f4e446573647442534b2d343736343730": "120b00021e19e0c9bab23fff7b",
-      "454c524f4e44657364744e455453432d623635306261": "120b00d137965aa7a731800000",
-      "454c524f4e446e6f6e6365494e5445524e532d633933323566": "01",
-      "454c524f4e44726f6c6565736474494e5445524e532d633933323566": "0a1145534454526f6c654e46544372656174650a1645534454526f6c654e46544164645175616e74697479",
-      "454c524f4e44657364744e45543253432d306438663962": "120f0004ee2d6d3f3d6bcc25c64dc00000",
       "454c524f4e4465736474424358535542542d3339326436616c": "080112020001",
+      "454c524f4e446573647442534b2d343736343730": "120b00021d045283b19e6fff71",
+      "454c524f4e4465736474524457474c442d306631643033": "1209003782dace9d8ffc18",
+      "454c524f4e44657364744e45543253432d306438663962": "120f0004ee2d6d3d706b1705e4dd74d800",
+      "454c524f4e44726f6c6565736474494e5445524e532d633933323566": "0a1145534454526f6c654e46544372656174650a1645534454526f6c654e46544164645175616e74697479",
+      "454c524f4e44657364744e455453432d623635306261": "120b00d137965aa7a731800000",
+      "454c524f4e4465736474524457474c442d663939383964": "120a0001158e460913cffc18",
+      "454c524f4e4465736474424358535542542d3339326436616e": "080112020001",
+      "454c524f4e44657364744e4943552d393730323932": "120b00d3c1e44bf21f03700000",
       "454c524f4e44657364745745474c442d613238633539": "120800010593b233281b",
       "454c524f4e446e6f6e63654d4554414e46542d643062623339": "01",
+      "454c524f4e4465736474494e5445524e532d63393332356601": "0801120b0013097d1fb962e12fff47",
+      "454c524f4e446573647445564e544e4f544946592d393634383835": "120b00152d02c7e14af6800000",
+      "454c524f4e446e6f6e6365494e5445524e532d633933323566": "01",
       "454c524f4e44726f6c65657364744d4554414e46542d643062623339": "0a1145534454526f6c654e4654437265617465"
     },
     "code": "",
     "code_hash": "",
-    "root_hash": "AJ2jyOcPXgZAl0kHAlbWZIlG3F1VDtcoLAHR6eqehBA=",
+    "root_hash": "abTYqASy/pomqBIye9mmEbmMHWTPnKRd9aM01bs5xHQ=",
     "code_metadata": "",
     "owner_address": "",
     "developer_reward": "0"

contracts/examples/adder/interactor/tests/basic_interactor_cs_test.rs

@@ -121,3 +121,88 @@ async fn set_state_from_file_cs_test() {
 
     println!("mike's storage keys in chain simulator {:#?}", storage);
 }
+
+#[tokio::test]
+#[serial]
+#[cfg_attr(not(feature = "chain-simulator-tests"), ignore)]
+async fn set_state_overwrite_cs_test() {
+    let account_address = test_wallets::mike();
+    let account_address_2 = test_wallets::ivan();
+
+    let mut real_chain_interact = AdderInteract::new(Config::load_config()).await;
+    let simulator_interact = AdderInteract::new(Config::chain_simulator_config()).await;
+
+    // now we should have current mike and ivan accounts in the set state file
+    real_chain_interact
+        .interactor
+        .retrieve_account(&Bech32Address::from(&account_address.to_address()))
+        .await;
+
+    real_chain_interact
+        .interactor
+        .retrieve_account(&Bech32Address::from(&account_address_2.to_address()))
+        .await;
+
+    let set_state_response = simulator_interact
+        .interactor
+        .set_state_for_saved_accounts()
+        .await;
+
+    simulator_interact
+        .interactor
+        .generate_blocks(2u64)
+        .await
+        .unwrap();
+
+    assert!(set_state_response.is_ok());
+
+    let storage = simulator_interact
+        .interactor
+        .get_account_storage(&account_address.to_address())
+        .await;
+
+    assert!(storage.len() > 1);
+
+    println!("mike's storage keys in chain simulator {:#?}", storage);
+
+    // overwrite accounts with empty
+    let account_1 = SetStateAccount::from_address(
+        Bech32Address::from(&account_address.to_address()).to_bech32_string(),
+    );
+    let account_2 = SetStateAccount::from_address(
+        Bech32Address::from(&account_address_2.to_address()).to_bech32_string(),
+    );
+
+    let overwrite_vec = vec![account_1, account_2];
+
+    simulator_interact
+        .interactor
+        .set_state_overwrite(overwrite_vec)
+        .await
+        .unwrap();
+
+    simulator_interact
+        .interactor
+        .generate_blocks(2u64)
+        .await
+        .unwrap();
+
+    // verify keys
+    let storage_1 = simulator_interact
+        .interactor
+        .get_account_storage(&account_address.to_address())
+        .await;
+
+    assert!(storage_1.is_empty());
+
+    println!("mike's storage keys in chain simulator {:#?}", storage_1);
+
+    let storage_2 = simulator_interact
+        .interactor
+        .get_account_storage(&account_address.to_address())
+        .await;
+
+    assert!(storage_2.is_empty());
+
+    println!("ivan's storage keys in chain simulator {:#?}", storage_2);
+}

contracts/feature-tests/scenario-tester/scenarios/st-partial-key-check.scen.json

@@ -0,0 +1,76 @@
+{
+    "steps": [
+        {
+            "step": "setState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "1"
+                }
+            }
+        },
+        {
+            "step": "setState",
+            "newAddresses": [
+                {
+                    "creatorAddress": "address:owner",
+                    "creatorNonce": "1",
+                    "newAddress": "sc:scenario-tester"
+                }
+            ]
+        },
+        {
+            "step": "scDeploy",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "contractCode": "mxsc:../output/scenario-tester.mxsc.json",
+                "arguments": [
+                    "0x01"
+                ],
+                "gasLimit": "5,000,000"
+            },
+            "expect": {
+                "out": [
+                    "0x696e69742d726573756c74"
+                ],
+                "status": "0"
+            }
+        },
+        {
+            "step": "scCall",
+            "id": "",
+            "tx": {
+                "from": "address:owner",
+                "to": "sc:scenario-tester",
+                "function": "set_other_mapper",
+                "arguments": [
+                    "0x536f6d6556616c7565496e53746f72616765"
+                ],
+                "gasLimit": "5,000,000"
+            },
+            "expect": {
+                "out": [],
+                "status": "0"
+            }
+        },
+        {
+            "step": "checkState",
+            "accounts": {
+                "address:owner": {
+                    "nonce": "*",
+                    "balance": "0",
+                    "storage": {},
+                    "code": ""
+                },
+                "sc:scenario-tester": {
+                    "storage": {
+                        "str:otherMapper": "str:SomeValueInStorage",
+                        "+": ""
+                    },
+                    "code": "*",
+                    "owner": "address:owner"
+                }
+            }
+        }
+    ]
+}

contracts/feature-tests/scenario-tester/src/lib.rs

@@ -12,6 +12,10 @@ pub trait ScenarioTester {
     #[storage_mapper("sum")]
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
+    #[view(getOtherMapper)]
+    #[storage_mapper("otherMapper")]
+    fn other_mapper(&self) -> SingleValueMapper<ManagedBuffer>;
+
     /// Return value for testing reasons.
     #[init]
     fn init(&self, initial_value: BigUint) -> &'static str {
@@ -30,6 +34,12 @@ pub trait ScenarioTester {
         self.sum().update(|sum| *sum += value);
     }
 
+    /// Sets a value at another key
+    #[endpoint]
+    fn set_other_mapper(&self, value: ManagedBuffer) {
+        self.other_mapper().set(value);
+    }
+
     /// Tests "from" conversion for MultiValueN parameters
     #[endpoint]
     fn multi_param(&self, _value: MultiValue2<BigUint, BigUint>) {}

contracts/feature-tests/scenario-tester/src/scenario_tester_proxy.rs

@@ -99,6 +99,15 @@ where
             .original_result()
     }
 
+    pub fn other_mapper(
+        self,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ManagedBuffer<Env::Api>> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("getOtherMapper")
+            .original_result()
+    }
+
     /// Add desired amount to the storage variable. 
     pub fn add<
         Arg0: ProxyArg<BigUint<Env::Api>>,
@@ -113,6 +122,20 @@ where
             .original_result()
     }
 
+    /// Sets a value at another key 
+    pub fn set_other_mapper<
+        Arg0: ProxyArg<ManagedBuffer<Env::Api>>,
+    >(
+        self,
+        value: Arg0,
+    ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
+        self.wrapped_tx
+            .payment(NotPayable)
+            .raw_call("set_other_mapper")
+            .argument(&value)
+            .original_result()
+    }
+
     /// Tests "from" conversion for MultiValueN parameters 
     pub fn multi_param<
         Arg0: ProxyArg<MultiValue2<BigUint<Env::Api>, BigUint<Env::Api>>>,