@toon-protocol/client-mcp 0.9.1 → 0.10.1

package/dist/{chunk-WAE4H47W.js → chunk-5Z74D23J.js}

@@ -1173,7 +1173,7 @@ var BootstrapService = class {
     };
     console.log(`[Bootstrap] Query filter:`, JSON.stringify(filter));
     console.log(`[Bootstrap] Connecting to ${knownPeer.relayUrl}...`);
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const events = [];
       const timeout = this.config.queryTimeout ?? 5e3;
       const ws = new WebSocket22(knownPeer.relayUrl);
@@ -1267,7 +1267,7 @@ var BootstrapService = class {
             const peerInfo = parseIlpPeerInfo(
               mostRecent
             );
-            resolve(peerInfo);
+            resolve2(peerInfo);
           } catch (error) {
             reject(
               new BootstrapError(
@@ -1314,7 +1314,7 @@ var BootstrapService = class {
             const peerInfo = parseIlpPeerInfo(
               mostRecent
             );
-            resolve(peerInfo);
+            resolve2(peerInfo);
           } catch (error) {
             reject(
               new BootstrapError(
@@ -7021,7 +7021,7 @@ async function withRetry(operation, options) {
         throw lastError;
       }
       const currentDelay = exponentialBackoff ? Math.min(retryDelay * Math.pow(2, attempt), maxDelay) : retryDelay;
-      await new Promise((resolve) => setTimeout(resolve, currentDelay));
+      await new Promise((resolve2) => setTimeout(resolve2, currentDelay));
     }
   }
   throw lastError ?? new Error("Unknown error during retry");
@@ -7429,7 +7429,7 @@ var IsomorphicBtpClient = class {
   }
   async connect() {
     if (this._isConnected) return;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       try {
         this.ws = this.config.createWebSocket ? this.config.createWebSocket(this.config.url) : new WebSocket(this.config.url);
         this.ws.binaryType = "arraybuffer";
@@ -7445,7 +7445,7 @@ var IsomorphicBtpClient = class {
         try {
           await this.authenticate();
           this._isConnected = true;
-          resolve();
+          resolve2();
         } catch (err) {
           this._isConnected = false;
           this.ws?.close();
@@ -7510,12 +7510,12 @@ var IsomorphicBtpClient = class {
       const remaining = packet.expiresAt.getTime() - Date.now();
       timeoutMs = Math.max(remaining - 500, 1e3);
     }
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const timeoutId = setTimeout(() => {
         this.pendingRequests.delete(requestId);
         reject(new BtpConnectionError(`Packet send timeout (${timeoutMs}ms)`));
       }, timeoutMs);
-      this.pendingRequests.set(requestId, { resolve, reject, timeoutId });
+      this.pendingRequests.set(requestId, { resolve: resolve2, reject, timeoutId });
     });
   }
   /**
@@ -7564,7 +7564,7 @@ var IsomorphicBtpClient = class {
         ilpPacket: new Uint8Array(0)
       }
     });
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const timeout = setTimeout(() => {
         reject(new BtpAuthError("Authentication timeout"));
       }, this.config.authTimeoutMs);
@@ -7590,7 +7590,7 @@ var IsomorphicBtpClient = class {
                 )
               );
             } else if (message.type === BTPMessageType.RESPONSE) {
-              resolve();
+              resolve2();
             }
           }
         } catch (err) {
@@ -8445,29 +8445,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 };
+}
 var cachedO1js = null;
 var cachedPaymentChannel = null;
 var compiledContract = null;
@@ -8834,12 +8849,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 = base58Encode(new Uint8Array(ed25519.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
@@ -11482,7 +11528,7 @@ function writeKeystoreFile(path, keystore) {
 // src/daemon/config.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { homedir } from "os";
-import { join as join2 } from "path";
+import { join as join2, resolve } from "path";
 
 // ../../node_modules/.pnpm/@toon-protocol+core@1.4.2_@toon-protocol+connector@3.13.0_typescript@5.9.3/node_modules/@toon-protocol/core/dist/chunk-5WT7ISKC.js
 import { encode as encode2 } from "@toon-format/toon";
@@ -12113,6 +12159,8 @@ function resolveConfig(file) {
   const storeDestination = process.env["TOON_CLIENT_STORE_DESTINATION"] ?? file.storeDestination ?? routes.store;
   const feePerEvent = BigInt(file.feePerEvent ?? "1");
   const arweaveGateways = parseCsvEnv(process.env["TOON_CLIENT_ARWEAVE_GATEWAYS"]) ?? file.arweaveGateways ?? [...ARWEAVE_GATEWAYS];
+  const uploadRoot = process.env["TOON_CLIENT_UPLOAD_ROOT"] ?? file.uploadAllowedRoot;
+  const uploadAllowedRoot = uploadRoot ? resolve(uploadRoot) : void 0;
   const network = process.env["TOON_CLIENT_NETWORK"] ?? file.network;
   const chain2 = process.env["TOON_CLIENT_CHAIN"] ?? file.chain ?? "evm";
   const apex = file.apexChains?.[chain2] ?? file.apex ?? buildProxyApexNegotiation(file, chain2, destination);
@@ -12168,7 +12216,8 @@ function resolveConfig(file) {
     apexChannelStorePath,
     toonClientConfig,
     network,
-    arweaveGateways
+    arweaveGateways,
+    ...uploadAllowedRoot ? { uploadAllowedRoot } : {}
   };
 }
 function defaultChainKey(chain2, chainId) {
@@ -12491,4 +12540,4 @@ export {
 @scure/bip32/lib/esm/index.js:
   (*! scure-bip32 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-WAE4H47W.js.map
+//# sourceMappingURL=chunk-5Z74D23J.js.map