fix: remove vested-claimed-amount

Author: hstove

contrib/core-contract-tests/tests/clarigen-types.ts

@@ -4607,12 +4607,6 @@ export const contracts = {
         args: [],
         outputs: { type: "principal" },
       } as TypedAbiFunction<[], string>,
-      getVestedClaimedAmount: {
-        name: "get-vested-claimed-amount",
-        access: "read_only",
-        args: [],
-        outputs: { type: "uint128" },
-      } as TypedAbiFunction<[], bigint>,
     },
     maps: {},
     variables: {
@@ -4659,18 +4653,13 @@ export const contracts = {
       deployBlockHeight: {
         name: "deploy-block-height",
         type: "uint128",
-        access: "variable",
+        access: "constant",
       } as TypedAbiVariable<bigint>,
       recipient: {
         name: "recipient",
         type: "principal",
         access: "variable",
       } as TypedAbiVariable<string>,
-      vestedClaimedAmount: {
-        name: "vested-claimed-amount",
-        type: "uint128",
-        access: "variable",
-      } as TypedAbiVariable<bigint>,
     },
     constants: {
       ERR_NOTHING_TO_CLAIM: 102n,
@@ -4683,7 +4672,6 @@ export const contracts = {
       STX_PER_ITERATION: 4_166_666_666_666n,
       deployBlockHeight: 3n,
       recipient: "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM",
-      vestedClaimedAmount: 0n,
     },
     non_fungible_tokens: [],
     fungible_tokens: [],

contrib/core-contract-tests/tests/sip-031/sip-031.test.ts

@@ -93,6 +93,7 @@ test('updated recipient can claim', () => {
 });
 
 test('calculating vested amounts at a block height', () => {
+  mintInitial();
   const deployBlockHeight = rov(contract.getDeployBlockHeight());
 
   const initialMintAmount = 200_000_000n * 1000000n; // 200,000,000 STX

stackslib/src/chainstate/stacks/boot/sip-031.clar

@@ -21,15 +21,13 @@
 
 (define-data-var recipient principal tx-sender)
 
-(define-data-var deploy-block-height uint burn-block-height)
-
-(define-data-var vested-claimed-amount uint u0)
+;; The block height at which vesting starts. On Mainnet, this is
+;; burn height 907740, which is what is specified in SIP-031.
+(define-constant deploy-block-height (if is-in-mainnet u907740 burn-block-height))
 
 (define-read-only (get-recipient) (var-get recipient))
 
-(define-read-only (get-deploy-block-height) (var-get deploy-block-height))
-
-(define-read-only (get-vested-claimed-amount) (var-get vested-claimed-amount))
+(define-read-only (get-deploy-block-height) deploy-block-height)
 
 ;; Update the recipient of the funds.
 ;;
@@ -49,7 +47,6 @@
         (
             (balance (stx-get-balance (as-contract tx-sender)))
             (total-vested (calc-total-vested burn-block-height))
-            (vested-claimed (var-get vested-claimed-amount))
             ;; Portion of the initial mint that is *still* locked (not yet vested)
             (reserved (- INITIAL_MINT_AMOUNT total-vested))
             ;; Free balance = everything the caller may withdraw right now
@@ -60,7 +57,6 @@
         )
         (try! (validate-caller))
         (asserts! (> claimable u0) (err ERR_NOTHING_TO_CLAIM))
-        (var-set vested-claimed-amount (+ vested-claimed total-vested))
 
         (try! (as-contract (stx-transfer? claimable tx-sender (var-get recipient))))
         (ok claimable)
@@ -76,7 +72,7 @@
 (define-private (calc-total-vested (burn-height uint))
     (let
       (
-        (diff (- burn-height (var-get deploy-block-height)))
+        (diff (- burn-height deploy-block-height))
         ;; Note: this rounds down
         (iterations (/ diff INITIAL_MINT_VESTING_ITERATION_BLOCKS))
         (vested-multiple (* STX_PER_ITERATION iterations))
@@ -98,7 +94,13 @@
     (let
         (
             (total-vested (calc-total-vested burn-height))
+            (reserved (- INITIAL_MINT_AMOUNT total-vested))
+            (balance (stx-get-balance (as-contract tx-sender)))
+            (claimable
+                (if (> balance reserved)
+                    (- balance reserved)
+                    u0))
         )
-        (- total-vested (var-get vested-claimed-amount))
+        claimable
     )
 )