@toon-protocol/client 0.20.0 → 0.20.2

package/dist/index.d.ts

@@ -427,7 +427,7 @@ interface ToonClientConfig {
     }>;
     /** File path for persisting payment channel nonce/amount state across restarts */
     channelStorePath?: string;
-    /** Nostr relay URL for peer discovery. Default: 'ws://localhost:7100' */
+    /** Nostr relay URL for peer discovery. Default: 'wss://relay-ws.devnet.toonprotocol.dev' */
     relayUrl?: string;
     /**
      * Known peers to bootstrap with.
@@ -3932,17 +3932,21 @@ declare function buildSettlementInfo(rawConfig: ToonClientConfig): ClientSettlem
 /**
  * Devnet faucet helper.
  *
- * The deployed TOON devnet exposes a faucet that drips test funds to a given
- * chain address so a client can open payment channels and pay for writes:
+ * The deployed TOON devnet exposes a faucet that drips the settlement token
+ * (USDC) to a given chain address so a client can open payment channels and pay
+ * for writes. This helper hits the USDC-ONLY faucet legs — it funds USDC and
+ * assumes the wallet already holds enough native gas to transact:
  *
- *   EVM     `POST {faucetUrl}/api/request`        body `{ address }` → 100 ETH + 10k USDC
- *   Solana  `POST {faucetUrl}/api/solana/request` body `{ address }` → SOL + USDC
- *   Mina    `POST {faucetUrl}/api/mina/request`   body `{ address }` → native MINA + USDC
+ *   EVM     `POST {faucetUrl}/api/base-sepolia/request` body `{ address }` → USDC (Base Sepolia mint)
+ *   Solana  `POST {faucetUrl}/api/solana/usdc-request`  body `{ address }` → USDC (no SOL leg)
+ *   Mina    `POST {faucetUrl}/api/mina/usdc-request`    body `{ address }` → USDC (no MINA leg)
  *
  * Devnet edge (today): `https://faucet.devnet.toonprotocol.dev`.
  *
  * All three chains are live on the deployed faucet — the request shape is
- * identical (`{ address }`); only the path differs.
+ * identical (`{ address }`); only the path differs. (The EVM leg mints the
+ * ungated mock USDC on Base Sepolia and best-effort tops up gas; the Solana and
+ * Mina legs are strictly USDC-only and expect the address to already hold gas.)
  */
 /** Supported faucet chains. */
 type FaucetChain = 'evm' | 'solana' | 'mina';
@@ -3969,12 +3973,12 @@ interface FundWalletOptions {
 /**
  * Default faucet request timeout (ms) for a chain.
  *
- * EVM and Solana faucets respond in a few seconds, so 30s is plenty. The Mina
- * faucet sends native MINA *and* mints USDC on a chain that settles much more
- * slowly: the drip routinely succeeds server-side (the faucet logs
- * `✅ Mina faucet request completed`) but takes well over 30s to answer the
- * HTTP request, so a flat 30s budget makes the client give up on a request that
- * actually worked. Give mina a much longer budget.
+ * The EVM (Base Sepolia mint) and Solana USDC legs respond in a few seconds, so
+ * 30s is plenty. The Mina USDC leg TRANSFERS the token via an o1js-proven
+ * transaction on a chain that settles much more slowly: the drip routinely
+ * succeeds server-side but takes well over 30s to answer the HTTP request, so a
+ * flat 30s budget makes the client give up on a request that actually worked.
+ * Give mina a much longer budget.
  */
 declare function defaultFaucetTimeout(chain: FaucetChain): number;
 /**

package/dist/index.js

@@ -470,7 +470,10 @@ function applyDefaults(rawConfig) {
     connectorUrl,
     // Surface the derived `POST /ilp` endpoint so HTTP mode selects HttpIlpClient.
     ...connectorHttpEndpoint ? { connectorHttpEndpoint } : {},
-    relayUrl: config.relayUrl ?? "ws://localhost:7100",
+    // Last-resort relay default. An explicit `config.relayUrl` always wins;
+    // `applyNetworkPresets` does not set a per-network relay, so this fallback
+    // points at the public devnet relay rather than a dead localhost socket.
+    relayUrl: config.relayUrl ?? "wss://relay-ws.devnet.toonprotocol.dev",
     queryTimeout: config.queryTimeout ?? 3e4,
     maxRetries: config.maxRetries ?? 3,
     retryDelay: config.retryDelay ?? 1e3,
@@ -1871,6 +1874,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 +2600,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 +2816,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,
@@ -6852,11 +6871,11 @@ function defaultFaucetTimeout(chain) {
 function faucetPath(chain) {
   switch (chain) {
     case "evm":
-      return "/api/request";
+      return "/api/base-sepolia/request";
     case "solana":
-      return "/api/solana/request";
+      return "/api/solana/usdc-request";
     case "mina":
-      return "/api/mina/request";
+      return "/api/mina/usdc-request";
   }
 }
 async function fundWallet(faucetUrl, address, chain, options = {}) {