@metadaoproject/futarchy 0.6.0-alpha.0 → 0.6.0-alpha.10

package/dist/v0.3/utils/metadata.js

@@ -7,11 +7,7 @@ export const assetImageMap = {
     pUSDC: "https://arweave.net/e4IO7F59F_RKCiuB--_ABPot7Qh1yFsGkWzVhcXuKDU",
 };
 // Upload some JSON, returning its URL
-export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol
-//   proposal: BN,
-//   conditionalToken: string,
-//   image: string
-) => {
+export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol) => {
     // use bundlr, targeting arweave
     const umi = createUmi(connection);
     umi.use(bundlrUploader());

package/dist/v0.3/utils/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.3/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc;AACd,kBAAkB;AAClB,8BAA8B;AAC9B,kBAAkB;EACD,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.3/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc,EAIG,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/v0.4/utils/metadata.js

@@ -7,11 +7,7 @@ export const assetImageMap = {
     pUSDC: "https://arweave.net/e4IO7F59F_RKCiuB--_ABPot7Qh1yFsGkWzVhcXuKDU",
 };
 // Upload some JSON, returning its URL
-export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol
-//   proposal: BN,
-//   conditionalToken: string,
-//   image: string
-) => {
+export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol) => {
     // use bundlr, targeting arweave
     const umi = createUmi(connection);
     umi.use(bundlrUploader());

package/dist/v0.4/utils/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.4/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc;AACd,kBAAkB;AAClB,8BAA8B;AAC9B,kBAAkB;EACD,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.4/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc,EAIG,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/v0.5/LaunchpadClient.js

@@ -1,7 +1,7 @@
 import { Program } from "@coral-xyz/anchor";
 import { PublicKey, } from "@solana/web3.js";
 import { IDL as LaunchpadIDL } from "./types/launchpad.js";
-import { LAUNCHPAD_PROGRAM_ID, RAYDIUM_AUTHORITY, LOW_FEE_RAYDIUM_CONFIG, RAYDIUM_CP_SWAP_PROGRAM_ID, RAYDIUM_CREATE_POOL_FEE_RECEIVE, DEVNET_RAYDIUM_CP_SWAP_PROGRAM_ID, DEVNET_RAYDIUM_AUTHORITY, DEVNET_LOW_FEE_RAYDIUM_CONFIG, DEVNET_RAYDIUM_CREATE_POOL_FEE_RECEIVE, MPL_TOKEN_METADATA_PROGRAM_ID, MAINNET_USDC, DEVNET_USDC, SQUADS_PROGRAM_ID, SQUADS_PROGRAM_CONFIG, SQUADS_PROGRAM_CONFIG_TREASURY, } from "./constants.js";
+import { LAUNCHPAD_PROGRAM_ID, RAYDIUM_AUTHORITY, LOW_FEE_RAYDIUM_CONFIG, RAYDIUM_CP_SWAP_PROGRAM_ID, RAYDIUM_CREATE_POOL_FEE_RECEIVE, DEVNET_RAYDIUM_CP_SWAP_PROGRAM_ID, DEVNET_RAYDIUM_AUTHORITY, DEVNET_LOW_FEE_RAYDIUM_CONFIG, DEVNET_RAYDIUM_CREATE_POOL_FEE_RECEIVE, MPL_TOKEN_METADATA_PROGRAM_ID, MAINNET_USDC, DEVNET_USDC, SQUADS_PROGRAM_ID, SQUADS_PROGRAM_CONFIG, SQUADS_PROGRAM_CONFIG_TREASURY, DEVNET_SQUADS_PROGRAM_CONFIG_TREASURY, } from "./constants.js";
 import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, } from "@solana/spl-token";
 import BN from "bn.js";
 import { getDaoAddr, getEventAuthorityAddr, getFundingRecordAddr, getLaunchAddr, getLaunchSignerAddr, getLiquidityPoolAddr, getMetadataAddr, getRaydiumCpmmLpMintAddr, } from "./utils/pda.js";
@@ -102,6 +102,9 @@ export class LaunchpadClient {
     }
     completeLaunchIx(launch, quoteMint, baseMint, isDevnet = false) {
         const USDC = isDevnet ? DEVNET_USDC : MAINNET_USDC;
+        const _SQUADS_PROGRAM_CONFIG_TREASURY = isDevnet
+            ? DEVNET_SQUADS_PROGRAM_CONFIG_TREASURY
+            : SQUADS_PROGRAM_CONFIG_TREASURY;
         const [launchSigner] = getLaunchSignerAddr(this.launchpad.programId, launch);
         const launchQuoteVault = getAssociatedTokenAddressSync(quoteMint, launchSigner, true);
         const launchBaseVault = getAssociatedTokenAddressSync(baseMint, launchSigner, true);
@@ -170,7 +173,7 @@ export class LaunchpadClient {
                 autocratEventAuthority,
                 squadsProgram: SQUADS_PROGRAM_ID,
                 squadsProgramConfig: SQUADS_PROGRAM_CONFIG,
-                squadsProgramConfigTreasury: SQUADS_PROGRAM_CONFIG_TREASURY,
+                squadsProgramConfigTreasury: _SQUADS_PROGRAM_CONFIG_TREASURY,
             },
             squadsMultisig: multisigPda,
             squadsMultisigVault: multisigVault,

package/dist/v0.5/LaunchpadClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"LaunchpadClient.js","sourceRoot":"","sources":["../../src/v0.5/LaunchpadClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LaunchpadClient.js","sourceRoot":"","sources":["../../src/v0.5/LaunchpadClient.ts"],"names":[],"mappings":"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"}

package/dist/v0.5/constants.d.ts

@@ -21,4 +21,5 @@ export declare const DEVNET_RAYDIUM_CREATE_POOL_FEE_RECEIVE: PublicKey;
 export declare const SQUADS_PROGRAM_CONFIG: PublicKey;
 export declare const SQUADS_PROGRAM_ID: PublicKey;
 export declare const SQUADS_PROGRAM_CONFIG_TREASURY: PublicKey;
+export declare const DEVNET_SQUADS_PROGRAM_CONFIG_TREASURY: PublicKey;
 export declare const PERMISSIONLESS_ACCOUNT: Keypair;

package/dist/v0.5/constants.js

@@ -26,6 +26,7 @@ export const DEVNET_RAYDIUM_CREATE_POOL_FEE_RECEIVE = new PublicKey("G11FKBRaAkH
 export const SQUADS_PROGRAM_CONFIG = new PublicKey("BSTq9w3kZwNwpBXJEvTZz2G9ZTNyKBvoSeXMvwb4cNZr");
 export const SQUADS_PROGRAM_ID = new PublicKey("SQDS4ep65T869zMMBKyuUq6aD6EgTu8psMjkvj52pCf");
 export const SQUADS_PROGRAM_CONFIG_TREASURY = new PublicKey("5DH2e3cJmFpyi6mk65EGFediunm4ui6BiKNUNrhWtD1b");
+export const DEVNET_SQUADS_PROGRAM_CONFIG_TREASURY = new PublicKey("HM5y4mz3Bt9JY9mr1hkyhnvqxSH4H2u2451j7Hc2dtvK");
 export const PERMISSIONLESS_ACCOUNT = Keypair.fromSecretKey(Uint8Array.from([
     249, 158, 188, 171, 243, 143, 1, 48, 87, 243, 209, 153, 144, 106, 23, 88,
     161, 209, 65, 217, 199, 121, 0, 250, 3, 203, 133, 138, 141, 112, 243, 38,

package/dist/v0.5/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/v0.5/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/v0.5/constants.ts"],"names":[],"mappings":"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"}

package/dist/v0.5/utils/metadata.js

@@ -7,11 +7,7 @@ export const assetImageMap = {
     pUSDC: "https://arweave.net/e4IO7F59F_RKCiuB--_ABPot7Qh1yFsGkWzVhcXuKDU",
 };
 // Upload some JSON, returning its URL
-export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol
-//   proposal: BN,
-//   conditionalToken: string,
-//   image: string
-) => {
+export const uploadConditionalTokenMetadataJson = async (connection, identityPlugin, proposalNumber, symbol) => {
     // use bundlr, targeting arweave
     const umi = createUmi(connection);
     umi.use(bundlrUploader());

package/dist/v0.5/utils/metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.5/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc;AACd,kBAAkB;AAClB,8BAA8B;AAC9B,kBAAkB;EACD,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/v0.5/utils/metadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AAErE,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAG1E,MAAM,CAAC,MAAM,aAAa,GAA2B;IACnD,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;IACxE,KAAK,EAAE,iEAAiE;CACzE,CAAC;AAEF,sCAAsC;AACtC,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,UAAsB,EACtB,cAAyB,EACzB,cAAsB,EACtB,MAAc,EAIG,EAAE;IACnB,gCAAgC;IAChC,MAAM,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1B,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAExB,OAAO,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC7B,IAAI,EAAE,YAAY,cAAc,KAAK,MAAM,EAAE;QAC7C,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC;QAC5B,MAAM;QACN,WAAW,EAAE,0CAA0C;KACxD,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/v0.6/FutarchyClient.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, Program } from "@coral-xyz/anchor";
-import { AccountInfo, AddressLookupTableAccount, PublicKey } from "@solana/web3.js";
+import { AccountInfo, AddressLookupTableAccount, PublicKey, Transaction, TransactionInstruction } from "@solana/web3.js";
 import { InitializeDaoParams, UpdateDaoParams } from "./types/index.js";
 import { Futarchy } from "./types/futarchy.js";
 import BN from "bn.js";
@@ -214,7 +214,7 @@ export declare class FutarchyClient {
     spotSwapIx({ dao, baseMint, quoteMint, swapType, inputAmount, minOutputAmount, trader, }: {
         dao: PublicKey;
         baseMint: PublicKey;
-        quoteMint: PublicKey;
+        quoteMint?: PublicKey;
         swapType: "buy" | "sell";
         inputAmount: BN;
         minOutputAmount?: BN;
@@ -318,6 +318,14 @@ export declare class FutarchyClient {
             name: "tokenProgram";
             isMut: false;
             isSigner: false;
+        }, {
+            name: "eventAuthority";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "program";
+            isMut: false;
+            isSigner: false;
         }];
         args: [{
             name: "params";
@@ -328,16 +336,17 @@ export declare class FutarchyClient {
     } & {
         name: "provideLiquidity";
     }>;
-    conditionalSwapIx({ dao, trader, payer, baseMint, quoteMint, proposal, market, swapType, inputAmount, }: {
+    conditionalSwapIx({ dao, trader, payer, baseMint, quoteMint, proposal, market, swapType, inputAmount, minOutputAmount, }: {
         dao: PublicKey;
         trader?: PublicKey;
         payer?: PublicKey;
         baseMint: PublicKey;
-        quoteMint: PublicKey;
+        quoteMint?: PublicKey;
         proposal: PublicKey;
         market: "pass" | "fail";
         swapType: "buy" | "sell";
         inputAmount: BN;
+        minOutputAmount: BN;
     }): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
         name: "conditionalSwap";
         accounts: [{
@@ -432,6 +441,14 @@ export declare class FutarchyClient {
             name: "tokenProgram";
             isMut: false;
             isSigner: false;
+        }, {
+            name: "eventAuthority";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "program";
+            isMut: false;
+            isSigner: false;
         }];
         args: [{
             name: "params";
@@ -442,8 +459,17 @@ export declare class FutarchyClient {
     } & {
         name: "conditionalSwap";
     }>;
-    initializeProposal(dao: PublicKey, descriptionUrl: string, squadsProposal: PublicKey): Promise<PublicKey>;
-    initializeProposalIx(descriptionUrl: string, squadsProposal: PublicKey, dao: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, question: PublicKey, proposer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
+    squadsProposalCreateTx({ dao, instructions, transactionIndex, payer, }: {
+        dao: PublicKey;
+        instructions: TransactionInstruction[];
+        transactionIndex: bigint;
+        payer?: PublicKey;
+    }): {
+        tx: Transaction;
+        squadsProposal: PublicKey;
+    };
+    initializeProposal(dao: PublicKey, squadsProposal: PublicKey): Promise<PublicKey>;
+    initializeProposalIx(squadsProposal: PublicKey, dao: PublicKey, baseMint: PublicKey, quoteMint: PublicKey, question: PublicKey, proposer?: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
         name: "initializeProposal";
         accounts: [{
             name: "proposal";
@@ -490,17 +516,127 @@ export declare class FutarchyClient {
             isMut: false;
             isSigner: false;
         }];
-        args: [{
-            name: "params";
-            type: {
-                defined: "InitializeProposalParams";
-            };
-        }];
+        args: [];
     } & {
         name: "initializeProposal";
     }>;
     finalizeProposal(proposal: PublicKey): Promise<string>;
-    finalizeProposalIx(proposal: PublicKey, squadsProposal: PublicKey, dao: PublicKey, daoToken: PublicKey, usdc: PublicKey, proposer: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
+    finalizeProposalIxV2({ squadsProposal, dao, baseMint, quoteMint, }: {
+        squadsProposal: PublicKey;
+        dao: PublicKey;
+        baseMint: PublicKey;
+        quoteMint?: PublicKey;
+    }): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
+        name: "finalizeProposal";
+        accounts: [{
+            name: "proposal";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "dao";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "question";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "squadsProposal";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "squadsMultisig";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "squadsMultisigProgram";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "ammPassBaseVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "ammPassQuoteVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "ammFailBaseVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "ammFailQuoteVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "ammBaseVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "ammQuoteVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "vaultProgram";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "vaultEventAuthority";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "tokenProgram";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "quoteVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "quoteVaultUnderlyingTokenAccount";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "passQuoteMint";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "failQuoteMint";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "passBaseMint";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "failBaseMint";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "baseVault";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "baseVaultUnderlyingTokenAccount";
+            isMut: true;
+            isSigner: false;
+        }, {
+            name: "eventAuthority";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "program";
+            isMut: false;
+            isSigner: false;
+        }];
+        args: [];
+    } & {
+        name: "finalizeProposal";
+    }>;
+    /**
+     * @deprecated use `finalizeProposalIxV2` instead
+     */
+    finalizeProposalIx(proposal: PublicKey, squadsProposal: PublicKey, dao: PublicKey, daoToken: PublicKey, usdc: PublicKey): import("@coral-xyz/anchor/dist/cjs/program/namespace/methods.js").MethodsBuilder<Futarchy, {
         name: "finalizeProposal";
         accounts: [{
             name: "proposal";
@@ -741,6 +877,14 @@ export declare class FutarchyClient {
             name: "tokenProgram";
             isMut: false;
             isSigner: false;
+        }, {
+            name: "eventAuthority";
+            isMut: false;
+            isSigner: false;
+        }, {
+            name: "program";
+            isMut: false;
+            isSigner: false;
         }];
         args: [];
     } & {

package/dist/v0.6/FutarchyClient.js

@@ -1,14 +1,15 @@
 import { Program } from "@coral-xyz/anchor";
-import { ComputeBudgetProgram, PublicKey, SystemProgram, } from "@solana/web3.js";
+import { ComputeBudgetProgram, PublicKey, SystemProgram, Transaction, } from "@solana/web3.js";
 // import { Autocrat, IDL as AutocratIDL } from "./types/autocrat.js";
 import { IDL as FutarchyIDL } from "./types/futarchy.js";
 import BN from "bn.js";
-import { AUTOCRAT_PROGRAM_ID, CONDITIONAL_VAULT_PROGRAM_ID, MAINNET_USDC, SQUADS_PROGRAM_CONFIG, SQUADS_PROGRAM_CONFIG_TREASURY, SQUADS_PROGRAM_ID, } from "./constants.js";
-import { InstructionUtils, getConditionalTokenMintAddr, getDaoAddr, getEventAuthorityAddr, getProposalAddr, getQuestionAddr, getVaultAddr, } from "./utils/index.js";
+import { FUTARCHY_PROGRAM_ID, CONDITIONAL_VAULT_PROGRAM_ID, MAINNET_USDC, PERMISSIONLESS_ACCOUNT, SQUADS_PROGRAM_CONFIG, SQUADS_PROGRAM_CONFIG_TREASURY, SQUADS_PROGRAM_ID, } from "./constants.js";
+import { InstructionUtils, getConditionalTokenMintAddr, getDaoAddr, getEventAuthorityAddr, getProposalAddr, getProposalAddrV2, getQuestionAddr, getVaultAddr, } from "./utils/index.js";
 import { ConditionalVaultClient } from "./ConditionalVaultClient.js";
 import { createAssociatedTokenAccountIdempotentInstruction, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, } from "@solana/spl-token";
 import { sha256 } from "@noble/hashes/sha256";
 import * as multisig from "@sqds/multisig";
+import { TransactionMessage } from "@solana/web3.js";
 export class FutarchyClient {
     provider;
     autocrat;
@@ -26,7 +27,7 @@ export class FutarchyClient {
     static createClient(createAutocratClientParams) {
         let { provider, autocratProgramId, conditionalVaultProgramId } = createAutocratClientParams;
         const luts = [];
-        return new FutarchyClient(provider, autocratProgramId || AUTOCRAT_PROGRAM_ID, conditionalVaultProgramId || CONDITIONAL_VAULT_PROGRAM_ID, luts);
+        return new FutarchyClient(provider, autocratProgramId || FUTARCHY_PROGRAM_ID, conditionalVaultProgramId || CONDITIONAL_VAULT_PROGRAM_ID, luts);
     }
     getProgramId() {
         return this.autocrat.programId;
@@ -125,7 +126,7 @@ export class FutarchyClient {
             ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }),
         ]);
     }
-    spotSwapIx({ dao, baseMint, quoteMint, swapType, inputAmount, minOutputAmount = new BN(0), trader = this.provider.publicKey, }) {
+    spotSwapIx({ dao, baseMint, quoteMint = MAINNET_USDC, swapType, inputAmount, minOutputAmount = new BN(0), trader = this.provider.publicKey, }) {
         return this.autocrat.methods
             .spotSwap({
             swapType: swapType === "buy" ? { buy: {} } : { sell: {} },
@@ -146,7 +147,6 @@ export class FutarchyClient {
         ]);
     }
     provideLiquidityIx({ dao, baseMint, quoteMint, quoteAmount, maxBaseAmount, minLiquidity = new BN(0), positionAuthority = this.provider.publicKey, liquidityProvider = this.provider.publicKey, }) {
-        console.log(positionAuthority);
         const ammPosition = PublicKey.findProgramAddressSync([
             Buffer.from("amm_position"),
             dao.toBuffer(),
@@ -175,7 +175,7 @@ export class FutarchyClient {
             createAssociatedTokenAccountIdempotentInstruction(this.provider.publicKey, getAssociatedTokenAddressSync(quoteMint, liquidityProvider, true), liquidityProvider, quoteMint),
         ]);
     }
-    conditionalSwapIx({ dao, trader = this.provider.publicKey, payer = this.provider.publicKey, baseMint, quoteMint, proposal, market, swapType, inputAmount, }) {
+    conditionalSwapIx({ dao, trader = this.provider.publicKey, payer = this.provider.publicKey, baseMint, quoteMint = MAINNET_USDC, proposal, market, swapType, inputAmount, minOutputAmount, }) {
         const { passBaseMint, passQuoteMint, failBaseMint, failQuoteMint, baseVault, quoteVault, question, } = this.getProposalPdas(proposal, baseMint, quoteMint, dao);
         let inputMint, outputMint;
         if (market == "pass" && swapType == "buy") {
@@ -202,7 +202,7 @@ export class FutarchyClient {
             market: market == "pass" ? { pass: {} } : { fail: {} },
             swapType: swapType == "buy" ? { buy: {} } : { sell: {} },
             inputAmount,
-            minOutputAmount: new BN(0),
+            minOutputAmount,
         })
             .accounts({
             dao,
@@ -231,7 +231,36 @@ export class FutarchyClient {
             createAssociatedTokenAccountIdempotentInstruction(payer, getAssociatedTokenAddressSync(outputMint, trader, true), trader, outputMint),
         ]);
     }
-    async initializeProposal(dao, descriptionUrl, squadsProposal) {
+    squadsProposalCreateTx({ dao, instructions, transactionIndex, payer = this.provider.publicKey, }) {
+        const multisigPda = multisig.getMultisigPda({ createKey: dao })[0];
+        const transactionMessage = new TransactionMessage({
+            payerKey: payer,
+            recentBlockhash: "", // this doesn't get used
+            instructions,
+        });
+        const vaultTxCreate = multisig.instructions.vaultTransactionCreate({
+            multisigPda,
+            transactionIndex,
+            creator: PERMISSIONLESS_ACCOUNT.publicKey,
+            rentPayer: payer,
+            vaultIndex: 0,
+            ephemeralSigners: 0,
+            transactionMessage,
+        });
+        const proposalCreate = multisig.instructions.proposalCreate({
+            multisigPda,
+            transactionIndex,
+            creator: PERMISSIONLESS_ACCOUNT.publicKey,
+            rentPayer: payer,
+        });
+        const [squadsProposal] = multisig.getProposalPda({
+            multisigPda,
+            transactionIndex: transactionIndex,
+        });
+        const tx = new Transaction().add(vaultTxCreate, proposalCreate);
+        return { tx, squadsProposal };
+    }
+    async initializeProposal(dao, squadsProposal) {
         const storedDao = await this.getDao(dao);
         let [proposal] = getProposalAddr(this.autocrat.programId, squadsProposal);
         await this.vaultClient.initializeQuestion(sha256(`Will ${proposal} pass?/FAIL/PASS`), proposal, 2);
@@ -241,21 +270,19 @@ export class FutarchyClient {
             .initializeVaultIx(question, storedDao.baseMint, 2)
             .postInstructions(await InstructionUtils.getInstructions(this.vaultClient.initializeVaultIx(question, storedDao.quoteMint, 2)))
             .rpc();
-        await this.initializeProposalIx(descriptionUrl, squadsProposal, dao, storedDao.baseMint, storedDao.quoteMint, question)
+        await this.initializeProposalIx(squadsProposal, dao, storedDao.baseMint, storedDao.quoteMint, question)
             .preInstructions([
             ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }),
         ])
             .rpc();
         return proposal;
     }
-    initializeProposalIx(descriptionUrl, squadsProposal, dao, baseMint, quoteMint, question, proposer = this.provider.publicKey) {
+    initializeProposalIx(squadsProposal, dao, baseMint, quoteMint, question, proposer = this.provider.publicKey) {
         let [proposal] = getProposalAddr(this.autocrat.programId, squadsProposal);
         const { baseVault, quoteVault, passBaseMint, passQuoteMint, failBaseMint, failQuoteMint, } = this.getProposalPdas(proposal, baseMint, quoteMint, dao);
         let [futarchyAmm] = PublicKey.findProgramAddressSync([Buffer.from("futarchy_amm")], this.getProgramId());
         return this.autocrat.methods
-            .initializeProposal({
-            descriptionUrl,
-        })
+            .initializeProposal()
             .accounts({
             question,
             proposal,
@@ -275,9 +302,16 @@ export class FutarchyClient {
     async finalizeProposal(proposal) {
         let storedProposal = await this.getProposal(proposal);
         let storedDao = await this.getDao(storedProposal.dao);
-        return this.finalizeProposalIx(proposal, storedProposal.squadsProposal, storedProposal.dao, storedDao.baseMint, storedDao.quoteMint, storedProposal.proposer).rpc();
+        return this.finalizeProposalIx(proposal, storedProposal.squadsProposal, storedProposal.dao, storedDao.baseMint, storedDao.quoteMint).rpc();
+    }
+    finalizeProposalIxV2({ squadsProposal, dao, baseMint, quoteMint = MAINNET_USDC, }) {
+        const [proposal] = getProposalAddrV2({ squadsProposal });
+        return this.finalizeProposalIx(proposal, squadsProposal, dao, baseMint, quoteMint);
     }
-    finalizeProposalIx(proposal, squadsProposal, dao, daoToken, usdc, proposer) {
+    /**
+     * @deprecated use `finalizeProposalIxV2` instead
+     */
+    finalizeProposalIx(proposal, squadsProposal, dao, daoToken, usdc) {
         let vaultProgramId = this.vaultClient.vaultProgram.programId;
         const multisigPda = multisig.getMultisigPda({ createKey: dao })[0];
         const { question, quoteVault, passBaseMint, passQuoteMint, failBaseMint, failQuoteMint, baseVault, } = this.getProposalPdas(proposal, daoToken, usdc, dao);
@@ -286,7 +320,6 @@ export class FutarchyClient {
             .finalizeProposal()
             .accounts({
             proposal,
-            // futarchyAmm,
             dao,
             squadsProposal,
             squadsMultisig: multisigPda,
@@ -306,8 +339,6 @@ export class FutarchyClient {
             ammBaseVault: getAssociatedTokenAddressSync(daoToken, dao, true),
             baseVault,
             baseVaultUnderlyingTokenAccount: getAssociatedTokenAddressSync(daoToken, baseVault, true),
-            // baseVault,
-            // quoteVault,
             vaultProgram: this.vaultClient.vaultProgram.programId,
             vaultEventAuthority,
         })
@@ -315,37 +346,6 @@ export class FutarchyClient {
             ComputeBudgetProgram.setComputeUnitLimit({ units: 300_000 }),
         ]);
     }
-    // async executeProposal(proposal: PublicKey) {
-    //   let storedProposal = await this.getProposal(proposal);
-    //   return this.executeProposalIx(
-    //     proposal,
-    //     storedProposal.dao,
-    //     storedProposal.instruction
-    //   ).rpc();
-    // }
-    // executeProposalIx(proposal: PublicKey, dao: PublicKey, instruction: any) {
-    //   const [daoTreasury] = getDaoTreasuryAddr(this.autocrat.programId, dao);
-    //   return this.autocrat.methods
-    //     .executeProposal()
-    //     .accounts({
-    //       proposal,
-    //       dao,
-    //       // daoTreasury,
-    //     })
-    //     .remainingAccounts(
-    //       instruction.accounts
-    //         .concat({
-    //           pubkey: instruction.programId,
-    //           isWritable: false,
-    //           isSigner: false,
-    //         })
-    //         .map((meta: AccountMeta) =>
-    //           meta.pubkey.equals(daoTreasury)
-    //             ? { ...meta, isSigner: false }
-    //             : meta
-    //         )
-    //     );
-    // }
     updateDaoIx({ dao, params }) {
         const multisigPda = multisig.getMultisigPda({ createKey: dao })[0];
         const squadsMultisigVault = multisig.getVaultPda({