working

alexgo-io · May 6, 2024 · 0d86457 · 0d86457
1 parent 492b7fa
commit 0d86457
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/clarity/contracts/auto-token/auto-alex-v3-1-endpoint.clar b/clarity/contracts/auto-token/auto-alex-v3-1-endpoint.clar
@@ -151,11 +151,12 @@
       (claimed (as-contract (try! (claim-staking-reward reward-cycle))))
       (claimed-v2 (if (< end-cycle-v2 current-cycle) (as-contract (try! (reduce-position-v2))) (begin (try! (claim-and-stake-v2 reward-cycle)) u0)))
       (tokens (+ (get to-return claimed) (get entitled-token claimed) claimed-v2))
-      (previous-shares-to-tokens (get-staked-cycle-shares-to-tokens-or-default reward-cycle))
-      (redeeming (mul-down previous-shares-to-tokens (get-redeem-shares-per-cycle-or-default reward-cycle)))
-      (intrinsic (get-shares-to-tokens ONE_8)))
+      ;; (previous-shares-to-tokens (get-staked-cycle-shares-to-tokens-or-default reward-cycle))
+      ;; (redeeming (mul-down previous-shares-to-tokens (get-redeem-shares-per-cycle-or-default reward-cycle)))
+      (intrinsic (get-shares-to-tokens ONE_8))
+      (redeeming (mul-down intrinsic (get-redeem-shares-per-cycle-or-default reward-cycle))))
     (asserts! (> current-cycle reward-cycle) ERR-REWARD-CYCLE-NOT-COMPLETED)
-    (asserts! (>= tokens redeeming) ERR-REDEEM-IMBALANCE)
+    (asserts! (>= tokens redeeming) (err redeeming));;ERR-REDEEM-IMBALANCE)
     (as-contract (try! (contract-call? .auto-alex-v3-1-registry set-staked-cycle reward-cycle true)))
     (as-contract (try! (contract-call? .auto-alex-v3-1-registry set-staked-cycle-shares-to-tokens (+ reward-cycle u1) intrinsic)))
     (try! (fold stake-tokens-iter REWARD-CYCLE-INDEXES (ok { current-cycle: current-cycle, remaining: (- tokens redeeming) })))

diff --git a/clarity/tests/auto-alex-v3_test.ts b/clarity/tests/auto-alex-v3_test.ts
@@ -85,7 +85,8 @@ Clarinet.test({
         }
 
         block = chain.mineBlock([
-            yieldVault.addToPosition(wallet_1, dx),
+            // yieldVault.addToPosition(wallet_1, dx),
+            Tx.contractCall('auto-alex-v3-1-endpoint', 'add-to-position', [types.uint(dx)], wallet_1.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'add-to-position', [types.uint(dx)], wallet_2.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'add-to-position', [types.uint(dx)], wallet_3.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'add-to-position', [types.uint(dx)], wallet_4.address),
@@ -97,7 +98,7 @@ Clarinet.test({
         block = chain.mineBlock([
             Tx.contractCall('age000-governance-token', 'mint-fixed', [types.uint(1), types.principal(deployer.address + ".auto-alex-v2")], deployer.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'rebase', [], deployer.address),
-            Tx.contractCall('auto-alex-v3-1-endpoint', 'upgrade', [types.uint(dx)], wallet_1.address),
+            // Tx.contractCall('auto-alex-v3-1-endpoint', 'upgrade', [types.uint(dx)], wallet_1.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'request-redeem', [types.uint(dx)], wallet_1.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'request-redeem', [types.uint(dx)], wallet_2.address),
             Tx.contractCall('auto-alex-v3-1-endpoint', 'request-redeem', [types.uint(dx)], wallet_3.address),