@toon-protocol/client 0.20.0 → 0.20.1

package/dist/index.js

@@ -1871,6 +1871,17 @@ function deriveChannelPDA(participantA, participantB, tokenMint, programId) {
   const { pda, bump } = findProgramAddress(seeds, program);
   return { pda: base58Encode(pda), bump };
 }
+function deriveAssociatedTokenAccount(owner, tokenMint) {
+  const TOKEN_PROGRAM_ID2 = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+  const ASSOCIATED_TOKEN_PROGRAM_ID = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+  const seeds = [
+    padTo32(base58Decode(owner)),
+    padTo32(base58Decode(TOKEN_PROGRAM_ID2)),
+    padTo32(base58Decode(tokenMint))
+  ];
+  const { pda } = findProgramAddress(seeds, padTo32(base58Decode(ASSOCIATED_TOKEN_PROGRAM_ID)));
+  return base58Encode(pda);
+}
 function deriveVaultPDA(channelPDA, programId) {
   const channel = padTo32(base58Decode(channelPDA));
   const program = padTo32(base58Decode(programId));
@@ -2586,14 +2597,17 @@ var OnChainChannelClient = class {
       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(
-        "Solana deposit requires solanaConfig.deposit.payerTokenAccount (the funded SPL token account)."
-      );
-    }
     const payerSeed = cfg.keypair.slice(0, 32);
     const payerPubkey = base58Encode2(new Uint8Array(ed255192.getPublicKey(payerSeed)));
+    let payerTokenAccount = cfg.deposit?.payerTokenAccount;
+    if (!payerTokenAccount) {
+      if (!cfg.tokenMint) {
+        throw new Error(
+          "Solana deposit requires solanaConfig.deposit.payerTokenAccount or solanaConfig.tokenMint to derive the payer ATA."
+        );
+      }
+      payerTokenAccount = deriveAssociatedTokenAccount(payerPubkey, cfg.tokenMint);
+    }
     const { depositTxSignature } = await depositSolanaChannel({
       rpcUrl: cfg.rpcUrl,
       programId: cfg.programId,
@@ -2799,7 +2813,9 @@ var OnChainChannelClient = class {
     );
     const deposit = cfg.deposit ? {
       amount: BigInt(cfg.deposit.amount),
-      payerTokenAccount: cfg.deposit.payerTokenAccount
+      // Derive the payer ATA (owner + channel mint) when not supplied — it is
+      // deterministic, so the caller need not thread payerTokenAccount through.
+      payerTokenAccount: cfg.deposit.payerTokenAccount || deriveAssociatedTokenAccount(payerPubkey, tokenMint)
     } : void 0;
     const { channelPDA } = await openSolanaChannel({
       rpcUrl: cfg.rpcUrl,