@toon-protocol/core 3.3.0 → 3.4.0

package/dist/index.js

@@ -9,6 +9,10 @@ import {
   encodeEventToToonString,
   shallowParseToon
 } from "./chunk-5WT7ISKC.js";
+import {
+  readExchangeOutcome,
+  sealExchange
+} from "./chunk-K72H36Y4.js";
 
 // src/constants.ts
 var ILP_PEER_INFO_KIND = 10032;
@@ -395,6 +399,21 @@ function assertSwapPairForParse(pair, index) {
 function isObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function parseNotice(raw) {
+  if (!isObject2(raw)) {
+    return void 0;
+  }
+  const { id, severity, summary, url } = raw;
+  if (typeof id !== "string" || id.length === 0 || typeof summary !== "string" || summary.length === 0 || typeof url !== "string" || url.length === 0) {
+    return void 0;
+  }
+  return {
+    id,
+    severity: severity === "action-required" ? "action-required" : "info",
+    summary,
+    url
+  };
+}
 function parseIlpPeerInfo(event) {
   if (event.kind !== ILP_PEER_INFO_KIND) {
     throw new InvalidEventError(
@@ -538,6 +557,8 @@ function parseIlpPeerInfo(event) {
     }
     prefixPricing = { basePrice };
   }
+  const { notice: rawNotice } = parsed;
+  const notice = parseNotice(rawNotice);
   const { swapPairs: rawSwapPairs } = parsed;
   let swapPairs;
   if (rawSwapPairs !== void 0) {
@@ -590,7 +611,8 @@ function parseIlpPeerInfo(event) {
     ilpAddresses,
     feePerByte,
     ...prefixPricing !== void 0 && { prefixPricing },
-    ...swapPairs !== void 0 && { swapPairs }
+    ...swapPairs !== void 0 && { swapPairs },
+    ...notice !== void 0 && { notice }
   };
 }
 
@@ -3068,7 +3090,9 @@ var BootstrapService = class {
   ownIlpAddress;
   toonEncoder;
   toonDecoder;
+  /** @deprecated see {@link BootstrapServiceConfig.basePricePerByte}. */
   basePricePerByte;
+  connectorEdgeLookup;
   // Event emitter
   listeners = [];
   phase = "discovering";
@@ -3095,7 +3119,8 @@ var BootstrapService = class {
     this.ownIlpAddress = config.ownIlpAddress;
     this.toonEncoder = config.toonEncoder;
     this.toonDecoder = config.toonDecoder;
-    this.basePricePerByte = config.basePricePerByte ?? 10n;
+    this.basePricePerByte = config.basePricePerByte;
+    this.connectorEdgeLookup = config.connectorEdgeLookup;
   }
   /**
    * Set the ILP client for sending packets via the connector.
@@ -3396,32 +3421,86 @@ var BootstrapService = class {
     }
     return result;
   }
+  /**
+   * What the announce PREPARE should carry as its amount.
+   *
+   * ASKED for (ADR 0020, flat per handler), never computed as bytes × rate.
+   * `basePricePerByte`, when a caller still sets it, is a deprecated explicit
+   * override rather than a per-byte rate — see its doc comment on
+   * {@link BootstrapServiceConfig}.
+   *
+   * @throws {BootstrapError} when nothing terminated here prices `destination`.
+   */
+  async resolveAnnounceAmount(lookup, destination) {
+    if (this.basePricePerByte !== void 0) {
+      return String(this.basePricePerByte);
+    }
+    const routePrice = await lookup.getRoutePrice(destination);
+    if (routePrice === null) {
+      throw new BootstrapError(
+        `No locally-terminated route price for ${destination}`
+      );
+    }
+    return String(routePrice.price);
+  }
   /**
    * Announce own kind:10032 as paid ILP PREPARE (Phase 2).
    */
   async announceViaIlp(result) {
-    if (!this.ilpClient || !this.toonEncoder) {
+    if (!this.ilpClient || !this.toonEncoder || !this.connectorEdgeLookup) {
       return;
     }
     const ilpInfoEvent = buildIlpPeerInfoEvent(this.ownIlpInfo, this.secretKey);
     const toonBytes = this.toonEncoder(ilpInfoEvent);
-    const base64Toon = Buffer.from(toonBytes).toString("base64");
-    const amount = String(BigInt(toonBytes.length) * this.basePricePerByte);
+    const identity = await this.connectorEdgeLookup.getIdentity(
+      result.peerInfo.ilpAddress
+    );
+    const amount = await this.resolveAnnounceAmount(
+      this.connectorEdgeLookup,
+      result.peerInfo.ilpAddress
+    );
+    const request = {
+      method: "POST",
+      target: "",
+      headers: [["content-type", "application/json"]],
+      body: toonBytes
+    };
+    const exchange = sealExchange(request, identity.publicKey);
+    const data = Buffer.from(exchange.data).toString("base64");
+    const executionCondition = Buffer.from(exchange.condition).toString(
+      "base64"
+    );
     let ilpResult;
     if (this.claimSigner && result.channelId && this.ilpClient.sendIlpPacketWithClaim) {
       const claim = await this.claimSigner(result.channelId, BigInt(amount));
       ilpResult = await this.ilpClient.sendIlpPacketWithClaim(
-        { destination: result.peerInfo.ilpAddress, amount, data: base64Toon },
+        {
+          destination: result.peerInfo.ilpAddress,
+          amount,
+          data,
+          executionCondition
+        },
         claim
       );
     } else {
       ilpResult = await this.ilpClient.sendIlpPacket({
         destination: result.peerInfo.ilpAddress,
         amount,
-        data: base64Toon
+        data,
+        executionCondition
       });
     }
-    if (ilpResult.accepted) {
+    const responseData = ilpResult.data !== void 0 ? Uint8Array.from(Buffer.from(ilpResult.data, "base64")) : void 0;
+    const outcome = readExchangeOutcome(
+      {
+        accepted: ilpResult.accepted,
+        code: ilpResult.code,
+        message: ilpResult.message
+      },
+      responseData,
+      exchange.sharedSecret
+    );
+    if (outcome.kind === "answered") {
       console.log(
         `[Bootstrap] Announced to ${result.registeredPeerId} via ILP (eventId: ${ilpInfoEvent.id})`
       );
@@ -3431,17 +3510,18 @@ var BootstrapService = class {
         eventId: ilpInfoEvent.id,
         amount
       });
-    } else {
-      const reason = `${ilpResult.code} ${ilpResult.message}`;
-      this.emit({
-        type: "bootstrap:announce-failed",
-        peerId: result.registeredPeerId,
-        reason
-      });
-      console.warn(
-        `[Bootstrap] Announce rejected by ${result.registeredPeerId}: ${reason}`
-      );
+      return;
     }
+    const refusedBy = outcome.kind === "destination-refused" ? "destination" : "path";
+    const reason = `${outcome.code} ${outcome.message} (${refusedBy} refused)`;
+    this.emit({
+      type: "bootstrap:announce-failed",
+      peerId: result.registeredPeerId,
+      reason
+    });
+    console.warn(
+      `[Bootstrap] Announce rejected by ${result.registeredPeerId}: ${reason}`
+    );
   }
   /**
    * Query a peer's relay for their kind:10032 ILP Peer Info event.
@@ -3996,6 +4076,9 @@ function createHttpIlpClient(baseUrl) {
             ...params.timeout !== void 0 && { timeout: params.timeout },
             ...params.expiresAt !== void 0 && {
               expiresAt: params.expiresAt
+            },
+            ...params.executionCondition !== void 0 && {
+              executionCondition: params.executionCondition
             }
           })
         });
@@ -4041,7 +4124,12 @@ function createDirectIlpClient(connector, _config) {
           destination: params.destination,
           amount,
           data,
-          expiresAt
+          expiresAt,
+          ...params.executionCondition !== void 0 && {
+            executionCondition: Uint8Array.from(
+              Buffer.from(params.executionCondition, "base64")
+            )
+          }
         });
         if (result.type === "fulfill" || result.type === 13) {
           return {
@@ -4211,6 +4299,9 @@ function createHttpIlpClient2(connectorUrl) {
             data: params.data,
             ...params.expiresAt !== void 0 && {
               expiresAt: params.expiresAt
+            },
+            ...params.executionCondition !== void 0 && {
+              executionCondition: params.executionCondition
             }
           }),
           signal: params.timeout ? AbortSignal.timeout(params.timeout) : void 0
@@ -4464,7 +4555,8 @@ function createToonNode(config) {
       ownIlpAddress: config.ilpInfo.ilpAddress,
       toonEncoder: config.toonEncoder,
       toonDecoder: config.toonDecoder,
-      basePricePerByte: config.basePricePerByte ?? 10n
+      basePricePerByte: config.basePricePerByte,
+      connectorEdgeLookup: config.connectorEdgeLookup
     },
     config.secretKey,
     config.ilpInfo
@@ -4648,8 +4740,49 @@ var SOLANA_CHAIN_PRESETS = {
     name: "solana-devnet",
     chainType: "solana",
     rpcUrl: "http://localhost:19899",
-    programId: "EdJxYPDxGvaJuu57DSUptf4soLv8enpdyQJJhHDLiydG",
+    // Deliberately empty: this preset targets a local `solana-test-validator`
+    // (see rpcUrl), not public devnet -- the public-devnet program id
+    // (2aEVJ8ko…, per connector's packages/solana-program/deployments/
+    // devnet-public.md) does not exist there. A local validator's program id
+    // is a fresh keypair generated per `cargo build-sbf` deploy, so no fixed
+    // default is meaningful; callers must supply the id of whatever they
+    // deployed locally via the `SOLANA_PROGRAM_ID` env override below.
+    programId: "",
     cluster: "devnet"
+  },
+  // Solana mainnet-beta (public). NOT wired into network-profile.ts's
+  // public tiers, which already resolve their own mainnet Solana endpoint
+  // (SOLANA_TIER.mainnet) independently of this low-level,
+  // e2e-stack-facing preset table.
+  "solana-mainnet": {
+    name: "solana-mainnet",
+    chainType: "solana",
+    rpcUrl: "https://api.mainnet-beta.solana.com",
+    // VERIFIED 2026-08-14, per toon#198: owner
+    // BPFLoaderUpgradeab1e11111111111111111111111 (executable, upgradeable),
+    // ProgramData 29MT16eh1GCdL4JWrJHjyTWu5ZMn217h25ojCvFpx2wc, 136,770
+    // bytes, deployed slot 439316400. Bytecode pulled back with
+    // `solana program dump` hashes identical to a local build from
+    // connector@main with the pinned `cargo build-sbf --tools-version
+    // v1.52`, so the on-chain program is provably the audited source. Full
+    // deployment record: toon-protocol/connector#971.
+    programId: "8e7BhzydH1EqL486tw6Lp99BXviH3i5JN8qNpMSNmHj3",
+    cluster: "mainnet-beta",
+    // Circle's native USDC mint on Solana mainnet-beta, 6 decimals.
+    // VERIFIED 2026-08-13 by Drew Pierson, per toon#166's "Needs a human
+    // before merge" criterion, on two independent sources:
+    //   - Circle's published list gives this address for Solana mainnet:
+    //     https://developers.circle.com/stablecoins/usdc-contract-addresses
+    //     That page names bridged representations separately where they
+    //     exist (X Layer's USDC.e); none is listed for Solana.
+    //   - mainnet-beta at slot 439080550: initialized mint, decimals 6,
+    //     supply ~7.73e9, live mint and freeze authorities, owned by the
+    //     SPL Token program (TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA),
+    //     not Token-2022.
+    // Native, not bridged. Two things not to confuse it with: this is the
+    // token's MINT ACCOUNT, never a transfer destination; and Circle runs
+    // separate CCTP/Gateway pre-mint addresses that are not this one.
+    tokenMint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
   }
 };
 var MINA_CHAIN_PRESETS = {