feat/ix decoder 2

lib/client/indexer/proposals.ts

@@ -431,6 +431,8 @@ export class FutarchyIndexerProposalsClient implements FutarchyProposalsClient {
 
     const proposal = proposals[0];
 
+    const rpcProposal =
+      await this.rpcProposalsClient.autocratClient.getProposal(proposalAcct);
     const relatedProtocol = this.protocolMap.get(
       proposal.dao.program.program_acct
     );
@@ -473,7 +475,7 @@ export class FutarchyIndexerProposalsClient implements FutarchyProposalsClient {
         quoteVault: new PublicKey(proposal.quote_vault ?? 5),
         descriptionUrl: proposal.description_url ?? "",
         //TODO pass in actual instruction...
-        instruction: {} as any,
+        instruction: rpcProposal.instruction,
         number: proposal.proposal_num,
         openbookFailMarket: new PublicKey(proposal.fail_market_acct ?? 5),
         openbookPassMarket: new PublicKey(proposal.pass_market_acct ?? 5),

lib/client/rpc/proposals/createProposal.ts

@@ -8,7 +8,6 @@ import {
   takerFee,
   twapMarketBuffer
 } from "@/constants";
-import { buildMemoInstruction, buildTransferInstruction } from "@/instructions";
 import {
   TransactionSender,
   createVersionedTransaction
@@ -54,6 +53,8 @@ import { OpenbookTwapV0_2 } from "@/idl/openbook_twap_v0.2";
 import { CreateProposal, FutarchyProposalsClient } from "@/client";
 import { ConditionalVault as Conditional_vault_v0_2 } from "@/idl/conditional_vault_v0.2";
 import { Observable } from "rxjs";
+import { buildMemoInstruction } from "@/instructions/builder/memo";
+import { buildTransferInstruction } from "@/instructions/builder/transfer";
 
 export class CreateProposalClient implements CreateProposal {
   private proposalsClient: FutarchyProposalsClient;

lib/client/rpc/proposals/proposals.ts

@@ -49,7 +49,7 @@ import { CreateProposalClient } from "./createProposal";
 import { autocratVersionToConditionalVaultMap } from "@/constants";
 
 export class FutarchyRPCProposalsClient implements FutarchyProposalsClient {
-  private rpcProvider: AnchorProvider;
+  public rpcProvider: AnchorProvider;
   private futarchyProtocols: FutarchyProtocol[];
   public transactionSender: TransactionSender | undefined;
   private finalizeProposalClient: FinalizeProposalClient;

lib/idl/memo.ts

@@ -0,0 +1,16 @@
+export const IDL = {
+    version: '3.0.1',
+    name: 'spl_memo',
+    instructions: [
+      {
+        name: 'addMemo',
+        accounts: [],
+        args: [
+          {
+            name: 'memo',
+            type: 'string',
+          },
+        ],
+      },
+    ],
+  };