feat: fix merge

src/langchain/squads/execute_proposal.ts

@@ -0,0 +1,38 @@
+import { Tool } from "langchain/tools";
+import { SolanaAgentKit } from "../../agent";
+
+export class SolanaExecuteProposal2by2Multisig extends Tool {
+  name = "execute_proposal_2by2_multisig";
+  description = `Execute a proposal/transaction to transfer funds from a 2-of-2 multisig account on Solana with the user and the agent, where both approvals will be required to run the transactions.
+  
+  If proposalIndex is not provided, the latest index will automatically be fetched and used.
+
+  Inputs (JSON string):
+  - proposalIndex: number, the index of the proposal (optional).`;
+
+  constructor(private solanaKit: SolanaAgentKit) {
+    super();
+  }
+
+  protected async _call(input: string): Promise<string> {
+    try {
+      const inputFormat = JSON.parse(input);
+      const proposalIndex = inputFormat.proposalIndex ?? undefined;
+
+      const tx = await this.solanaKit.executeMultisigTransaction(proposalIndex);
+
+      return JSON.stringify({
+        status: "success",
+        message: "Proposal executed successfully",
+        transaction: tx,
+        proposalIndex: proposalIndex.toString(),
+      });
+    } catch (error: any) {
+      return JSON.stringify({
+        status: "error",
+        message: error.message,
+        code: error.code || "EXECUTE_PROPOSAL_2BY2_MULTISIG_ERROR",
+      });
+    }
+  }
+}