@zemyth/raise-sdk 0.1.7 → 0.2.0

package/src/instructions/index.ts

@@ -10,6 +10,7 @@ import { PublicKey, Keypair, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RENT_PUBKEY, SYS
 import {
   getProjectPDA,
   getEscrowPDA,
+  getEscrowTokenAccountPDA,
   getMilestonePDA,
   getInvestmentPDA,
   getVotePDA,
@@ -379,8 +380,10 @@ export async function approveProject(
   const lpUsdcVaultPda = getLpUsdcVaultPDA(projectPda, program.programId);
   const futureRoundTokenVaultPda = getFutureRoundTokenVaultPDA(projectPda, program.programId);
   const futureRoundVaultPda = getFutureRoundVaultPDA(projectPda, program.programId);
+  const escrowPda = getEscrowPDA(args.projectId, program.programId);
+  const escrowTokenAccountPda = getEscrowTokenAccountPDA(projectPda, program.programId);
 
-  // Request 400k CUs - this instruction creates 10 accounts + 7 CPIs + 5 events
+  // Request 400k CUs - this instruction creates 11 accounts + 7 CPIs + 5 events
   const computeBudgetIx = ComputeBudgetProgram.setComputeUnitLimit({
     units: 400_000,
   });
@@ -401,6 +404,8 @@ export async function approveProject(
       futureRoundTokenVault: futureRoundTokenVaultPda,
       futureRoundVault: futureRoundVaultPda,
       usdcMint: args.usdcMint,
+      escrowPda,
+      escrowTokenAccount: escrowTokenAccountPda,
       authority: adminPubkey,
       payer: adminPubkey,
     })
@@ -584,11 +589,14 @@ export async function claimMilestoneFunds(
   const lpUsdcVaultPda = getLpUsdcVaultPDA(projectPda, program.programId);
 
   // For non-final milestones, derive next milestone PDA if not provided
+  const isFinal = args.nextMilestoneDeadline.eq(new BN(0));
   const nextMilestonePda = args.nextMilestonePda ??
-    (args.nextMilestoneDeadline.gt(new BN(0))
+    (!isFinal
       ? getMilestonePDA(projectPda, args.milestoneIndex + 1, program.programId)
       : null);
 
+  // Pass null for optional next_milestone on final milestone —
+  // Anchor's resolveOptionals converts null → programId sentinel for Option<Account> = None
   return getMethods(program)
     .claimMilestoneFunds({ nextMilestoneDeadline: args.nextMilestoneDeadline })
     .accountsPartial({
@@ -601,7 +609,7 @@ export async function claimMilestoneFunds(
       tokenVault: tokenVaultPda,
       tokenomics: tokenomicsPda,
       lpUsdcVault: lpUsdcVaultPda,
-      nextMilestone: nextMilestonePda,
+      nextMilestone: nextMilestonePda,  // null for final → Anchor uses programId sentinel
       systemProgram: SystemProgram.programId,
       tokenProgram: TOKEN_PROGRAM_ID,
     })

package/src/pdas/index.ts

@@ -57,6 +57,24 @@ export function getEscrowPDA(projectId: BN | number | string, programId: PublicK
   return pda;
 }
 
+/**
+ * Derive Escrow Token Account PDA from project PDA
+ *
+ * This is the USDC token account owned by the escrow PDA,
+ * created during approveProject.
+ *
+ * @param projectPda - Project account PDA
+ * @param programId - Raise program ID
+ * @returns Escrow token account PDA
+ */
+export function getEscrowTokenAccountPDA(projectPda: PublicKey, programId: PublicKey): PublicKey {
+  const [pda] = PublicKey.findProgramAddressSync(
+    [Buffer.from(SEEDS.ESCROW_TOKEN), projectPda.toBuffer()],
+    programId
+  );
+  return pda;
+}
+
 /**
  * Derive Milestone PDA from project PDA and milestone index
  *