Merge pull request #76 from argentlabs/fix/version

move version check
argentlabs · Nov 19, 2022 · 597e6b2 · 597e6b2
2 parents c6d3ee5 + 2436a5d
commit 597e6b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/contracts/account/ArgentAccount.cairo b/contracts/account/ArgentAccount.cairo
@@ -65,9 +65,6 @@ func __validate__{
     // get the tx info
     let (tx_info) = get_tx_info();
 
-    // block transaction with version != 1 or QUERY
-    assert_correct_tx_version(tx_info.version);
-
     if (call_array_len == 1) {
         if (call_array[0].to == tx_info.account_contract_address) {
             // a * b == 0 --> a == 0 OR b == 0
@@ -120,6 +117,11 @@ func __execute__{
     retdata_size: felt, retdata: felt*
 ) {
     alloc_locals;
+
+    let (tx_info) = get_tx_info();
+
+    // block transaction with version != 1 or QUERY
+    assert_correct_tx_version(tx_info.version);
 
     // no reentrant call to prevent signature reutilization
     assert_non_reentrant();
@@ -128,7 +130,6 @@ func __execute__{
     let (retdata_len, retdata) = execute_call_array(call_array_len, call_array, calldata_len, calldata);
 
     // emit event
-    let (tx_info) = get_tx_info();
     transaction_executed.emit(
         hash=tx_info.transaction_hash, response_len=retdata_len, response=retdata
     );

diff --git a/contracts/account/ArgentPluginAccount.cairo b/contracts/account/ArgentPluginAccount.cairo
@@ -79,9 +79,6 @@ func __validate__{
     // get the tx info
     let (tx_info) = get_tx_info();
 
-    // block transaction with version != 1 or QUERY
-    assert_correct_tx_version(tx_info.version);
-
     if (call_array_len == 1) {
         if (call_array[0].to == tx_info.account_contract_address) {
             // a * b == 0 --> a == 0 OR b == 0
@@ -139,13 +136,17 @@ func __execute__{
 ) {
     alloc_locals;
 
+    let (tx_info) = get_tx_info();
+
+    // block transaction with version != 1 or QUERY
+    assert_correct_tx_version(tx_info.version);
+
     // no reentrant call to prevent signature reutilization
     assert_non_reentrant();
 
     let (retdata_len, retdata) = execute_call_array_plugin(call_array_len, call_array, calldata_len, calldata);
 
     // emit event
-    let (tx_info) = get_tx_info();
     transaction_executed.emit(
         hash=tx_info.transaction_hash, response_len=retdata_len, response=retdata
     );