@unifiedflow/unified-flow-sdk 1.0.2 → 1.0.4

package/dist/client.js

@@ -3,28 +3,82 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnifiedFlowClient = exports.SOL_USD_FEED = exports.CHAINLINK_PROGRAM_ID = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const kit_1 = require("@solana/kit");
+const client_1 = require("@solana/client");
+const buffer_1 = require("buffer");
 const pda_1 = require("./pda");
+// ─── Constants ────────────────────────────────────────────────────────────────
 exports.CHAINLINK_PROGRAM_ID = new web3_js_1.PublicKey("HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny");
 exports.SOL_USD_FEED = new web3_js_1.PublicKey("99B2bTijsU6f1GCT73HmdR7HCFFjGMBcPZY6jZ96ynrR");
+// ─── Helpers ──────────────────────────────────────────────────────────────────
+function getAnchorWallet(session) {
+    return {
+        publicKey: new web3_js_1.PublicKey(session.account.address.toString()),
+        signTransaction: async (transaction) => {
+            if (session.signTransaction) {
+                return (await session.signTransaction(transaction));
+            }
+            return transaction;
+        },
+        signAllTransactions: async (transactions) => {
+            if (session.signTransaction) {
+                return (await Promise.all(transactions.map((tx) => session.signTransaction(tx))));
+            }
+            return transactions;
+        },
+    };
+}
+/**
+ * Build, sign, and send a kit transaction message.
+ * Mirrors the walletSignerMode pattern from withdraw.ts.
+ */
+async function signAndSend(transactionMessage, walletSignerMode, connection, commitment = "confirmed") {
+    if (walletSignerMode === "send") {
+        const sentSignature = await (0, kit_1.signAndSendTransactionMessageWithSigners)(transactionMessage);
+        return sentSignature.toString();
+    }
+    const signedTransaction = await (0, kit_1.signTransactionMessageWithSigners)(transactionMessage);
+    const encodedTransaction = (0, client_1.transactionToBase64)(signedTransaction);
+    const rawTransaction = buffer_1.Buffer.from(encodedTransaction, "base64");
+    const versionedTransaction = web3_js_1.VersionedTransaction.deserialize(rawTransaction);
+    const simulation = await connection.simulateTransaction(versionedTransaction, {
+        commitment,
+        sigVerify: false,
+        replaceRecentBlockhash: false,
+    });
+    if (simulation.value.err) {
+        const logs = simulation.value.logs ?? [];
+        throw new Error(["Transaction simulation failed.", ...logs.slice(-6)].filter(Boolean).join("\n"));
+    }
+    return connection.sendRawTransaction(rawTransaction, {
+        skipPreflight: true,
+        maxRetries: 3,
+        preflightCommitment: commitment,
+    });
+}
+// ─── Client ───────────────────────────────────────────────────────────────────
 class UnifiedFlowClient {
-    constructor(program) {
+    constructor(program, wallet, connection, commitment = "confirmed") {
         this.program = program;
+        this.wallet = wallet;
+        this.connection = connection;
+        this.commitment = commitment;
+        const { signer, mode } = (0, client_1.createWalletTransactionSigner)(wallet);
+        this.kitSigner = signer;
+        this.walletSignerMode = mode;
     }
-    /**
-     * Helper to derive the config PDA
-     */
     getConfigPDA() {
         return (0, pda_1.getConfigPDA)(this.program.programId)[0];
     }
-    /**
-     * Create a new stream (Linear, Cliff, or Milestone)
-     */
-    async createStream(creator, recipient, mint, amount, startTs, cliffTs, endTs, vestingType, milestones, nonce) {
+    // ─── createStream ───────────────────────────────────────────────────────────
+    async createStream(recipient, mint, amount, startTs, cliffTs, endTs, vestingType, milestones, nonce, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const config = this.getConfigPDA();
         const stream = (0, pda_1.getStreamPDA)(creator, recipient, nonce, this.program.programId)[0];
         const vault = (0, pda_1.getVaultATA)(mint, stream);
         const creatorTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, creator, true);
-        const builder = this.program.methods
+        let methodBuilder = this.program.methods
             .createStream(amount, startTs, cliffTs, endTs, vestingType, milestones, nonce)
             .accounts({
             creator,
@@ -33,105 +87,256 @@ class UnifiedFlowClient {
             creatorTokenAccount,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         });
-        if (vestingType === 2 && milestones.length > 0) { // VESTING_TYPE_MILESTONE = 2
+        if (vestingType === 2 && milestones.length > 0) {
             const remainingAccounts = milestones.map((_, i) => ({
                 pubkey: (0, pda_1.getMilestonePDA)(stream, i, this.program.programId)[0],
                 isWritable: true,
                 isSigner: false,
             }));
-            builder.remainingAccounts(remainingAccounts);
+            methodBuilder = methodBuilder.remainingAccounts(remainingAccounts);
         }
-        return builder;
+        const anchorIx = await methodBuilder.instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: recipient.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: mint.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: config.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: stream.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: vault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: creatorTokenAccount.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: spl_token_1.TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: web3_js_1.SystemProgram.programId.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Withdraw unlocked/vested tokens from a stream
-     */
-    async withdraw(streamPDA, recipient, mint) {
+    // ─── withdraw ───────────────────────────────────────────────────────────────
+    async withdraw(streamPDA, onStatus) {
+        onStatus?.("wallet_approval");
+        const recipient = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const config = this.getConfigPDA();
-        const vault = (0, pda_1.getVaultATA)(mint, streamPDA);
-        const recipientAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, recipient, true);
         const feeVault = (0, pda_1.getFeeVaultPDA)(this.program.programId)[0];
-        return this.program.methods
+        // Fetch stream state to get mint + vault
+        const programAny = this.program;
+        const streamState = await programAny.account.streamAccount.fetch(streamPDA);
+        const mint = streamState.mint;
+        const vault = streamState.vault;
+        const recipientAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, recipient, true);
+        const anchorIx = await this.program.methods
             .withdraw()
             .accounts({
             recipient,
+            mint,
+            config,
             stream: streamPDA,
+            vault,
             recipientAta,
+            feeReceiver: feeVault,
             chainlinkFeed: exports.SOL_USD_FEED,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-        });
+            systemProgram: web3_js_1.SystemProgram.programId,
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: recipient.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: mint.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: config.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: vault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: recipientAta.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: feeVault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: exports.SOL_USD_FEED.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: spl_token_1.TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: web3_js_1.SystemProgram.programId.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Cancel an active stream and return remaining tokens to the creator
-     */
-    async cancel(streamPDA, creator, recipient, mint) {
-        const config = this.getConfigPDA();
-        const vault = (0, pda_1.getVaultATA)(mint, streamPDA);
+    // ─── cancel ─────────────────────────────────────────────────────────────────
+    async cancel(streamPDA, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
+        const programAny = this.program;
+        const streamState = await programAny.account.streamAccount.fetch(streamPDA);
+        const mint = streamState.mint;
+        const recipient = streamState.recipient;
         const creatorTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, creator, true);
         const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, recipient, true);
-        return this.program.methods
+        const config = this.getConfigPDA();
+        const vault = (0, pda_1.getVaultATA)(mint, streamPDA);
+        const anchorIx = await this.program.methods
             .cancel()
             .accounts({
             creator,
             stream: streamPDA,
+            config,
+            vault,
             creatorTokenAccount,
             recipientTokenAccount,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-        });
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: config.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: vault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: creatorTokenAccount.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: recipientTokenAccount.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: spl_token_1.TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Unlock a specific milestone
-     */
-    async unlockMilestone(streamPDA, creator, milestoneIndex) {
+    // ─── unlockMilestone ────────────────────────────────────────────────────────
+    async unlockMilestone(streamPDA, milestoneIndex, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const milestonePDA = (0, pda_1.getMilestonePDA)(streamPDA, milestoneIndex, this.program.programId)[0];
-        return this.program.methods
+        const anchorIx = await this.program.methods
             .unlockMilestone()
             .accounts({
+            creator,
             stream: streamPDA,
             milestone: milestonePDA,
-        });
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: milestonePDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Edit a milestone's amount (increase or decrease)
-     */
-    async editMilestone(streamPDA, creator, mint, milestoneIndex, newAmount) {
+    // ─── editMilestone ──────────────────────────────────────────────────────────
+    async editMilestone(streamPDA, mint, milestoneIndex, newAmount, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const milestonePDA = (0, pda_1.getMilestonePDA)(streamPDA, milestoneIndex, this.program.programId)[0];
         const vault = (0, pda_1.getVaultATA)(mint, streamPDA);
         const creatorTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, creator, true);
-        return this.program.methods
+        const anchorIx = await this.program.methods
             .editMilestone(newAmount)
             .accounts({
+            creator,
             stream: streamPDA,
             milestone: milestonePDA,
+            vault,
             creatorTokenAccount,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-        });
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: milestonePDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: vault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: creatorTokenAccount.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: spl_token_1.TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Edit the cliff timestamp of a cliff vesting stream
-     */
-    async editCliff(streamPDA, creator, newCliffTs) {
+    // ─── editCliff ──────────────────────────────────────────────────────────────
+    async editCliff(streamPDA, newCliffTs, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const config = this.getConfigPDA();
-        return this.program.methods
+        const anchorIx = await this.program.methods
             .editCliff(newCliffTs)
             .accounts({
+            creator,
             stream: streamPDA,
-        });
+            config,
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: config.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
     }
-    /**
-     * Edit a linear stream's end timestamp and/or top up tokens
-     */
-    async editLinear(streamPDA, creator, mint, newEndTs, topupAmount) {
+    // ─── editLinear ─────────────────────────────────────────────────────────────
+    async editLinear(streamPDA, mint, newEndTs, topupAmount, onStatus) {
+        onStatus?.("wallet_approval");
+        const creator = new web3_js_1.PublicKey(this.wallet.account.address.toString());
         const config = this.getConfigPDA();
         const vault = (0, pda_1.getVaultATA)(mint, streamPDA);
         const creatorTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(mint, creator, true);
-        return this.program.methods
+        const anchorIx = await this.program.methods
             .editLinear(newEndTs, topupAmount)
             .accounts({
+            creator,
             stream: streamPDA,
+            config,
+            vault,
             creatorTokenAccount,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-        });
+        })
+            .instruction();
+        const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+        const kitIx = this._toKitInstruction(anchorIx, [
+            { address: creator.toBase58(), role: kit_1.AccountRole.WRITABLE_SIGNER, signer: this.kitSigner },
+            { address: streamPDA.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: config.toBase58(), role: kit_1.AccountRole.READONLY },
+            { address: vault.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: creatorTokenAccount.toBase58(), role: kit_1.AccountRole.WRITABLE },
+            { address: spl_token_1.TOKEN_PROGRAM_ID.toBase58(), role: kit_1.AccountRole.READONLY },
+        ]);
+        const txMsg = this._buildTxMessage(kitIx, blockhash, lastValidBlockHeight);
+        onStatus?.("sending");
+        const signature = await signAndSend(txMsg, this.walletSignerMode, this.connection, this.commitment);
+        onStatus?.("confirming");
+        await this.connection.confirmTransaction({ blockhash, lastValidBlockHeight, signature }, this.commitment);
+        return { signature };
+    }
+    // ─── Private helpers ─────────────────────────────────────────────────────────
+    _toKitInstruction(anchorIx, accounts) {
+        return {
+            programAddress: anchorIx.programId.toBase58(),
+            accounts,
+            data: anchorIx.data,
+        };
+    }
+    _buildTxMessage(kitIx, blockhash, lastValidBlockHeight) {
+        let txMsg = (0, kit_1.setTransactionMessageFeePayerSigner)(this.kitSigner, (0, kit_1.createTransactionMessage)({ version: 0 }));
+        txMsg = (0, kit_1.appendTransactionMessageInstruction)(kitIx, txMsg);
+        txMsg = (0, kit_1.setTransactionMessageLifetimeUsingBlockhash)({ blockhash: blockhash, lastValidBlockHeight: BigInt(lastValidBlockHeight) }, txMsg);
+        return txMsg;
     }
 }
 exports.UnifiedFlowClient = UnifiedFlowClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifiedflow/unified-flow-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "SDK for the Unified Flow program",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",