@zemyth/raise-sdk 0.1.6 → 0.2.0

package/dist/instructions/index.cjs

@@ -13,6 +13,7 @@ var SEEDS = {
   INVESTMENT: "investment",
   VOTE: "vote",
   ESCROW: "escrow",
+  ESCROW_TOKEN: "escrow_token",
   PIVOT: "pivot",
   TGE_ESCROW: "tge_escrow",
   ADMIN_CONFIG: "admin-config",
@@ -49,6 +50,13 @@ function getEscrowPDA(projectId, programId) {
   );
   return pda;
 }
+function getEscrowTokenAccountPDA(projectPda, programId) {
+  const [pda] = web3_js.PublicKey.findProgramAddressSync(
+    [Buffer.from(SEEDS.ESCROW_TOKEN), projectPda.toBuffer()],
+    programId
+  );
+  return pda;
+}
 function getMilestonePDA(projectPda, milestoneIndex, programId) {
   const [pda] = web3_js.PublicKey.findProgramAddressSync(
     [
@@ -447,7 +455,8 @@ async function submitForApproval(program, projectId, founder) {
     founder
   }).rpc();
 }
-async function approveProject(program, args, adminKeypair) {
+async function approveProject(program, args, admin) {
+  const adminPubkey = admin instanceof web3_js.Keypair ? admin.publicKey : admin;
   const projectPda = getProjectPDA(args.projectId, program.programId);
   const tokenomicsPda = getTokenomicsPDA(projectPda, program.programId);
   const tokenVaultPda = getTokenVaultPDA(projectPda, program.programId);
@@ -460,10 +469,12 @@ async function approveProject(program, args, adminKeypair) {
   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 = web3_js.ComputeBudgetProgram.setComputeUnitLimit({
     units: 4e5
   });
-  return getMethods(program).approveProject().accountsPartial({
+  let builder = getMethods(program).approveProject().accountsPartial({
     project: projectPda,
     tokenomics: tokenomicsPda,
     tokenVault: tokenVaultPda,
@@ -477,9 +488,15 @@ async function approveProject(program, args, adminKeypair) {
     futureRoundTokenVault: futureRoundTokenVaultPda,
     futureRoundVault: futureRoundVaultPda,
     usdcMint: args.usdcMint,
-    authority: adminKeypair.publicKey,
-    payer: adminKeypair.publicKey
-  }).preInstructions([computeBudgetIx]).signers([adminKeypair]).rpc();
+    escrowPda,
+    escrowTokenAccount: escrowTokenAccountPda,
+    authority: adminPubkey,
+    payer: adminPubkey
+  }).preInstructions([computeBudgetIx]);
+  if (admin instanceof web3_js.Keypair) {
+    builder = builder.signers([admin]);
+  }
+  return builder.rpc();
 }
 async function createMilestone(program, args, founder) {
   const projectPda = getProjectPDA(args.projectId, program.programId);
@@ -546,7 +563,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 anchor.BN(0)) ? getMilestonePDA(projectPda, args.milestoneIndex + 1, program.programId) : null);
+  const isFinal = args.nextMilestoneDeadline.eq(new anchor.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,
@@ -558,6 +576,7 @@ async function claimMilestoneFunds(program, args, founder) {
     tokenomics: tokenomicsPda,
     lpUsdcVault: lpUsdcVaultPda,
     nextMilestone: nextMilestonePda,
+    // null for final → Anchor uses programId sentinel
     systemProgram: web3_js.SystemProgram.programId,
     tokenProgram: splToken.TOKEN_PROGRAM_ID
   }).rpc();