@toon-protocol/client 0.14.11 → 0.15.0

package/dist/index.js

@@ -80,6 +80,29 @@ var PeerAlreadyExistsError = class extends ToonClientError {
     this.name = "PeerAlreadyExistsError";
   }
 };
+var ChannelFundingError = class extends ToonClientError {
+  retryable = true;
+  constructor(message, cause) {
+    super(message, "CHANNEL_FUNDING", cause);
+    this.name = "ChannelFundingError";
+  }
+};
+var INSUFFICIENT_GAS_MARKERS = [
+  "exceeds the balance of the account",
+  "insufficient funds for gas",
+  "insufficient funds for intrinsic transaction cost",
+  "insufficient funds for transfer"
+];
+function isInsufficientGasError(err) {
+  const parts = [];
+  let cur = err;
+  for (let i = 0; i < 10 && cur != null; i++) {
+    parts.push(cur instanceof Error ? cur.message : String(cur));
+    cur = cur instanceof Error ? cur.cause : void 0;
+  }
+  const text = parts.join(" | ").toLowerCase();
+  return INSUFFICIENT_GAS_MARKERS.some((m) => text.includes(m));
+}
 
 // src/keys/KeyDerivation.ts
 import { generateSecretKey, getPublicKey } from "nostr-tools/pure";
@@ -2790,14 +2813,33 @@ var OnChainChannelClient = class {
     };
   }
   /**
-   * Opens an EVM payment channel on-chain.
+   * Opens an EVM payment channel on-chain, remapping the one-time
+   * insufficient-native-gas revert into an actionable {@link ChannelFundingError}
+   * so callers surface "fund the wallet" instead of the raw viem
+   * "...exceeds the balance of the account" string (toon-meta#65). Only the gas
+   * case is remapped; every other error propagates unchanged.
+   */
+  async openEvmChannel(params) {
+    try {
+      return await this.openEvmChannelUnchecked(params);
+    } catch (err) {
+      if (!isInsufficientGasError(err)) throw err;
+      const chainFamily = params.chain.split(":")[0] || params.chain;
+      throw new ChannelFundingError(
+        `Settlement wallet ${this.evmSigner.address} has no gas on ${chainFamily} to open a payment channel. Run toon_fund_wallet (or fund the wallet) and retry.`,
+        err instanceof Error ? err : void 0
+      );
+    }
+  }
+  /**
+   * Raw EVM channel-open (no gas-error remapping — see {@link openEvmChannel}).
    *
    * 1. Approve token spend if needed
    * 2. Call TokenNetwork.openChannel()
    * 3. Extract channelId from ChannelOpened event
    * 4. Deposit initial funds if specified
    */
-  async openEvmChannel(params) {
+  async openEvmChannelUnchecked(params) {
     const {
       chain,
       tokenNetwork,
@@ -5563,435 +5605,6 @@ var HttpConnectorAdmin = class {
   }
 };
 
-// src/pet/filterPetDvmProviders.ts
-import { parseServiceDiscovery } from "@toon-protocol/core";
-import { PET_INTERACTION_REQUEST_KIND } from "@toon-protocol/core";
-function filterPetDvmProviders(events) {
-  const providers = [];
-  for (const event of events) {
-    let parsed;
-    try {
-      parsed = parseServiceDiscovery(event);
-    } catch {
-      continue;
-    }
-    if (!parsed) continue;
-    const skill = parsed.skill;
-    if (!skill) continue;
-    if (!skill.kinds.includes(PET_INTERACTION_REQUEST_KIND)) continue;
-    const pricing = skill.pricing[String(PET_INTERACTION_REQUEST_KIND)] ?? "0";
-    providers.push({
-      ilpAddress: parsed.ilpAddress,
-      pricing,
-      pubkey: event.pubkey,
-      features: skill.features
-    });
-  }
-  providers.sort((a, b) => {
-    const priceA = Number(a.pricing) || 0;
-    const priceB = Number(b.pricing) || 0;
-    return priceA - priceB;
-  });
-  return providers;
-}
-
-// src/pet/buildPetInteractionRequest.ts
-import { PET_INTERACTION_REQUEST_KIND as PET_INTERACTION_REQUEST_KIND2 } from "@toon-protocol/core";
-var MAX_ACTION_TYPE = 10;
-function buildPetInteractionRequest(params) {
-  const { blobbiId, actionType, itemId, tokenCost, isSleeping } = params;
-  if (!blobbiId || blobbiId.trim() === "") {
-    throw new ValidationError("blobbiId must be a non-empty string");
-  }
-  if (!Number.isInteger(actionType) || actionType < 0 || actionType > MAX_ACTION_TYPE) {
-    throw new ValidationError(
-      `actionType must be an integer between 0 and ${MAX_ACTION_TYPE}, got ${actionType}`
-    );
-  }
-  if (!Number.isInteger(itemId) || itemId < 0) {
-    throw new ValidationError(
-      `itemId must be a non-negative integer, got ${itemId}`
-    );
-  }
-  if (!Number.isFinite(tokenCost) || tokenCost < 0) {
-    throw new ValidationError(
-      `tokenCost must be a non-negative number, got ${tokenCost}`
-    );
-  }
-  return {
-    kind: PET_INTERACTION_REQUEST_KIND2,
-    created_at: Math.floor(Date.now() / 1e3),
-    tags: [
-      ["d", blobbiId],
-      ["action", String(actionType)],
-      ["item", String(itemId)],
-      ["cost", String(tokenCost)],
-      ["sleeping", String(isSleeping)]
-    ],
-    content: ""
-  };
-}
-
-// src/pet/parsePetInteractionResult.ts
-var STAT_FIELDS = [
-  "hunger",
-  "happiness",
-  "health",
-  "hygiene",
-  "energy"
-];
-var HEX_64_RE = /^[0-9a-f]{64}$/i;
-function isValidStats(obj) {
-  if (typeof obj !== "object" || obj === null) return false;
-  const record = obj;
-  return STAT_FIELDS.every(
-    (field) => typeof record[field] === "number" && Number.isFinite(record[field])
-  );
-}
-function parsePetInteractionResult(data) {
-  if (!data) return null;
-  let json;
-  try {
-    json = atob(data);
-  } catch {
-    return null;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(json);
-  } catch {
-    return null;
-  }
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    return null;
-  }
-  const record = parsed;
-  if (!isValidStats(record["stats"])) return null;
-  const stage = record["stage"];
-  if (typeof stage !== "number" || !Number.isInteger(stage) || stage < 0 || stage > 2) {
-    return null;
-  }
-  const cycle = record["cycle"];
-  if (typeof cycle !== "number" || !Number.isInteger(cycle) || cycle < 0) {
-    return null;
-  }
-  const lastInteraction = record["lastInteraction"];
-  if (typeof lastInteraction !== "number" || !Number.isFinite(lastInteraction)) {
-    return null;
-  }
-  const brainHash = record["brainHash"];
-  if (typeof brainHash !== "string" || !HEX_64_RE.test(brainHash)) {
-    return null;
-  }
-  const cooldownTimestamps = record["cooldownTimestamps"];
-  if (!Array.isArray(cooldownTimestamps)) return null;
-  if (!cooldownTimestamps.every(
-    (t) => typeof t === "number" && Number.isFinite(t)
-  )) {
-    return null;
-  }
-  const validatedStats = record["stats"];
-  const stats = {
-    hunger: validatedStats.hunger,
-    happiness: validatedStats.happiness,
-    health: validatedStats.health,
-    hygiene: validatedStats.hygiene,
-    energy: validatedStats.energy
-  };
-  return {
-    stats,
-    stage,
-    cycle,
-    lastInteraction,
-    brainHash,
-    cooldownTimestamps: [...cooldownTimestamps]
-  };
-}
-
-// src/pet/parsePetInteractionEvent.ts
-function getTagValue(tags, name) {
-  for (const tag of tags) {
-    if (tag[0] === name) {
-      return tag[1];
-    }
-  }
-  return void 0;
-}
-function isStatLike(obj) {
-  if (typeof obj !== "object" || obj === null) return false;
-  const r = obj;
-  return typeof r["hunger"] === "number" && Number.isFinite(r["hunger"]) && typeof r["happiness"] === "number" && Number.isFinite(r["happiness"]) && typeof r["health"] === "number" && Number.isFinite(r["health"]) && typeof r["hygiene"] === "number" && Number.isFinite(r["hygiene"]) && typeof r["energy"] === "number" && Number.isFinite(r["energy"]);
-}
-function cleanStats(obj) {
-  return {
-    hunger: obj["hunger"],
-    happiness: obj["happiness"],
-    health: obj["health"],
-    hygiene: obj["hygiene"],
-    energy: obj["energy"]
-  };
-}
-function parseContent(content) {
-  try {
-    const parsed = JSON.parse(content);
-    if (typeof parsed !== "object" || parsed === null) return null;
-    if (!isStatLike(parsed.priorStats) || !isStatLike(parsed.decayedStats) || !isStatLike(parsed.finalStats)) {
-      return null;
-    }
-    if (typeof parsed.cycle !== "number" || typeof parsed.stage !== "number" || typeof parsed.tokenCost !== "number") {
-      return null;
-    }
-    return {
-      priorStats: cleanStats(parsed.priorStats),
-      decayedStats: cleanStats(parsed.decayedStats),
-      finalStats: cleanStats(parsed.finalStats),
-      cycle: parsed.cycle,
-      stage: parsed.stage,
-      tokenCost: parsed.tokenCost
-    };
-  } catch {
-    return null;
-  }
-}
-function parsePetInteractionEvent(event) {
-  const tags = event.tags;
-  const blobbiId = getTagValue(tags, "d");
-  if (!blobbiId) return null;
-  const actionStr = getTagValue(tags, "action");
-  if (!actionStr) return null;
-  const actionType = Number(actionStr);
-  if (!Number.isFinite(actionType)) return null;
-  const itemStr = getTagValue(tags, "item");
-  if (!itemStr) return null;
-  const itemId = Number(itemStr);
-  if (!Number.isFinite(itemId)) return null;
-  const costStr = getTagValue(tags, "cost");
-  if (!costStr) return null;
-  const tokenCost = Number(costStr);
-  if (!Number.isFinite(tokenCost)) return null;
-  const cycleStr = getTagValue(tags, "cycle");
-  if (!cycleStr) return null;
-  const cycle = Number(cycleStr);
-  if (!Number.isFinite(cycle)) return null;
-  const stageStr = getTagValue(tags, "stage");
-  if (!stageStr) return null;
-  const stage = Number(stageStr);
-  if (!Number.isFinite(stage)) return null;
-  const brainHash = getTagValue(tags, "brain_hash");
-  if (!brainHash) return null;
-  const proof = getTagValue(tags, "proof");
-  const minaTx = getTagValue(tags, "mina_tx");
-  const proofStatus = proof && minaTx ? "proven" : "optimistic";
-  const content = parseContent(event.content);
-  const result = {
-    blobbiId,
-    actionType,
-    itemId,
-    tokenCost,
-    cycle,
-    stage,
-    brainHash,
-    proofStatus,
-    content
-  };
-  if (proof) result.proof = proof;
-  if (minaTx) result.minaTx = minaTx;
-  return result;
-}
-
-// src/pet/buildPetListingEvent.ts
-var PET_LISTING_KIND = 30402;
-var STAGE_NAMES = {
-  0: "Egg",
-  1: "Baby",
-  2: "Adult"
-};
-function buildPetListingEvent(params) {
-  const {
-    blobbiId,
-    askPriceUsdc,
-    lifecycleHash,
-    totalSpent,
-    stage,
-    stats,
-    sellerPubkey,
-    relayUrl,
-    expiresAt
-  } = params;
-  const stageName = STAGE_NAMES[stage] ?? "Unknown";
-  const summary = `${stageName} pet for sale \u2014 ${totalSpent} PET tokens spent (verified biography)`;
-  return {
-    kind: PET_LISTING_KIND,
-    created_at: Math.floor(Date.now() / 1e3),
-    tags: [
-      ["d", blobbiId],
-      ["title", `Pet ${blobbiId} for sale`],
-      ["price", String(askPriceUsdc), "USDC", ""],
-      ["summary", summary],
-      ["t", "pet"],
-      ["t", "toon-pet"],
-      ["lifecycle_hash", lifecycleHash],
-      ["total_spent", totalSpent],
-      ["stage", String(stage)],
-      ["expiration", String(expiresAt)],
-      ["relay", relayUrl],
-      ["p", sellerPubkey]
-    ],
-    content: JSON.stringify(stats)
-  };
-}
-
-// src/pet/parsePetListing.ts
-var HEX_64_RE2 = /^[0-9a-f]{64}$/i;
-function getTagValue2(tags, name) {
-  for (const tag of tags) {
-    if (tag[0] === name) {
-      return tag[1];
-    }
-  }
-  return void 0;
-}
-var DEFAULT_STATS = {
-  hunger: 0,
-  happiness: 0,
-  health: 0,
-  hygiene: 0,
-  energy: 0
-};
-function parseStats(content) {
-  try {
-    const parsed = JSON.parse(content);
-    if (typeof parsed !== "object" || parsed === null) return DEFAULT_STATS;
-    const r = parsed;
-    if (typeof r["hunger"] === "number" && typeof r["happiness"] === "number" && typeof r["health"] === "number" && typeof r["hygiene"] === "number" && typeof r["energy"] === "number") {
-      return {
-        hunger: r["hunger"],
-        happiness: r["happiness"],
-        health: r["health"],
-        hygiene: r["hygiene"],
-        energy: r["energy"]
-      };
-    }
-    return DEFAULT_STATS;
-  } catch {
-    return DEFAULT_STATS;
-  }
-}
-function parsePetListing(event) {
-  if (event.kind !== 30402) return null;
-  const { tags } = event;
-  const blobbiId = getTagValue2(tags, "d");
-  if (!blobbiId || blobbiId.trim() === "") return null;
-  let askPriceUsdc = 0;
-  let foundPrice = false;
-  for (const tag of tags) {
-    if (tag[0] === "price") {
-      const priceStr = tag[1];
-      if (priceStr === void 0) return null;
-      const parsed = Number(priceStr);
-      if (!Number.isFinite(parsed) || parsed <= 0) return null;
-      askPriceUsdc = parsed;
-      foundPrice = true;
-      break;
-    }
-  }
-  if (!foundPrice) return null;
-  const lifecycleHash = getTagValue2(tags, "lifecycle_hash");
-  if (!lifecycleHash) return null;
-  if (!HEX_64_RE2.test(lifecycleHash)) return null;
-  const totalSpent = getTagValue2(tags, "total_spent");
-  if (totalSpent === void 0 || totalSpent === "") return null;
-  const totalSpentNum = Number(totalSpent);
-  if (!Number.isFinite(totalSpentNum) || totalSpentNum < 0) return null;
-  const stageStr = getTagValue2(tags, "stage");
-  if (stageStr === void 0) return null;
-  const stage = Number(stageStr);
-  if (!Number.isFinite(stage)) return null;
-  const sellerPubkey = getTagValue2(tags, "p") ?? "";
-  const relayUrl = getTagValue2(tags, "relay") ?? "";
-  const expiresAtStr = getTagValue2(tags, "expiration");
-  const expiresAt = expiresAtStr !== void 0 ? Number(expiresAtStr) : 0;
-  const stats = parseStats(event.content);
-  return {
-    blobbiId,
-    askPriceUsdc,
-    lifecycleHash,
-    totalSpent,
-    stage,
-    stats,
-    sellerPubkey,
-    relayUrl,
-    expiresAt,
-    eventId: event.id,
-    createdAt: event.created_at
-  };
-}
-
-// src/pet/filterPetListings.ts
-function compareNumericStrings(a, b) {
-  if (a === b) return 0;
-  try {
-    const bigA = BigInt(a);
-    const bigB = BigInt(b);
-    if (bigA < bigB) return -1;
-    if (bigA > bigB) return 1;
-    return 0;
-  } catch {
-    const fa = Number(a);
-    const fb = Number(b);
-    if (!Number.isFinite(fa) && !Number.isFinite(fb)) return 0;
-    if (!Number.isFinite(fa)) return -1;
-    if (!Number.isFinite(fb)) return 1;
-    return fa - fb;
-  }
-}
-function filterPetListings(events, options) {
-  const now = Math.floor(Date.now() / 1e3);
-  const listings = [];
-  for (const event of events) {
-    const listing = parsePetListing(event);
-    if (listing === null) continue;
-    if (listing.expiresAt > 0 && listing.expiresAt < now) continue;
-    if (options?.minStage !== void 0 && listing.stage < options.minStage) {
-      continue;
-    }
-    if (options?.maxAskPriceUsdc !== void 0 && listing.askPriceUsdc > options.maxAskPriceUsdc) {
-      continue;
-    }
-    if (options?.minTotalSpent !== void 0) {
-      if (compareNumericStrings(listing.totalSpent, options.minTotalSpent) < 0) {
-        continue;
-      }
-    }
-    if (options?.sellerPubkey !== void 0 && listing.sellerPubkey !== options.sellerPubkey) {
-      continue;
-    }
-    listings.push(listing);
-  }
-  listings.sort((a, b) => compareNumericStrings(b.totalSpent, a.totalSpent));
-  return listings;
-}
-
-// src/pet/buildPetPurchaseRequest.ts
-import { PET_INTERACTION_REQUEST_KIND as PET_INTERACTION_REQUEST_KIND3 } from "@toon-protocol/core";
-var TRANSFER_OWNERSHIP_ACTION = 9;
-function buildPetPurchaseRequest(params) {
-  const { blobbiId, listingEventId, buyerPubkey, tokenCost, sellerPubkey } = params;
-  return {
-    kind: PET_INTERACTION_REQUEST_KIND3,
-    created_at: Math.floor(Date.now() / 1e3),
-    tags: [
-      ["action", String(TRANSFER_OWNERSHIP_ACTION)],
-      ["i", blobbiId],
-      ["listing", listingEventId],
-      ["buyer", buyerPubkey],
-      ["p", sellerPubkey],
-      ["cost", String(tokenCost)]
-    ],
-    content: ""
-  };
-}
-
 // src/faucet.ts
 function defaultFaucetTimeout(chain) {
   return chain === "mina" ? 12e4 : 3e4;
@@ -7100,6 +6713,7 @@ function writeKeystoreFile(path, keystore) {
 }
 export {
   BtpRuntimeClient,
+  ChannelFundingError,
   ChannelManager,
   ConnectorError,
   EvmSigner,
@@ -7130,9 +6744,6 @@ export {
   buildBackupEvent,
   buildBackupFilter,
   buildConsentRequest,
-  buildPetInteractionRequest,
-  buildPetListingEvent,
-  buildPetPurchaseRequest,
   buildRendererEventTemplate,
   buildSettlementInfo,
   buildStoreWriteEnvelope,
@@ -7145,9 +6756,8 @@ export {
   deriveNostrKeyFromMnemonic,
   deterministicGenerator,
   encryptMnemonic2 as encryptMnemonic,
+  extractArweaveTxId,
   extractUiResource,
-  filterPetDvmProviders,
-  filterPetListings,
   fundWallet,
   generateKeystore,
   generateMnemonic,
@@ -7157,6 +6767,7 @@ export {
   guardedRenderDispatch,
   httpEndpointToBtpUrl,
   importKeystore,
+  isInsufficientGasError,
   isPrfSupported,
   isTrustDowngrade,
   loadKeystore,
@@ -7164,9 +6775,6 @@ export {
   parseFulfillHttp,
   parseFulfillHttpBytes,
   parseHttpResponse,
-  parsePetInteractionEvent,
-  parsePetInteractionResult,
-  parsePetListing,
   parseUiCoordinate,
   parseX402Body,
   parseX402Challenge,