@zemyth/raise-sdk 0.1.7 → 0.3.0

package/dist/instructions/index.d.cts

@@ -634,6 +634,8 @@ declare function claimSubAllocationTokens(program: AnyProgram, args: {
  */
 declare 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 */
@@ -659,6 +661,8 @@ declare function claimMilestoneInstantTokens(program: AnyProgram, args: {
  */
 declare 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 */

package/dist/instructions/index.d.ts

@@ -634,6 +634,8 @@ declare function claimSubAllocationTokens(program: AnyProgram, args: {
  */
 declare 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 */
@@ -659,6 +661,8 @@ declare function claimMilestoneInstantTokens(program: AnyProgram, args: {
  */
 declare 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 */

package/dist/instructions/index.js

@@ -11,6 +11,7 @@ var SEEDS = {
   INVESTMENT: "investment",
   VOTE: "vote",
   ESCROW: "escrow",
+  ESCROW_TOKEN: "escrow_token",
   PIVOT: "pivot",
   TGE_ESCROW: "tge_escrow",
   ADMIN_CONFIG: "admin-config",
@@ -47,6 +48,13 @@ function getEscrowPDA(projectId, programId) {
   );
   return pda;
 }
+function getEscrowTokenAccountPDA(projectPda, programId) {
+  const [pda] = PublicKey.findProgramAddressSync(
+    [Buffer.from(SEEDS.ESCROW_TOKEN), projectPda.toBuffer()],
+    programId
+  );
+  return pda;
+}
 function getMilestonePDA(projectPda, milestoneIndex, programId) {
   const [pda] = PublicKey.findProgramAddressSync(
     [
@@ -226,18 +234,6 @@ function getSubAllocationVestingPDA(projectPda, subAllocationId, programId) {
   );
   return pda;
 }
-function getInvestorMilestoneVestingPDA(projectPda, milestoneIndex, investmentPda, programId) {
-  const [pda] = PublicKey.findProgramAddressSync(
-    [
-      Buffer.from("investor_ms_vesting"),
-      projectPda.toBuffer(),
-      Buffer.from([milestoneIndex]),
-      investmentPda.toBuffer()
-    ],
-    programId
-  );
-  return pda;
-}
 function getFounderMilestoneVestingPDA(projectPda, milestoneIndex, programId) {
   const [pda] = PublicKey.findProgramAddressSync(
     [
@@ -459,6 +455,8 @@ async function approveProject(program, args, admin) {
   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);
   const computeBudgetIx = ComputeBudgetProgram.setComputeUnitLimit({
     units: 4e5
   });
@@ -476,6 +474,8 @@ async function approveProject(program, args, admin) {
     futureRoundTokenVault: futureRoundTokenVaultPda,
     futureRoundVault: futureRoundVaultPda,
     usdcMint: args.usdcMint,
+    escrowPda,
+    escrowTokenAccount: escrowTokenAccountPda,
     authority: adminPubkey,
     payer: adminPubkey
   }).preInstructions([computeBudgetIx]);
@@ -549,7 +549,8 @@ async function claimMilestoneFunds(program, args, founder) {
   const tokenVaultPda = getTokenVaultPDA(projectPda, program.programId);
   const tokenomicsPda = getTokenomicsPDA(projectPda, program.programId);
   const lpUsdcVaultPda = getLpUsdcVaultPDA(projectPda, program.programId);
-  const nextMilestonePda = args.nextMilestonePda ?? (args.nextMilestoneDeadline.gt(new BN(0)) ? getMilestonePDA(projectPda, args.milestoneIndex + 1, program.programId) : null);
+  const isFinal = args.nextMilestoneDeadline.eq(new BN(0));
+  const nextMilestonePda = args.nextMilestonePda ?? (!isFinal ? getMilestonePDA(projectPda, args.milestoneIndex + 1, program.programId) : null);
   return getMethods(program).claimMilestoneFunds({ nextMilestoneDeadline: args.nextMilestoneDeadline }).accountsPartial({
     milestone: milestonePda,
     project: projectPda,
@@ -561,6 +562,7 @@ async function claimMilestoneFunds(program, args, founder) {
     tokenomics: tokenomicsPda,
     lpUsdcVault: lpUsdcVaultPda,
     nextMilestone: nextMilestonePda,
+    // null for final → Anchor uses programId sentinel
     systemProgram: SystemProgram.programId,
     tokenProgram: TOKEN_PROGRAM_ID
   }).rpc();
@@ -1141,7 +1143,7 @@ async function claimMilestoneInstantTokens(program, args, investor) {
   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);
   const investorNftAccount = getAssociatedTokenAddressSync(
@@ -1172,7 +1174,7 @@ async function claimMilestoneVestedTokens(program, args, investor) {
   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);
   const investorNftAccount = getAssociatedTokenAddressSync(