fix: progress chain before at-block

Haven't narrowed down the exact bug but can continue making the generalized proposal functions now that flow is confirmed.

Author: whoabuddy

tests/dao/extensions/aibtc-onchain-messaging.test.ts

@@ -7,8 +7,9 @@ import {
 } from "../../test-utilities";
 
 const accounts = simnet.getAccounts();
-const address1 = accounts.get("wallet_1")!;
 const deployer = accounts.get("deployer")!;
+const address1 = accounts.get("wallet_1")!;
+const address2 = accounts.get("wallet_2")!;
 
 const contractName = "aibtc-onchain-messaging";
 const contractAddress = `${deployer}.${contractName}`;
@@ -57,20 +58,31 @@ describe(`extension: ${contractName}`, () => {
     const message = "test";
 
     // fund account that sends proposal
-    const getDaoTokensReceipt = getDaoTokens(deployer, deployer);
-
-    console.log("getDaoTokensReceipt");
-    console.log(getDaoTokensReceipt);
+    const getDaoTokensReceipts = [
+      getDaoTokens(deployer, deployer, 1000000000), // 1000 STX
+      getDaoTokens(deployer, address1, 500000000), // 500 STX
+      getDaoTokens(deployer, address2, 250000000), // 250 STX
+    ];
+
+    console.log("===========================");
+    console.log("getDaoTokensReceipts");
+    for (const receipt of getDaoTokensReceipts) {
+      console.log(receipt);
+    }
 
     // construct DAO
     const constructReceipt = constructDao(deployer);
 
+    console.log("===========================");
     console.log("constructReceipt");
     console.log(constructReceipt);
 
+    simnet.mineEmptyBlocks(10);
+
     // pass proposal
     const proposalReceipt = passCoreProposal(proposalContractAddress, deployer);
 
+    console.log("===========================");
     console.log("proposalReceipt");
     console.log(proposalReceipt);
 
@@ -81,8 +93,9 @@ describe(`extension: ${contractName}`, () => {
       deployer
     );
 
+    console.log("===========================");
     console.log("proposalDetails");
-    console.log(cvToValue(proposalDetails.result));
+    console.log(cvToValue(proposalDetails.result).value);
 
     simnet.mineEmptyBlocks(100);
 
@@ -93,6 +106,7 @@ describe(`extension: ${contractName}`, () => {
       deployer
     );
 
+    console.log("===========================");
     console.log("votingPowerReceipt");
     console.log(cvToValue(votingPowerReceipt.result));
 
@@ -103,6 +117,7 @@ describe(`extension: ${contractName}`, () => {
       deployer
     );
 
+    console.log("===========================");
     console.log("addressBalanceReceipt");
     console.log(cvToValue(addressBalanceReceipt.result));
 
@@ -113,18 +128,10 @@ describe(`extension: ${contractName}`, () => {
       deployer
     );
 
+    console.log("===========================");
     console.log("voteReceipt");
     console.log(voteReceipt);
 
     expect(voteReceipt.result).toBeOk(Cl.bool(true));
   });
-
-  /*
-  // Message Tests
-  describe("send()", () => {
-    it("succeeds if called by any user with isFromDao false");
-    it("fails if called by any user with isFromDao true");
-    it("succeeds if called by a DAO proposal with isFromDao true");
-  });
-  */
 });

tests/test-utilities.ts

@@ -9,7 +9,11 @@ function getPercentageOfSupply(amount: number, totalSupply: number) {
   return `${percentage}% supply`;
 }
 
-export function getDaoTokens(deployer: string, address: string) {
+export function getDaoTokens(
+  deployer: string,
+  address: string,
+  stxAmount: number
+) {
   const tokenContractName = "aibtc-token";
   const tokenContractAddress = `${deployer}.${tokenContractName}`;
   const tokenDexContractName = "aibtc-token-dex";
@@ -47,8 +51,8 @@ export function getDaoTokens(deployer: string, address: string) {
 
   const liquidTokenSupply = totalSupply - treasuryBalance - tokenDexBalance;
 
-  console.log("BEFORE BUY");
   console.log("=========================");
+  console.log("BEFORE BUY");
   console.log("totalSupply", totalSupply);
   console.log(
     "treasuryBalance",
@@ -69,7 +73,7 @@ export function getDaoTokens(deployer: string, address: string) {
   const getDaoTokensReceipt = simnet.callPublicFn(
     tokenDexContractAddress,
     "buy",
-    [Cl.principal(tokenContractAddress), Cl.uint(1000000000)], // 1000 STX buy test
+    [Cl.principal(tokenContractAddress), Cl.uint(stxAmount)], // 1000 STX buy test
     address
   );
 
@@ -111,8 +115,8 @@ export function getDaoTokens(deployer: string, address: string) {
 
   const liquidTokenSupply2 = totalSupply2 - treasuryBalance2 - tokenDexBalance2;
 
-  console.log("AFTER BUY");
   console.log("=========================");
+  console.log("AFTER BUY");
   console.log("totalSupply2", totalSupply2);
   console.log(
     "treasuryBalance2",
@@ -135,8 +139,8 @@ export function getDaoTokens(deployer: string, address: string) {
   );
   const addressVotingPower = addressBalance / liquidTokenSupply2;
 
-  console.log("ADDRESS INFO");
   console.log("=========================");
+  console.log("ADDRESS INFO");
   console.log(
     "addressBalance",
     addressBalance,
@@ -175,6 +179,7 @@ export function constructDao(deployer: string) {
 export function passCoreProposal(
   proposalContractAddress: string,
   deployer: string
+  // voters: string[]
 ) {
   // create-proposal
   const createProposalReceipt = simnet.callPublicFn(