@zemyth/raise-sdk 0.1.7 → 0.3.0

package/src/client.ts

@@ -130,6 +130,10 @@ export class RaiseClient {
     return pdas.getEscrowPDA(projectId, this.programId);
   }
 
+  getEscrowTokenAccountPDA(projectPda: PublicKey): PublicKey {
+    return pdas.getEscrowTokenAccountPDA(projectPda, this.programId);
+  }
+
   getMilestonePDA(projectPda: PublicKey, milestoneIndex: number): PublicKey {
     return pdas.getMilestonePDA(projectPda, milestoneIndex, this.programId);
   }
@@ -175,6 +179,7 @@ export class RaiseClient {
   }
 
   // Per-Milestone Vesting PDAs
+  /** @deprecated Use {@link getRoundInvestorMilestoneVestingPDA} instead */
   getInvestorMilestoneVestingPDA(projectPda: PublicKey, milestoneIndex: number, investmentPda: PublicKey): PublicKey {
     return pdas.getInvestorMilestoneVestingPDA(projectPda, milestoneIndex, investmentPda, this.programId);
   }
@@ -251,8 +256,8 @@ export class RaiseClient {
     return accounts.fetchSubAllocationVesting(this.program, projectId, subAllocationId);
   }
 
-  async fetchInvestorMilestoneVesting(projectId: BN, milestoneIndex: number, nftMint: PublicKey) {
-    return accounts.fetchInvestorMilestoneVesting(this.program, projectId, milestoneIndex, nftMint);
+  async fetchInvestorMilestoneVesting(projectId: BN, roundNumber: number, milestoneIndex: number, nftMint: PublicKey) {
+    return accounts.fetchInvestorMilestoneVesting(this.program, projectId, roundNumber, milestoneIndex, nftMint);
   }
 
   async fetchFounderMilestoneVesting(projectId: BN, milestoneIndex: number) {
@@ -834,6 +839,7 @@ export class RaiseClient {
    */
   async claimMilestoneInstantTokens(args: {
     projectId: BN;
+    roundNumber: number;
     milestoneIndex: number;
     nftMint: PublicKey;
     investorTokenAccount: PublicKey;
@@ -858,6 +864,7 @@ export class RaiseClient {
    */
   async claimMilestoneVestedTokens(args: {
     projectId: BN;
+    roundNumber: number;
     milestoneIndex: number;
     nftMint: PublicKey;
     investorTokenAccount: PublicKey;

package/src/constants/index.ts

@@ -15,6 +15,7 @@ export const SEEDS = {
   INVESTMENT: 'investment',
   VOTE: 'vote',
   ESCROW: 'escrow',
+  ESCROW_TOKEN: 'escrow_token',
   PIVOT: 'pivot',
   PIVOT_PROPOSAL: 'pivot_proposal',
   TGE_ESCROW: 'tge_escrow',

package/src/index.ts

@@ -47,6 +47,7 @@ export {
 export {
   getProjectPDA,
   getEscrowPDA,
+  getEscrowTokenAccountPDA,
   getMilestonePDA,
   getInvestmentPDA,
   getVotePDA,

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,
@@ -31,7 +32,6 @@ import {
   getFounderVestingPDA,
   getSubAllocationVestingPDA,
   // Per-Milestone Vesting PDAs
-  getInvestorMilestoneVestingPDA,
   getFounderMilestoneVestingPDA,
   // Future Round PDAs
   getFutureRoundTokenVaultPDA,
@@ -379,8 +379,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 +403,8 @@ export async function approveProject(
       futureRoundTokenVault: futureRoundTokenVaultPda,
       futureRoundVault: futureRoundVaultPda,
       usdcMint: args.usdcMint,
+      escrowPda,
+      escrowTokenAccount: escrowTokenAccountPda,
       authority: adminPubkey,
       payer: adminPubkey,
     })
@@ -584,11 +588,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 +608,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,
     })
@@ -1990,6 +1997,8 @@ export async function claimMilestoneInstantTokens(
   program: AnyProgram,
   args: {
     projectId: BN;
+    /** Round number the investment belongs to */
+    roundNumber: number;
     /** Milestone index to claim instant tokens from */
     milestoneIndex: number;
     /** NFT mint that proves investment ownership */
@@ -2004,7 +2013,7 @@ export async function claimMilestoneInstantTokens(
   const milestonePda = getMilestonePDA(projectPda, args.milestoneIndex, program.programId);
   const investmentPda = getInvestmentPDA(projectPda, nftMintPubkey, program.programId);
   const tokenVaultPda = getTokenVaultPDA(projectPda, program.programId);
-  const vestingPda = getInvestorMilestoneVestingPDA(projectPda, args.milestoneIndex, investmentPda, program.programId);
+  const vestingPda = getRoundInvestorMilestoneVestingPDA(projectPda, args.roundNumber, args.milestoneIndex, investmentPda, program.programId);
   const investorVaultPda = getInvestorVaultPDA(projectPda, program.programId);
   const vaultAuthorityPda = getVaultAuthorityPDA(projectPda, program.programId);
 
@@ -2056,6 +2065,8 @@ export async function claimMilestoneVestedTokens(
   program: AnyProgram,
   args: {
     projectId: BN;
+    /** Round number the investment belongs to */
+    roundNumber: number;
     /** Milestone index to claim vested tokens from */
     milestoneIndex: number;
     /** NFT mint that proves investment ownership */
@@ -2070,7 +2081,7 @@ export async function claimMilestoneVestedTokens(
   const milestonePda = getMilestonePDA(projectPda, args.milestoneIndex, program.programId);
   const investmentPda = getInvestmentPDA(projectPda, nftMintPubkey, program.programId);
   const tokenVaultPda = getTokenVaultPDA(projectPda, program.programId);
-  const vestingPda = getInvestorMilestoneVestingPDA(projectPda, args.milestoneIndex, investmentPda, program.programId);
+  const vestingPda = getRoundInvestorMilestoneVestingPDA(projectPda, args.roundNumber, args.milestoneIndex, investmentPda, program.programId);
   const investorVaultPda = getInvestorVaultPDA(projectPda, program.programId);
   const vaultAuthorityPda = getVaultAuthorityPDA(projectPda, program.programId);
 

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
  *
@@ -487,6 +505,9 @@ export function getSubAllocationVestingPDA(
  * Derive InvestorMilestoneVesting PDA
  * Tracks investor vesting for a specific milestone with configurable schedules
  *
+ * @deprecated Use {@link getRoundInvestorMilestoneVestingPDA} instead, which includes the `roundNumber` seed
+ * for correct multi-round PDA derivation.
+ *
  * @param projectPda - Project account PDA
  * @param milestoneIndex - Milestone index
  * @param investmentPda - Investment account PDA