Merge pull request #76 from ElrondNetwork/multisig-fix-7

Multisig - clean up storage before performing async_call

Author: andrei-marinica

contracts/examples/multisig/mandos/deployAdder_then_call.scen.json

@@ -259,6 +259,48 @@
                 "refund": "*"
             }
         },
+        {
+            "step": "scCall",
+            "comment": "check that account data got cleaned up",
+            "txId": "check-cleanup-1",
+            "tx": {
+                "from": "address:paul",
+                "to": "address:multisig",
+                "value": "0",
+                "function": "getActionData",
+                "arguments": ["4"],
+                "gasLimit": "1,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [ "" ],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
+        },
+        {
+            "step": "scCall",
+            "comment": "check that account data got cleaned up",
+            "txId": "check-cleanup-2",
+            "tx": {
+                "from": "address:paul",
+                "to": "address:multisig",
+                "value": "0",
+                "function": "getActionSigners",
+                "arguments": ["4"],
+                "gasLimit": "1,000,000",
+                "gasPrice": "0"
+            },
+            "expect": {
+                "out": [ "" ],
+                "status": "",
+                "logs": [],
+                "gas": "*",
+                "refund": "*"
+            }
+        },
         {
             "step": "checkState",
             "accounts": {

contracts/examples/multisig/src/lib.rs

@@ -350,6 +350,14 @@ pub trait Multisig {
 
 	fn perform_action(&self, action_id: usize) -> SCResult<MultiResultVec<BoxedBytes>> {
 		let action = self.get_action_data(action_id);
+
+		// clean up storage
+		// happens before actual execution, because the async_call kills contract execution,
+		// so cleanup cannot happen afterwards
+		self.set_action_data(action_id, &Action::Nothing);
+		self.set_action_signer_ids(action_id, &[][..]);
+		self.set_pending_action_count(self.get_pending_action_count() - 1);
+
 		let mut result = Vec::<BoxedBytes>::new();
 		match action {
 			Action::Nothing => {},
@@ -411,10 +419,6 @@ pub trait Multisig {
 			},
 		}
 
-		// clean up storage
-		self.set_action_data(action_id, &Action::Nothing);
-		self.set_action_signer_ids(action_id, &[][..]);
-		self.set_pending_action_count(self.get_pending_action_count() - 1);
 		Ok(result.into())
 	}
 }