fix: bring proposal code in sync, use stx block for at-block

Merges some other minor changes, one test passing each should be ready to translate to the templates for testnet.

Author: whoabuddy

contracts/dao/extensions/aibtc-action-proposals.clar

@@ -51,8 +51,9 @@
     createdAt: uint, ;; block height
     caller: principal, ;; contract caller
     creator: principal, ;; proposal creator (tx-sender)
-    startBlock: uint, ;; block height
-    endBlock: uint, ;; block height
+    startBlockStx: uint, ;; block height for at-block calls
+    startBlock: uint, ;; burn block height
+    endBlock: uint, ;; burn block height
     votesFor: uint, ;; total votes for
     votesAgainst: uint, ;; total votes against
     liquidTokens: uint, ;; liquid tokens
@@ -94,6 +95,7 @@
         parameters: parameters,
         creator: tx-sender,
         liquidTokens: liquidTokens,
+        startBlockStx: block-height,
         startBlock: burn-block-height,
         endBlock: (+ burn-block-height VOTING_PERIOD)
       }
@@ -105,6 +107,7 @@
       createdAt: burn-block-height,
       caller: contract-caller,
       creator: tx-sender,
+      startBlockStx: block-height,
       startBlock: burn-block-height,
       endBlock: (+ burn-block-height VOTING_PERIOD),
       votesFor: u0,
@@ -122,7 +125,7 @@
   (let
     (
       (proposalRecord (unwrap! (map-get? Proposals proposalId) ERR_PROPOSAL_NOT_FOUND))
-      (proposalBlock (get startBlock proposalRecord))
+      (proposalBlock (get startBlockStx proposalRecord))
       (proposalBlockHash (unwrap! (get-block-hash proposalBlock) ERR_RETRIEVING_START_BLOCK_HASH))
       (senderBalance (unwrap! (at-block proposalBlockHash (contract-call? .aibtc-token get-balance tx-sender)) ERR_FETCHING_TOKEN_DATA))
     )
@@ -201,7 +204,7 @@
   (let
     (
       (proposalRecord (unwrap! (map-get? Proposals proposalId) ERR_PROPOSAL_NOT_FOUND))
-      (proposalBlockHash (unwrap! (get-block-hash (get startBlock proposalRecord)) ERR_RETRIEVING_START_BLOCK_HASH))
+      (proposalBlockHash (unwrap! (get-block-hash (get startBlockStx proposalRecord)) ERR_RETRIEVING_START_BLOCK_HASH))
     )
     (at-block proposalBlockHash (contract-call? .aibtc-token get-balance who))
   )
@@ -244,7 +247,6 @@
   ))
 )
 
-;; get block hash by height
 (define-private (get-block-hash (blockHeight uint))
   (get-block-info? id-header-hash blockHeight)
 )

contracts/dao/extensions/aibtc-core-proposals.clar

@@ -89,6 +89,7 @@
         proposal: proposalContract,
         creator: tx-sender,
         liquidTokens: liquidTokens,
+        startBlockStx: block-height,
         startBlock: burn-block-height,
         endBlock: (+ burn-block-height VOTING_PERIOD)
       }
@@ -116,8 +117,7 @@
       (proposalRecord (unwrap! (map-get? Proposals proposalContract) ERR_PROPOSAL_NOT_FOUND))
       (proposalBlock (get startBlockStx proposalRecord))
       (proposalBlockHash (unwrap! (get-block-hash proposalBlock) ERR_RETRIEVING_START_BLOCK_HASH))
-      (senderBalanceResponse (at-block proposalBlockHash (contract-call? .aibtc-token get-balance tx-sender)))
-      (senderBalance (unwrap-panic senderBalanceResponse))
+      (senderBalance (unwrap! (at-block proposalBlockHash (contract-call? .aibtc-token get-balance tx-sender)) ERR_FETCHING_TOKEN_DATA))
     )
     ;; caller has the required balance
     (asserts! (> senderBalance u0) ERR_INSUFFICIENT_BALANCE)
@@ -156,8 +156,6 @@
     (
       (proposalContract (contract-of proposal))
       (proposalRecord (unwrap! (map-get? Proposals proposalContract) ERR_PROPOSAL_NOT_FOUND))
-      (tokenTotalSupply (unwrap! (contract-call? .aibtc-token get-total-supply) ERR_FETCHING_TOKEN_DATA))
-      (treasuryBalance (unwrap! (contract-call? .aibtc-token get-balance .aibtc-treasury) ERR_FETCHING_TOKEN_DATA))
       ;; if VOTING_QUORUM <= ((votesFor * 100) / liquidTokens)
       (votePassed (<= VOTING_QUORUM (/ (* (get votesFor proposalRecord) u100) (get liquidTokens proposalRecord))))
     )
@@ -235,7 +233,6 @@
   ))
 )
 
-;; get block hash by height
 (define-private (get-block-hash (blockHeight uint))
   (get-block-info? id-header-hash blockHeight)
 )