Improve initializeProposal

Author: metaproph3t

futarchy-ts/src/AutocratClient.ts

@@ -27,6 +27,7 @@ import {
   USDC_DECIMALS,
 } from "./constants";
 import {
+  InstructionUtils,
   getAmmAddr,
   getAmmLpMintAddr,
   getDaoTreasuryAddr,
@@ -252,7 +253,6 @@ export class AutocratClient {
     baseTokensToLP: BN,
     quoteTokensToLP: BN
   ): Promise<PublicKey> {
-    let vaultProgramId = this.vaultClient.vaultProgram.programId;
     const storedDao = await this.getDao(dao);
 
     const nonce = new BN(Math.random() * 2 ** 50);
@@ -263,13 +263,6 @@ export class AutocratClient {
       nonce
     );
 
-    await this.vaultClient
-      .initializeVaultIx(proposal, storedDao.tokenMint)
-      .rpc();
-    await this.vaultClient
-      .initializeVaultIx(proposal, storedDao.usdcMint)
-      .rpc();
-
     const {
       baseVault,
       quoteVault,
@@ -286,85 +279,64 @@ export class AutocratClient {
       dao
     );
 
-    // const [baseVault] = getVaultAddr(
-    //   this.vaultClient.vaultProgram.programId,
-    //   proposal,
-    //   storedDao.tokenMint
-    // );
-    // const [quoteVault] = getVaultAddr(
-    //   this.vaultClient.vaultProgram.programId,
-    //   proposal,
-    //   storedDao.usdcMint
-    // );
-
+    // it's important that these happen in a single atomic transaction
     await this.vaultClient
-      .mintConditionalTokensIx(baseVault, storedDao.tokenMint, baseTokensToLP)
+      .initializeVaultIx(proposal, storedDao.tokenMint)
+      .postInstructions(
+        await InstructionUtils.getInstructions(
+          this.vaultClient.initializeVaultIx(proposal, storedDao.usdcMint),
+          this.ammClient.createAmmIx(
+            passBaseMint,
+            passQuoteMint,
+            storedDao.twapInitialObservation,
+            storedDao.twapMaxObservationChangePerUpdate,
+            proposal
+          ),
+          this.ammClient.createAmmIx(
+            failBaseMint,
+            failQuoteMint,
+            storedDao.twapInitialObservation,
+            storedDao.twapMaxObservationChangePerUpdate,
+            proposal
+          )
+        )
+      )
       .rpc();
+
     await this.vaultClient
-      .mintConditionalTokensIx(quoteVault, storedDao.usdcMint, quoteTokensToLP)
+      .mintConditionalTokensIx(baseVault, storedDao.tokenMint, baseTokensToLP)
+      .postInstructions(
+        await InstructionUtils.getInstructions(
+          this.vaultClient.mintConditionalTokensIx(
+            quoteVault,
+            storedDao.usdcMint,
+            quoteTokensToLP
+          )
+        )
+      )
       .rpc();
 
-    // const [passBase] = getVaultFinalizeMintAddr(vaultProgramId, baseVault);
-    // const [passQuote] = getVaultFinalizeMintAddr(vaultProgramId, quoteVault);
-    // const [passAmm] = getAmmAddr(
-    //   this.ammClient.program.programId,
-    //   passBase,
-    //   passQuote,
-    //   proposal
-    // );
-
-    // const [failBase] = getVaultRevertMintAddr(vaultProgramId, baseVault);
-    // const [failQuote] = getVaultRevertMintAddr(vaultProgramId, quoteVault);
-    // const [failAmm] = getAmmAddr(
-    //   this.ammClient.program.programId,
-    //   failBase,
-    //   failQuote,
-    //   proposal
-    // );
-
-    let tx = await this.ammClient
-      .createAmmIx(
+    await this.ammClient
+      .addLiquidityIx(
+        passAmm,
         passBaseMint,
         passQuoteMint,
-        storedDao.twapInitialObservation,
-        storedDao.twapMaxObservationChangePerUpdate,
-        proposal
+        quoteTokensToLP,
+        baseTokensToLP,
+        new BN(0)
       )
-      .postInstructions([
-        ...(
-          await this.ammClient
-            .addLiquidityIx(
-              passAmm,
-              passBaseMint,
-              passQuoteMint,
-              quoteTokensToLP,
-              baseTokensToLP,
-              new BN(0)
-            )
-            .transaction()
-        ).instructions,
-        await this.ammClient
-          .createAmmIx(
+      .postInstructions(
+        await InstructionUtils.getInstructions(
+          this.ammClient.addLiquidityIx(
+            failAmm,
             failBaseMint,
             failQuoteMint,
-            storedDao.twapInitialObservation,
-            storedDao.twapMaxObservationChangePerUpdate,
-            proposal
+            quoteTokensToLP,
+            baseTokensToLP,
+            new BN(0)
           )
-          .instruction(),
-        ...(
-          await this.ammClient
-            .addLiquidityIx(
-              failAmm,
-              failBaseMint,
-              failQuoteMint,
-              quoteTokensToLP,
-              baseTokensToLP,
-              new BN(0)
-            )
-            .transaction()
-        ).instructions,
-      ])
+        )
+      )
       .rpc();
 
     // this is how many original tokens are created
@@ -399,7 +371,6 @@ export class AutocratClient {
       this.provider.publicKey,
       nonce
     );
-    let vaultProgramId = this.vaultClient.vaultProgram.programId;
     const [daoTreasury] = getDaoTreasuryAddr(this.autocrat.programId, dao);
     const { baseVault, quoteVault, passAmm, failAmm } = this.getProposalPdas(
       proposal,

futarchy-ts/src/utils/index.ts

@@ -3,6 +3,7 @@ export * from "./pda";
 export * from "./priceMath";
 export * from "./metadata";
 export * from "./cu";
+export * from "./instruction";
 
 import { AccountMeta, ComputeBudgetProgram, PublicKey } from "@solana/web3.js";
 

futarchy-ts/src/utils/instruction.ts

@@ -0,0 +1,16 @@
+import * as anchor from "@coral-xyz/anchor";
+import { TransactionInstruction } from "@solana/web3.js";
+
+export class InstructionUtils {
+  public static async getInstructions(
+    ...methodBuilders: any[]
+  ): Promise<TransactionInstruction[]> {
+    let instructions: TransactionInstruction[] = [];
+
+    for (const methodBuilder of methodBuilders) {
+      instructions.push(...(await methodBuilder.transaction()).instructions);
+    }
+
+    return instructions;
+  }
+}