Merge pull request #128 from aibtcdev/fix/update-contract-templates

Update contract templates

Author: whoabuddy

src/aibtc-dao/deploy-dao.ts

@@ -4,10 +4,14 @@ import { validateStacksAddress } from "@stacks/transactions";
 import {
   DeployedContractRegistryEntry,
   GeneratedContractRegistryEntry,
-} from "./services/dao-contract-registry";
+  validateContractDeploymentOrder,
+} from "./registries/dao-contract-registry";
 import { DaoContractGenerator } from "./services/dao-contract-generator";
 import { DaoContractDeployer } from "./services/dao-contract-deployer";
-import { ExpectedContractGeneratorArgs } from "./types/dao-types";
+import {
+  ContractCopyConfig,
+  ExpectedContractGeneratorArgs,
+} from "./types/dao-types";
 import {
   aibtcCoreRequestBody,
   CONFIG,
@@ -106,7 +110,28 @@ async function main(): Promise<ToolResponse<DeployedContractRegistryEntry[]>> {
 
   // Step 1 - generate dao-related contracts
 
-  // generate dao contracts
+  // Define which contracts need multiple copies
+  /* removing temporarily while we troubleshoot action config
+  const contractCopies: ContractCopyConfig[] = [
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_DAO",
+      count: 5,
+    },
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_SBTC",
+      count: 5,
+    },
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_STX",
+      count: 5,
+    },
+  ];
+  */
+
+  // generate dao contracts with multiple copies
   const daoContracts = contractGenerator.generateContracts(args);
   generatedContracts.push(...Object.values(daoContracts));
 
@@ -163,7 +188,26 @@ async function main(): Promise<ToolResponse<DeployedContractRegistryEntry[]>> {
     });
   }
 
-  // Step 4 - deploy contracts
+  // Step 4 - validate and deploy contracts
+
+  // Validate deployment order
+  const isValidDeploymentOrder = validateContractDeploymentOrder();
+  if (!isValidDeploymentOrder) {
+    throw new Error("Invalid contract deployment order detected");
+  }
+
+  // Sort contracts by deployment order for logging
+  const sortedContracts = [...generatedContracts].sort(
+    (a, b) => a.deploymentOrder - b.deploymentOrder
+  );
+
+  // Log deployment order for debugging
+  console.log("Deployment order:");
+  sortedContracts.forEach((contract, index) => {
+    console.log(
+      `${index + 1}. ${contract.name} (${contract.type}/${contract.subtype})`
+    );
+  });
 
   //console.log(`Deploying ${generatedContracts.length} contracts...`);
   //console.log(`- address: ${address}`);

src/aibtc-dao/extensions/core-proposals/deploy-core-proposal.ts

@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import * as path from "path";
-import { getContractName } from "../../services/dao-contract-registry";
-import { DeployedCoreProposalRegistryEntry } from "../../services/dao-core-proposal-registry";
+import { getContractName } from "../../registries/dao-contract-registry";
+import { DeployedCoreProposalRegistryEntry } from "../../registries/dao-core-proposal-registry";
 import { DaoCoreProposalGenerator } from "../../services/dao-core-proposal-generator";
 import { DaoCoreProposalDeployer } from "../../services/dao-core-proposal-deployer";
 import {

src/aibtc-dao/extensions/core-proposals/generate-all-core-proposals.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
-import { GeneratedCoreProposalRegistryEntry } from "../../services/dao-core-proposal-registry";
+import { GeneratedCoreProposalRegistryEntry } from "../../registries/dao-core-proposal-registry";
 import { DaoCoreProposalGenerator } from "../../services/dao-core-proposal-generator";
 import {
   CONFIG,

src/aibtc-dao/extensions/core-proposals/generate-core-proposal.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
-import { GeneratedCoreProposalRegistryEntry } from "../../services/dao-core-proposal-registry";
+import { GeneratedCoreProposalRegistryEntry } from "../../registries/dao-core-proposal-registry";
 import { DaoCoreProposalGenerator } from "../../services/dao-core-proposal-generator";
 import {
   CONFIG,

src/aibtc-dao/generate-dao.ts

@@ -2,8 +2,11 @@ import * as fs from "fs";
 import * as path from "path";
 import { validateStacksAddress } from "@stacks/transactions";
 import { DaoContractGenerator } from "./services/dao-contract-generator";
-import { GeneratedContractRegistryEntry } from "./services/dao-contract-registry";
-import { ExpectedContractGeneratorArgs } from "./types/dao-types";
+import { GeneratedContractRegistryEntry } from "./registries/dao-contract-registry";
+import {
+  ContractCopyConfig,
+  ExpectedContractGeneratorArgs,
+} from "./types/dao-types";
 import {
   CONFIG,
   convertStringToBoolean,
@@ -100,6 +103,27 @@ async function main(): Promise<ToolResponse<GeneratedContractRegistryEntry[]>> {
 
   // Step 1 - generate dao contracts
 
+  // Define which contracts need multiple copies
+  /* removing temporarily while we troubleshoot action config
+  const contractCopies: ContractCopyConfig[] = [
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_DAO",
+      count: 5,
+    },
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_SBTC",
+      count: 5,
+    },
+    {
+      type: "EXTENSIONS",
+      subtype: "TIMED_VAULT_STX",
+      count: 5,
+    },
+  ];
+  */
+
   const daoContracts = contractGenerator.generateContracts(args);
   generatedContracts.push(...Object.values(daoContracts));