@toon-protocol/client 0.14.6 → 0.14.7

package/dist/index.d.ts

@@ -2165,6 +2165,13 @@ declare class OnChainChannelClient implements ConnectorChannelClient {
         txHash?: string;
         depositTotal: bigint;
     }>;
+    /**
+     * Solana deposit: fire the standalone `deposit` instruction against the channel
+     * vault. Incremental on-chain (the program adds `amount`), so the new total is
+     * the caller-tracked current plus the delta. Requires the funded payer token
+     * account (the funded ATA) from the Solana channel config.
+     */
+    private depositSolana;
     /**
      * EVM deposit: approve the token-network for the delta if the allowance is
      * short, then `setTotalDeposit(channelId, participant, current + delta)` —

package/dist/index.js

@@ -2035,29 +2035,44 @@ async function openSolanaChannel(params) {
   ]);
   let depositTxSignature;
   if (params.deposit && params.deposit.amount > 0n) {
-    const depositData = new Uint8Array(16);
-    depositData.set(IX_DEPOSIT, 0);
-    writeU64LE(depositData, 8, params.deposit.amount);
-    depositTxSignature = await buildAndSendTransaction(rpcUrl, payer, [
-      {
-        programId,
-        keys: [
-          { pubkey: payerPubkey, isSigner: true, isWritable: false },
-          {
-            pubkey: params.deposit.payerTokenAccount,
-            isSigner: false,
-            isWritable: true
-          },
-          { pubkey: vaultPDA, isSigner: false, isWritable: true },
-          { pubkey: channelPDA, isSigner: false, isWritable: true },
-          { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }
-        ],
-        data: depositData
-      }
-    ]);
+    ({ depositTxSignature } = await depositSolanaChannel({
+      rpcUrl,
+      programId,
+      channelPDA,
+      payerSeed,
+      payerPubkey,
+      payerTokenAccount: params.deposit.payerTokenAccount,
+      amount: params.deposit.amount
+    }));
   }
   return { channelPDA, opened: true, initTxSignature, depositTxSignature };
 }
+async function depositSolanaChannel(params) {
+  const { rpcUrl, programId, channelPDA, payerSeed, payerPubkey, payerTokenAccount, amount } = params;
+  if (amount <= 0n) throw new Error("Solana deposit amount must be positive.");
+  const payer = {
+    publicKey: padTo32(base58Decode(payerPubkey)),
+    privateKey: payerSeed
+  };
+  const { pda: vaultPDA } = deriveVaultPDA(channelPDA, programId);
+  const depositData = new Uint8Array(16);
+  depositData.set(IX_DEPOSIT, 0);
+  writeU64LE(depositData, 8, amount);
+  const depositTxSignature = await buildAndSendTransaction(rpcUrl, payer, [
+    {
+      programId,
+      keys: [
+        { pubkey: payerPubkey, isSigner: true, isWritable: false },
+        { pubkey: payerTokenAccount, isSigner: false, isWritable: true },
+        { pubkey: vaultPDA, isSigner: false, isWritable: true },
+        { pubkey: channelPDA, isSigner: false, isWritable: true },
+        { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false }
+      ],
+      data: depositData
+    }
+  ]);
+  return { depositTxSignature };
+}
 
 // src/channel/mina-channel-open.ts
 import { hexToMinaBase58PrivateKey as hexToMinaBase58PrivateKey2 } from "@toon-protocol/core";
@@ -2429,12 +2444,43 @@ var OnChainChannelClient = class {
       );
     }
     const chainPrefix = ctx.chain.split(":")[0];
-    if (chainPrefix === "solana" || chainPrefix === "mina") {
+    if (chainPrefix === "solana") {
+      return this.depositSolana(channelId, amount, opts.currentDeposit);
+    }
+    if (chainPrefix === "mina") {
+      throw new Error("Deposit on mina is not yet supported (EVM + Solana today; Mina follow-up).");
+    }
+    return this.depositEvm(channelId, amount, opts.currentDeposit, ctx);
+  }
+  /**
+   * Solana deposit: fire the standalone `deposit` instruction against the channel
+   * vault. Incremental on-chain (the program adds `amount`), so the new total is
+   * the caller-tracked current plus the delta. Requires the funded payer token
+   * account (the funded ATA) from the Solana channel config.
+   */
+  async depositSolana(channelId, amount, currentDeposit) {
+    if (!this.solanaConfig) {
+      throw new Error("Solana channel config not set \u2014 cannot deposit.");
+    }
+    const cfg = this.solanaConfig;
+    const payerTokenAccount = cfg.deposit?.payerTokenAccount;
+    if (!payerTokenAccount) {
       throw new Error(
-        `Deposit on ${chainPrefix} is not yet supported (EVM only; follow-up PR adds it).`
+        "Solana deposit requires solanaConfig.deposit.payerTokenAccount (the funded SPL token account)."
       );
     }
-    return this.depositEvm(channelId, amount, opts.currentDeposit, ctx);
+    const payerSeed = cfg.keypair.slice(0, 32);
+    const payerPubkey = base58Encode2(new Uint8Array(ed255192.getPublicKey(payerSeed)));
+    const { depositTxSignature } = await depositSolanaChannel({
+      rpcUrl: cfg.rpcUrl,
+      programId: cfg.programId,
+      channelPDA: channelId,
+      payerSeed,
+      payerPubkey,
+      payerTokenAccount,
+      amount
+    });
+    return { txHash: depositTxSignature, depositTotal: currentDeposit + amount };
   }
   /**
    * EVM deposit: approve the token-network for the delta if the allowance is