fix: bad execution validity window check causing erroneous errors

Author: kylebeee

assets/arc-0058/projects/arc-0058/smart_contracts/abstracted_account/contract.algo.ts

@@ -203,14 +203,10 @@ export class AbstractedAccount extends Contract {
 
     const { useRounds, useExecutionKey } = this.plugins(key).value
 
-    const epochRef = useRounds
-      ? Global.round
-      : Global.latestTimestamp;
-
     if (useExecutionKey && !(Txn.sender === this.admin.value)) {
       assert(this.executions(Txn.lease).exists, ERR_EXECUTION_KEY_NOT_FOUND);
-      assert(this.executions(Txn.lease).value.firstValid <= epochRef, ERR_EXECUTION_NOT_READY);
-      assert(epochRef < this.executions(Txn.lease).value.lastValid, ERR_EXECUTION_EXPIRED);
+      assert(this.executions(Txn.lease).value.firstValid <= Global.round, ERR_EXECUTION_NOT_READY);
+      assert(this.executions(Txn.lease).value.lastValid >= Global.round, ERR_EXECUTION_EXPIRED);
 
       const groups = this.executions(Txn.lease).value.groups as Readonly<bytes<32>[]>;
 
@@ -231,6 +227,10 @@ export class AbstractedAccount extends Contract {
     assert(!initialCheck.expired, ERR_PLUGIN_EXPIRED);
     assert(!initialCheck.onCooldown, ERR_PLUGIN_ON_COOLDOWN);
 
+    const epochRef = useRounds
+      ? Global.round
+      : Global.latestTimestamp;
+
     let rekeysBack = false;
     let methodIndex: uint64 = 0;
 

assets/arc-0058/projects/arc-0058/smart_contracts/artifacts/abstracted_account/AbstractedAccount.approval.puya.map

@@ -5701,7 +5701,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     intc_0 // 0
     dupn 10
     bytec_1 // ""
-    dupn 19
+    dupn 18
     // smart_contracts/abstracted_account/contract.algo.ts:575
     // const caller = global ? Global.zeroAddress : Txn.sender
     frame_dig -4
@@ -5818,7 +5818,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     intc_0 // 0
     extract_uint64
     dup
-    frame_bury 30
+    frame_bury 29
     // smart_contracts/abstracted_account/contract.algo.ts:320-323
     // const allowanceKey: AllowanceKey = {
     //   escrow,
@@ -5877,7 +5877,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     pushint 392 // 392
     getbit
     dup
-    frame_bury 29
+    frame_bury 28
     // smart_contracts/abstracted_account/contract.algo.ts:351
     // const newLast = useRounds ? Global.round : Global.latestTimestamp;
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@59
@@ -5931,7 +5931,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     box_replace
     // smart_contracts/abstracted_account/contract.algo.ts:327
     // if (fundsRequests[i].asset !== 0) {
-    frame_dig 30
+    frame_dig 29
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_else_body@73
     // smart_contracts/abstracted_account/contract.algo.ts:328-335
     // itxn
@@ -5958,7 +5958,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     frame_dig 0
     intc_3 // 8
     extract_uint64
-    frame_dig 30
+    frame_dig 29
     itxn_field XferAsset
     itxn_field AssetAmount
     frame_dig 5
@@ -6056,7 +6056,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_else_body@66
     // smart_contracts/abstracted_account/contract.algo.ts:385
     // if (useRounds) {
-    frame_dig 29
+    frame_dig 28
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@77
     // smart_contracts/abstracted_account/contract.algo.ts:386
     // return Global.round - ((Global.round - start) % interval)
@@ -6147,7 +6147,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@71
     // smart_contracts/abstracted_account/contract.algo.ts:370
     // const epochRef = useRounds ? Global.round : Global.latestTimestamp;
-    frame_dig 29
+    frame_dig 28
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@69
     global Round
     frame_bury 14
@@ -6218,108 +6218,94 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     dup
     intc_1 // 1
     getbit
-    swap
+    frame_bury 28
     intc_2 // 2
     getbit
-    frame_bury 28
-    // smart_contracts/abstracted_account/contract.algo.ts:206-208
-    // const epochRef = useRounds
-    //   ? Global.round
-    //   : Global.latestTimestamp;
-    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@16
-    // smart_contracts/abstracted_account/contract.algo.ts:207
-    // ? Global.round
-    global Round
-    frame_bury 14
-
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_merge@17:
-    // smart_contracts/abstracted_account/contract.algo.ts:210
+    // smart_contracts/abstracted_account/contract.algo.ts:206
     // if (useExecutionKey && !(Txn.sender === this.admin.value)) {
-    frame_dig 28
-    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@25
+    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@22
     txn Sender
     intc_0 // 0
     // smart_contracts/abstracted_account/contract.algo.ts:16
     // admin = GlobalState<Account>({ key: AbstractAccountGlobalStateKeysAdmin })
     bytec_2 // "admin"
-    // smart_contracts/abstracted_account/contract.algo.ts:210
+    // smart_contracts/abstracted_account/contract.algo.ts:206
     // if (useExecutionKey && !(Txn.sender === this.admin.value)) {
     app_global_get_ex
     assert // check GlobalState exists
     ==
-    bnz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@25
+    bnz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@22
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     bytec 8 // "x"
-    // smart_contracts/abstracted_account/contract.algo.ts:211
+    // smart_contracts/abstracted_account/contract.algo.ts:207
     // assert(this.executions(Txn.lease).exists, ERR_EXECUTION_KEY_NOT_FOUND);
     txn Lease
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     concat
-    // smart_contracts/abstracted_account/contract.algo.ts:211
+    // smart_contracts/abstracted_account/contract.algo.ts:207
     // assert(this.executions(Txn.lease).exists, ERR_EXECUTION_KEY_NOT_FOUND);
     box_len
     bury 1
     assert // Execution key not found
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     bytec 8 // "x"
-    // smart_contracts/abstracted_account/contract.algo.ts:212
-    // assert(this.executions(Txn.lease).value.firstValid <= epochRef, ERR_EXECUTION_NOT_READY);
+    // smart_contracts/abstracted_account/contract.algo.ts:208
+    // assert(this.executions(Txn.lease).value.firstValid <= Global.round, ERR_EXECUTION_NOT_READY);
     txn Lease
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     concat
-    // smart_contracts/abstracted_account/contract.algo.ts:212
-    // assert(this.executions(Txn.lease).value.firstValid <= epochRef, ERR_EXECUTION_NOT_READY);
+    // smart_contracts/abstracted_account/contract.algo.ts:208
+    // assert(this.executions(Txn.lease).value.firstValid <= Global.round, ERR_EXECUTION_NOT_READY);
     intc_2 // 2
     intc_3 // 8
     box_extract
     btoi
-    frame_dig 14
-    dup
-    cover 2
+    global Round
     <=
     assert // Execution key not ready
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     bytec 8 // "x"
-    // smart_contracts/abstracted_account/contract.algo.ts:213
-    // assert(epochRef < this.executions(Txn.lease).value.lastValid, ERR_EXECUTION_EXPIRED);
+    // smart_contracts/abstracted_account/contract.algo.ts:209
+    // assert(this.executions(Txn.lease).value.lastValid >= Global.round, ERR_EXECUTION_EXPIRED);
     txn Lease
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     concat
-    // smart_contracts/abstracted_account/contract.algo.ts:213
-    // assert(epochRef < this.executions(Txn.lease).value.lastValid, ERR_EXECUTION_EXPIRED);
+    // smart_contracts/abstracted_account/contract.algo.ts:209
+    // assert(this.executions(Txn.lease).value.lastValid >= Global.round, ERR_EXECUTION_EXPIRED);
     pushint 10 // 10
     intc_3 // 8
     box_extract
     btoi
-    <
+    global Round
+    >=
     assert // Execution key expired
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     bytec 8 // "x"
-    // smart_contracts/abstracted_account/contract.algo.ts:215
+    // smart_contracts/abstracted_account/contract.algo.ts:211
     // const groups = this.executions(Txn.lease).value.groups as Readonly<bytes<32>[]>;
     txn Lease
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     concat
     frame_bury 4
-    // smart_contracts/abstracted_account/contract.algo.ts:217
+    // smart_contracts/abstracted_account/contract.algo.ts:213
     // let foundGroup = false;
     intc_0 // 0
     frame_bury 15
-    // smart_contracts/abstracted_account/contract.algo.ts:218
+    // smart_contracts/abstracted_account/contract.algo.ts:214
     // for (let i: uint64 = 0; i < groups.length; i += 1) {
     intc_0 // 0
     frame_bury 16
 
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_while_top@20:
-    // smart_contracts/abstracted_account/contract.algo.ts:218
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_while_top@17:
+    // smart_contracts/abstracted_account/contract.algo.ts:214
     // for (let i: uint64 = 0; i < groups.length; i += 1) {
     frame_dig 4
     pushint 18 // 18
@@ -6328,8 +6314,8 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     btoi
     frame_dig 16
     >
-    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_while@24
-    // smart_contracts/abstracted_account/contract.algo.ts:219
+    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_while@21
+    // smart_contracts/abstracted_account/contract.algo.ts:215
     // if (groups[i] === Global.groupId) {
     frame_dig 16
     pushint 32 // 32
@@ -6342,67 +6328,77 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     box_extract
     global GroupID
     ==
-    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@23
-    // smart_contracts/abstracted_account/contract.algo.ts:220
+    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@20
+    // smart_contracts/abstracted_account/contract.algo.ts:216
     // foundGroup = true;
     intc_1 // 1
     frame_bury 15
 
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@23:
-    // smart_contracts/abstracted_account/contract.algo.ts:218
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@20:
+    // smart_contracts/abstracted_account/contract.algo.ts:214
     // for (let i: uint64 = 0; i < groups.length; i += 1) {
     frame_dig 16
     intc_1 // 1
     +
     frame_bury 16
-    b smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_while_top@20
+    b smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_while_top@17
 
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_while@24:
-    // smart_contracts/abstracted_account/contract.algo.ts:224
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_while@21:
+    // smart_contracts/abstracted_account/contract.algo.ts:220
     // assert(foundGroup, ERR_GROUP_NOT_FOUND);
     frame_dig 15
     assert // Group not found
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     bytec 8 // "x"
-    // smart_contracts/abstracted_account/contract.algo.ts:225
+    // smart_contracts/abstracted_account/contract.algo.ts:221
     // this.executions(Txn.lease).delete();
     txn Lease
     // smart_contracts/abstracted_account/contract.algo.ts:41
     // executions = BoxMap<bytes<32>, ExecutionInfo>({ keyPrefix: AbstractAccountBoxPrefixExecutions })
     concat
-    // smart_contracts/abstracted_account/contract.algo.ts:225
+    // smart_contracts/abstracted_account/contract.algo.ts:221
     // this.executions(Txn.lease).delete();
     box_del
     pop
 
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@25:
-    // smart_contracts/abstracted_account/contract.algo.ts:228
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@22:
+    // smart_contracts/abstracted_account/contract.algo.ts:224
     // const initialCheck = this.pluginCheck(key);
     frame_dig 6
     callsub pluginCheck
-    dup
-    cover 2
     frame_bury 6
-    // smart_contracts/abstracted_account/contract.algo.ts:230
+    // smart_contracts/abstracted_account/contract.algo.ts:226
     // assert(initialCheck.exists, ERR_PLUGIN_DOES_NOT_EXIST);
     dup
     intc_0 // 0
     getbit
     assert // plugin does not exist
-    // smart_contracts/abstracted_account/contract.algo.ts:231
+    // smart_contracts/abstracted_account/contract.algo.ts:227
     // assert(!initialCheck.expired, ERR_PLUGIN_EXPIRED);
     dup
     intc_1 // 1
     getbit
     !
     assert // plugin expired
-    // smart_contracts/abstracted_account/contract.algo.ts:232
+    // smart_contracts/abstracted_account/contract.algo.ts:228
     // assert(!initialCheck.onCooldown, ERR_PLUGIN_ON_COOLDOWN);
     intc_2 // 2
     getbit
     !
     assert // plugin on cooldown
+    // smart_contracts/abstracted_account/contract.algo.ts:230-232
+    // const epochRef = useRounds
+    //   ? Global.round
+    //   : Global.latestTimestamp;
+    frame_dig 28
+    bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@24
+    // smart_contracts/abstracted_account/contract.algo.ts:231
+    // ? Global.round
+    global Round
+    frame_bury 14
+
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_merge@25:
     // smart_contracts/abstracted_account/contract.algo.ts:234
     // let rekeysBack = false;
     intc_0 // 0
@@ -6417,6 +6413,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     intc_1 // 1
     +
     frame_bury 18
+    frame_dig 6
     frame_bury 7
 
 smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_while_top@26:
@@ -6657,7 +6654,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     getbit
     dup
     cover 2
-    frame_bury 29
+    frame_bury 28
     // smart_contracts/abstracted_account/contract.algo.ts:288
     // const { selector, cooldown, lastCalled } = this.plugins(key).value.methods[offset]
     uncover 2
@@ -6710,7 +6707,7 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_after_if_else@43
     // smart_contracts/abstracted_account/contract.algo.ts:298
     // const lastCalled = useRounds ? Global.round : Global.latestTimestamp;
-    frame_dig 29
+    frame_dig 28
     bz smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@41
     global Round
 
@@ -6809,12 +6806,12 @@ smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rek
     global LatestTimestamp
     b smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_merge@35
 
-smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@16:
-    // smart_contracts/abstracted_account/contract.algo.ts:208
+smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_false@24:
+    // smart_contracts/abstracted_account/contract.algo.ts:232
     // : Global.latestTimestamp;
     global LatestTimestamp
     frame_bury 14
-    b smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_merge@17
+    b smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_ternary_merge@25
 
 smart_contracts/abstracted_account/contract.algo.ts::AbstractedAccount.arc58_rekeyToPlugin_else_body@7:
     // smart_contracts/abstracted_account/contract.algo.ts:588