working

Author: fiftyeightandeight

clarity/contracts/auto-token/auto-alex-v3-1-endpoint.clar

@@ -121,9 +121,9 @@
   (let (
       (current-cycle (unwrap! (get-reward-cycle block-height) ERR-STAKING-NOT-AVAILABLE))
       (start-cycle (get-start-cycle))
-      (check-start-cycle (asserts! (<= start-cycle current-cycle) ERR-NOT-ACTIVATED))
-      (auto-alex-v2-bal (unwrap-panic (contract-call? .auto-alex-v2 get-balance-fixed .auto-alex-v3-1)))
-      (auto-alex-v3-wrapped-bal (unwrap-panic (contract-call? .auto-alex-v3-1-wrapped get-balance-fixed .auto-alex-v3-1))))
+      (check-start-cycle (asserts! (<= start-cycle current-cycle) ERR-NOT-ACTIVATED)))
+      ;; (auto-alex-v2-bal (unwrap-panic (contract-call? .auto-alex-v2 get-balance-fixed .auto-alex-v3-1)))
+      ;; (auto-alex-v3-wrapped-bal (unwrap-panic (contract-call? .auto-alex-v3-1-wrapped get-balance-fixed .auto-alex-v3-1))))
     (and (> current-cycle start-cycle) (not (is-cycle-staked (- current-cycle u1))) (try! (claim-and-stake (- current-cycle u1))))
     ;; (print { notification: "next-base", payload: {
     ;;   ;; amount-staked: (get amount-staked (as-contract (get-staker-at-cycle (+ current-cycle u1)))),
@@ -178,12 +178,8 @@
       (sender tx-sender))
     (asserts! (> dx u0) ERR-INVALID-LIQUIDITY)
     (asserts! (not (is-create-paused)) ERR-PAUSED)
-
-    ;; transfer dx to contract to stake for max cycles
     (try! (contract-call? .age000-governance-token transfer-fixed dx sender .auto-alex-v3-1 none))
     (try! (fold stake-tokens-iter REWARD-CYCLE-INDEXES (ok { current-cycle: current-cycle, remaining: dx })))
-
-    ;; mint pool token and send to tx-sender
     (as-contract (try! (contract-call? .auto-alex-v3-1 mint-fixed dx sender)))
     (print { notification: "position-added", payload: { new-supply: dx } })
     (rebase)))
@@ -197,12 +193,8 @@
     (asserts! (> intrinsic-dx u0) ERR-INVALID-LIQUIDITY)
     (asserts! (not (is-create-paused)) ERR-PAUSED)
     (asserts! (< end-cycle-v2 (+ current-cycle u32)) ERR-END-CYCLE-V2) ;; auto-alex-v2 is not configured correctly
-
-    ;; transfer dx to contract to stake for max cycles
     (try! (contract-call? .auto-alex-v2 transfer-fixed dx sender .auto-alex-v3-1 none))
     (and (< end-cycle-v2 current-cycle) (begin (as-contract (try! (reduce-position-v2))) true))
-
-    ;; mint pool token and send to tx-sender
     (as-contract (try! (contract-call? .auto-alex-v3-1 mint-fixed intrinsic-dx sender)))
     (print { notification: "upgrade-position-added", payload: { new-supply: intrinsic-dx } })
     (rebase)))

clarity/tests/auto-alex-v3_test.ts

@@ -33,6 +33,8 @@ Clarinet.test({
         result.expectOk();
         result = alexToken.mintFixed(deployer, wallet_3.address, dx);
         result.expectOk();
+        result = alexToken.mintFixed(deployer, wallet_4.address, dx);
+        result.expectOk();        
 
         let block = chain.mineBlock([
             Tx.contractCall(
@@ -50,11 +52,11 @@ Clarinet.test({
             reservePool.setCoinbaseAmount(
                 deployer,
                 alexTokenAddress,
-                0,
-                0,
-                0,
-                0,
-                0
+                1e8,
+                1e8,
+                1e8,
+                1e8,
+                1e8
             ),
             yieldVault.setStartCycle(deployer, 0),
             yieldVault.setBountyInFixed(deployer, 1),
@@ -123,17 +125,19 @@ Clarinet.test({
 
         block = chain.mineBlock([            
             Tx.contractCall('auto-alex-v3-1-endpoint', 'rebase', [], deployer.address),            
-            Tx.contractCall('auto-alex-v3-1-endpoint', 'revoke-redeem', [types.uint(3)], wallet_3.address),
+            Tx.contractCall('auto-alex-v3-1-endpoint', 'revoke-redeem', [types.uint(3)], wallet_3.address),            
         ]);
         console.log(block.receipts[0].events);        
         block.receipts[0].result.expectOk();
         block.receipts[1].result.expectErr(10019);
 
         console.log(chain.callReadOnlyFn('age000-governance-token', 'get-balance-fixed', [types.principal(deployer.address + '.auto-alex-v3-1')], wallet_1.address));
         console.log(chain.callReadOnlyFn('auto-alex-v3-1-endpoint', 'get-redeem-request-or-fail', [types.uint(2)], wallet_1.address).result);
+        console.log(chain.callReadOnlyFn('auto-alex-v3-1-endpoint', 'get-redeem-request-or-fail', [types.uint(3)], wallet_1.address).result);
         console.log(chain.callReadOnlyFn('auto-alex-v3-1-endpoint', 'get-intrinsic', [], wallet_1.address));
 
         block = chain.mineBlock([
+            Tx.contractCall('auto-alex-v3-1-endpoint', 'finalize-redeem', [types.uint(3)], wallet_3.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'finalize-redeem', [types.uint(2)], wallet_2.address),
         ]);        
         block.receipts.forEach(e => { e.result.expectOk() });