@toon-protocol/client-mcp 0.10.1 → 0.10.3

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

@@ -8677,6 +8677,20 @@ var TOKEN_NETWORK_ABI = [
     ],
     outputs: []
   },
+  {
+    name: "closeChannel",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "channelId", type: "bytes32" }],
+    outputs: []
+  },
+  {
+    name: "settleChannel",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [{ name: "channelId", type: "bytes32" }],
+    outputs: []
+  },
   {
     name: "channels",
     type: "function",
@@ -8925,6 +8939,103 @@ var OnChainChannelClient = class {
     await publicClient.waitForTransactionReceipt({ hash: depositHash });
     return { txHash: depositHash, depositTotal: newTotal };
   }
+  /**
+   * Close a channel to begin the settlement grace period. Dispatches by the
+   * channel's cached chain context. EVM `closeChannel` is unilateral (channelId
+   * only); after it confirms we read the `channels()` view for the AUTHORITATIVE
+   * `closedAt` + `settlementTimeout` (block-timestamp seconds) and compute
+   * `settleableAt = closedAt + settlementTimeout`. Solana/Mina are follow-ups.
+   */
+  async closeChannel(channelId) {
+    const ctx = this.channelContext.get(channelId);
+    if (!ctx) {
+      throw new Error(
+        `No on-chain context for channel "${channelId}" \u2014 it must be opened by this client first.`
+      );
+    }
+    const chainPrefix = ctx.chain.split(":")[0];
+    if (chainPrefix === "solana" || chainPrefix === "mina") {
+      throw new Error(
+        `Close on ${chainPrefix} is not yet supported (EVM today; Solana/Mina follow-up).`
+      );
+    }
+    const { publicClient, walletClient } = this.createClients(ctx.chain);
+    const tokenNetworkAddr = ctx.tokenNetworkAddress;
+    const closeHash = await walletClient.writeContract({
+      address: tokenNetworkAddr,
+      abi: TOKEN_NETWORK_ABI,
+      functionName: "closeChannel",
+      args: [channelId]
+    });
+    await publicClient.waitForTransactionReceipt({ hash: closeHash });
+    const info = await this.readEvmChannel(publicClient, tokenNetworkAddr, channelId);
+    return {
+      txHash: closeHash,
+      closedAt: info.closedAt,
+      settlementTimeout: info.settlementTimeout,
+      settleableAt: info.closedAt + info.settlementTimeout
+    };
+  }
+  /**
+   * Settle a closed channel after its grace period to release collateral. EVM
+   * `settleChannel` is unilateral (channelId only); the contract itself reverts
+   * before `closedAt + settlementTimeout`, so an early call surfaces as a tx
+   * revert here — but the caller (ToonClient/daemon) enforces the time guard
+   * BEFORE spending gas. Solana/Mina are follow-ups.
+   */
+  async settleChannel(channelId) {
+    const ctx = this.channelContext.get(channelId);
+    if (!ctx) {
+      throw new Error(
+        `No on-chain context for channel "${channelId}" \u2014 it must be opened by this client first.`
+      );
+    }
+    const chainPrefix = ctx.chain.split(":")[0];
+    if (chainPrefix === "solana" || chainPrefix === "mina") {
+      throw new Error(
+        `Settle on ${chainPrefix} is not yet supported (EVM today; Solana/Mina follow-up).`
+      );
+    }
+    const { publicClient, walletClient } = this.createClients(ctx.chain);
+    const settleHash = await walletClient.writeContract({
+      address: ctx.tokenNetworkAddress,
+      abi: TOKEN_NETWORK_ABI,
+      functionName: "settleChannel",
+      args: [channelId]
+    });
+    await publicClient.waitForTransactionReceipt({ hash: settleHash });
+    return { txHash: settleHash };
+  }
+  /**
+   * Read the EVM channel's close-relevant fields so a restarted daemon can
+   * recompute the grace timer from chain (chain is authoritative). EVM-only.
+   */
+  async getChannelCloseInfo(channelId) {
+    const ctx = this.channelContext.get(channelId);
+    if (!ctx) throw new Error(`No on-chain context for channel "${channelId}".`);
+    const chainPrefix = ctx.chain.split(":")[0];
+    if (chainPrefix === "solana" || chainPrefix === "mina") {
+      throw new Error(`getChannelCloseInfo on ${chainPrefix} is not supported.`);
+    }
+    const { publicClient } = this.createClients(ctx.chain);
+    const info = await this.readEvmChannel(publicClient, ctx.tokenNetworkAddress, channelId);
+    return {
+      status: STATE_MAP2[info.state] ?? "open",
+      closedAt: info.closedAt,
+      settlementTimeout: info.settlementTimeout,
+      settleableAt: info.closedAt + info.settlementTimeout
+    };
+  }
+  /** Read + destructure the EVM `channels(bytes32)` view. */
+  async readEvmChannel(publicClient, tokenNetworkAddr, channelId) {
+    const res = await publicClient.readContract({
+      address: tokenNetworkAddr,
+      abi: TOKEN_NETWORK_ABI,
+      functionName: "channels",
+      args: [channelId]
+    });
+    return { settlementTimeout: res[0], state: Number(res[1]), closedAt: res[2] };
+  }
   /**
    * Opens a REAL on-chain Solana payment channel.
    *
@@ -9866,7 +9977,12 @@ var ChannelManager = class {
           tokenNetworkAddress: tnAddr,
           tokenAddress: chainContext?.tokenAddress,
           recipient: chainContext?.recipient,
-          depositTotal: chainContext?.depositTotal
+          depositTotal: chainContext?.depositTotal,
+          // Resume the withdraw-flow timers so a daemon restart mid-grace
+          // doesn't strand funds (the gate can't be evaluated without them).
+          ...persisted.closedAt !== void 0 ? { closedAt: persisted.closedAt } : {},
+          ...persisted.settleableAt !== void 0 ? { settleableAt: persisted.settleableAt } : {},
+          ...persisted.settledAt !== void 0 ? { settledAt: persisted.settledAt } : {}
         });
         return;
       }
@@ -9901,12 +10017,7 @@ var ChannelManager = class {
     }
     tracking.nonce += 1;
     tracking.cumulativeAmount += additionalAmount;
-    if (this.store) {
-      this.store.save(channelId, {
-        nonce: tracking.nonce,
-        cumulativeAmount: tracking.cumulativeAmount
-      });
-    }
+    this.persist(channelId);
     const signer = this.chainSigners.get(tracking.chainType);
     if (signer && tracking.chainType !== "evm") {
       if (!tracking.recipient) {
@@ -10006,6 +10117,57 @@ var ChannelManager = class {
     }
     tracking.depositTotal = total;
   }
+  /** Persist a channel's full nonce/amount + withdraw-timer state to the store. */
+  persist(channelId) {
+    if (!this.store) return;
+    const t = this.channels.get(channelId);
+    if (!t) return;
+    this.store.save(channelId, {
+      nonce: t.nonce,
+      cumulativeAmount: t.cumulativeAmount,
+      ...t.closedAt !== void 0 ? { closedAt: t.closedAt } : {},
+      ...t.settleableAt !== void 0 ? { settleableAt: t.settleableAt } : {},
+      ...t.settledAt !== void 0 ? { settledAt: t.settledAt } : {}
+    });
+  }
+  /**
+   * Record that a channel was closed (withdraw flow): stores `closedAt` +
+   * `settleableAt` (unix SECONDS) so the grace timer survives a daemon restart.
+   */
+  setChannelClosed(channelId, closedAt, settleableAt) {
+    const tracking = this.channels.get(channelId);
+    if (!tracking) {
+      throw new Error(`Channel "${channelId}" is not being tracked.`);
+    }
+    tracking.closedAt = closedAt;
+    tracking.settleableAt = settleableAt;
+    this.persist(channelId);
+  }
+  /** Record that a channel was settled (collateral released). */
+  setChannelSettled(channelId, settledAt) {
+    const tracking = this.channels.get(channelId);
+    if (!tracking) {
+      throw new Error(`Channel "${channelId}" is not being tracked.`);
+    }
+    tracking.settledAt = settledAt;
+    this.persist(channelId);
+  }
+  /** The `settleableAt` timestamp (unix seconds) for a closed channel, if set. */
+  getSettleableAt(channelId) {
+    return this.channels.get(channelId)?.settleableAt;
+  }
+  /**
+   * Where a channel sits in the withdraw journey, from the tracked timers:
+   * `open` (never closed) → `closing` (closed, grace not elapsed) →
+   * `settleable` (grace elapsed) → `settled`. `nowSec` is injectable for tests.
+   */
+  getChannelCloseState(channelId, nowSec = BigInt(Math.floor(Date.now() / 1e3))) {
+    const t = this.channels.get(channelId);
+    if (!t || t.closedAt === void 0) return "open";
+    if (t.settledAt !== void 0) return "settled";
+    if (t.settleableAt !== void 0 && nowSec >= t.settleableAt) return "settleable";
+    return "closing";
+  }
   /**
    * Gets all tracked channel IDs.
    */
@@ -10028,7 +10190,10 @@ var JsonFileChannelStore = class {
     const data = this.readFile();
     data[channelId] = {
       nonce: tracking.nonce,
-      cumulativeAmount: tracking.cumulativeAmount.toString()
+      cumulativeAmount: tracking.cumulativeAmount.toString(),
+      ...tracking.closedAt !== void 0 ? { closedAt: tracking.closedAt.toString() } : {},
+      ...tracking.settleableAt !== void 0 ? { settleableAt: tracking.settleableAt.toString() } : {},
+      ...tracking.settledAt !== void 0 ? { settledAt: tracking.settledAt.toString() } : {}
     };
     this.writeFile(data);
   }
@@ -10038,7 +10203,10 @@ var JsonFileChannelStore = class {
     if (!entry) return void 0;
     return {
       nonce: entry.nonce,
-      cumulativeAmount: BigInt(entry.cumulativeAmount)
+      cumulativeAmount: BigInt(entry.cumulativeAmount),
+      ...entry.closedAt !== void 0 ? { closedAt: BigInt(entry.closedAt) } : {},
+      ...entry.settleableAt !== void 0 ? { settleableAt: BigInt(entry.settleableAt) } : {},
+      ...entry.settledAt !== void 0 ? { settledAt: BigInt(entry.settledAt) } : {}
     };
   }
   list() {
@@ -10348,8 +10516,7 @@ var Http402Client = class {
           claim
         );
       } finally {
-        await btp.disconnect().catch(() => {
-        });
+        await btp.disconnect().catch(() => void 0);
       }
     }
     if (choice.kind === "btp") {
@@ -11158,6 +11325,60 @@ var ToonClient = class {
       depositTotal: result.depositTotal.toString()
     };
   }
+  /**
+   * Close a channel to begin the settlement grace period (first half of
+   * withdraw). Records `closedAt`/`settleableAt` (unix seconds) on the tracked
+   * channel — persisted, so the grace timer survives a daemon restart. Spends
+   * on-chain. EVM today; Solana/Mina are follow-ups.
+   */
+  async closeChannel(channelId) {
+    if (!this.channelManager) throw new Error("ChannelManager not initialized");
+    if (!this.onChainChannelClient) {
+      throw new Error("On-chain channel client not configured (no chainRpcUrls).");
+    }
+    const r = await this.onChainChannelClient.closeChannel(channelId);
+    this.channelManager.setChannelClosed(channelId, r.closedAt, r.settleableAt);
+    return {
+      channelId,
+      ...r.txHash ? { txHash: r.txHash } : {},
+      closedAt: r.closedAt.toString(),
+      settleableAt: r.settleableAt.toString()
+    };
+  }
+  /**
+   * Settle a closed channel to release collateral (second half of withdraw).
+   * THE time guard: never settle before `settleableAt`. A too-early call throws
+   * a retryable error (carrying the remaining seconds) BEFORE spending gas — the
+   * contract would revert anyway. Spends on-chain. EVM today.
+   */
+  async settleChannel(channelId) {
+    if (!this.channelManager) throw new Error("ChannelManager not initialized");
+    if (!this.onChainChannelClient) {
+      throw new Error("On-chain channel client not configured (no chainRpcUrls).");
+    }
+    const settleableAt = this.channelManager.getSettleableAt(channelId);
+    if (settleableAt === void 0) {
+      throw new Error(`Channel "${channelId}" is not closed; call closeChannel first.`);
+    }
+    const nowSec = BigInt(Math.floor(Date.now() / 1e3));
+    if (nowSec < settleableAt) {
+      const remaining = settleableAt - nowSec;
+      throw Object.assign(
+        new Error(
+          `Channel "${channelId}" is not settleable yet \u2014 ${remaining}s remain (settleable at ${settleableAt}).`
+        ),
+        { name: "SettleTooEarlyError", retryable: true, settleableAt: settleableAt.toString() }
+      );
+    }
+    const r = await this.onChainChannelClient.settleChannel(channelId);
+    this.channelManager.setChannelSettled(channelId, nowSec);
+    return { channelId, ...r.txHash ? { txHash: r.txHash } : {} };
+  }
+  /** Where a tracked channel sits in the withdraw journey. */
+  getChannelCloseState(channelId) {
+    if (!this.channelManager) throw new Error("ChannelManager not initialized");
+    return this.channelManager.getChannelCloseState(channelId);
+  }
   /**
    * Read the on-chain settlement-token balance of this client's OWN wallet on
    * each configured chain (EVM token, Solana SPL, native MINA). A free read — no
@@ -11525,6 +11746,18 @@ function writeKeystoreFile(path, keystore) {
   });
 }
 
+// ../arweave/dist/gateways.js
+var ARWEAVE_GATEWAYS = [
+  "https://ar-io.dev",
+  "https://arweave.net",
+  "https://permagate.io"
+];
+function arweaveUrls(txId, gateways = ARWEAVE_GATEWAYS) {
+  const all = (gateways.length ? gateways : ARWEAVE_GATEWAYS).map((g) => `${g}/${txId}`);
+  const [url, ...fallbacks] = all;
+  return { url: url ?? `${ARWEAVE_GATEWAYS[0]}/${txId}`, fallbacks };
+}
+
 // src/daemon/config.ts
 import { readFileSync as readFileSync3 } from "fs";
 import { homedir } from "os";
@@ -12080,18 +12313,6 @@ function buildIlpPrepare(params) {
   };
 }
 
-// ../arweave/dist/gateways.js
-var ARWEAVE_GATEWAYS = [
-  "https://ar-io.dev",
-  "https://arweave.net",
-  "https://permagate.io"
-];
-function arweaveUrls(txId, gateways = ARWEAVE_GATEWAYS) {
-  const all = (gateways.length ? gateways : ARWEAVE_GATEWAYS).map((g) => `${g}/${txId}`);
-  const [url, ...fallbacks] = all;
-  return { url: url ?? `${ARWEAVE_GATEWAYS[0]}/${txId}`, fallbacks };
-}
-
 // src/daemon/config.ts
 var DEFAULT_KEYSTORE_PASSWORD = "toon-client-default";
 function configDir() {
@@ -12335,6 +12556,12 @@ var ControlClient = class {
   depositToChannel(body) {
     return this.request("POST", "/channels/deposit", body);
   }
+  closeChannel(body) {
+    return this.request("POST", "/channels/close", body);
+  }
+  settleChannel(body) {
+    return this.request("POST", "/channels/settle", body);
+  }
   swap(body) {
     return this.request("POST", "/swap", body);
   }
@@ -12503,6 +12730,7 @@ export {
   parseIlpPeerInfo2 as parseIlpPeerInfo,
   isEventExpired,
   buildIlpPrepare,
+  ARWEAVE_GATEWAYS,
   arweaveUrls,
   DEFAULT_KEYSTORE_PASSWORD,
   configDir,
@@ -12540,4 +12768,4 @@ export {
 @scure/bip32/lib/esm/index.js:
   (*! scure-bip32 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=chunk-5Z74D23J.js.map
+//# sourceMappingURL=chunk-XYR3ACYX.js.map