@zemyth/raise-sdk 0.1.6 → 0.2.0

package/dist/instructions/index.d.cts

@@ -138,7 +138,7 @@ declare function approveProject(program: AnyProgram, args: {
     projectId: BN;
     /** USDC mint address (for creating lp_usdc_vault) */
     usdcMint: PublicKey;
-}, adminKeypair: Keypair): Promise<string>;
+}, admin: PublicKey | Keypair): Promise<string>;
 /**
  * Create a milestone for a project
  *

package/dist/instructions/index.d.ts

@@ -138,7 +138,7 @@ declare function approveProject(program: AnyProgram, args: {
     projectId: BN;
     /** USDC mint address (for creating lp_usdc_vault) */
     usdcMint: PublicKey;
-}, adminKeypair: Keypair): Promise<string>;
+}, admin: PublicKey | Keypair): Promise<string>;
 /**
  * Create a milestone for a project
  *

package/dist/instructions/index.js

@@ -1,5 +1,5 @@
 import { BN } from '@coral-xyz/anchor';
-import { PublicKey, ComputeBudgetProgram, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
+import { PublicKey, Keypair, ComputeBudgetProgram, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
 import { getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
 // src/instructions/index.ts
@@ -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(
     [
@@ -445,7 +453,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 Keypair ? admin.publicKey : admin;
   const projectPda = getProjectPDA(args.projectId, program.programId);
   const tokenomicsPda = getTokenomicsPDA(projectPda, program.programId);
   const tokenVaultPda = getTokenVaultPDA(projectPda, program.programId);
@@ -458,10 +467,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 = ComputeBudgetProgram.setComputeUnitLimit({
     units: 4e5
   });
-  return getMethods(program).approveProject().accountsPartial({
+  let builder = getMethods(program).approveProject().accountsPartial({
     project: projectPda,
     tokenomics: tokenomicsPda,
     tokenVault: tokenVaultPda,
@@ -475,9 +486,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 Keypair) {
+    builder = builder.signers([admin]);
+  }
+  return builder.rpc();
 }
 async function createMilestone(program, args, founder) {
   const projectPda = getProjectPDA(args.projectId, program.programId);
@@ -544,7 +561,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,
@@ -556,6 +574,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();