@x402x/extensions 2.1.0 → 2.2.1

package/dist/index.d.mts

@@ -1390,7 +1390,7 @@ declare class AmountError extends Error {
  * parseDefaultAssetAmount('100', 'base-sepolia')       // '100000000' (100 USDC, not 100 atomic units)
  * ```
  */
-declare function parseDefaultAssetAmount(amount: string | number, network: Network): string;
+declare function parseDefaultAssetAmount(amount: string | number, network: string | Network): string;
 /**
  * Format atomic units to human-readable decimal string for the default asset (USDC)
  *
@@ -1408,7 +1408,7 @@ declare function parseDefaultAssetAmount(amount: string | number, network: Netwo
  * formatDefaultAssetAmount('1', 'base-sepolia')        // '0.000001'
  * ```
  */
-declare function formatDefaultAssetAmount(amount: string, network: Network): string;
+declare function formatDefaultAssetAmount(amount: string, network: string | Network): string;
 
 /**
  * Facilitator API client utilities for x402x
@@ -1815,7 +1815,7 @@ declare function getNetworkAlias(network: Network): string;
  * // { address: '0x036Cb...', decimals: 6, eip712: { name: 'USDC', version: '2' } }
  * ```
  */
-declare function getDefaultAsset(network: Network): AssetInfo;
+declare function getDefaultAsset(network: string | Network): AssetInfo;
 /**
  * Process price to atomic amount for the default asset on a network
  *
@@ -1832,7 +1832,7 @@ declare function getDefaultAsset(network: Network): AssetInfo;
  * // { amount: '1500000' }
  * ```
  */
-declare function processPriceToAtomicAmount(price: string | number, network: Network): {
+declare function processPriceToAtomicAmount(price: string | number, network: string | Network): {
     amount: string;
 } | {
     error: string;

package/dist/index.d.ts

@@ -1390,7 +1390,7 @@ declare class AmountError extends Error {
  * parseDefaultAssetAmount('100', 'base-sepolia')       // '100000000' (100 USDC, not 100 atomic units)
  * ```
  */
-declare function parseDefaultAssetAmount(amount: string | number, network: Network): string;
+declare function parseDefaultAssetAmount(amount: string | number, network: string | Network): string;
 /**
  * Format atomic units to human-readable decimal string for the default asset (USDC)
  *
@@ -1408,7 +1408,7 @@ declare function parseDefaultAssetAmount(amount: string | number, network: Netwo
  * formatDefaultAssetAmount('1', 'base-sepolia')        // '0.000001'
  * ```
  */
-declare function formatDefaultAssetAmount(amount: string, network: Network): string;
+declare function formatDefaultAssetAmount(amount: string, network: string | Network): string;
 
 /**
  * Facilitator API client utilities for x402x
@@ -1815,7 +1815,7 @@ declare function getNetworkAlias(network: Network): string;
  * // { address: '0x036Cb...', decimals: 6, eip712: { name: 'USDC', version: '2' } }
  * ```
  */
-declare function getDefaultAsset(network: Network): AssetInfo;
+declare function getDefaultAsset(network: string | Network): AssetInfo;
 /**
  * Process price to atomic amount for the default asset on a network
  *
@@ -1832,7 +1832,7 @@ declare function getDefaultAsset(network: Network): AssetInfo;
  * // { amount: '1500000' }
  * ```
  */
-declare function processPriceToAtomicAmount(price: string | number, network: Network): {
+declare function processPriceToAtomicAmount(price: string | number, network: string | Network): {
     amount: string;
 } | {
     error: string;

package/dist/index.js

@@ -180,7 +180,7 @@ function validateCommitmentParams(params) {
     BigInt(params.validAfter);
     BigInt(params.validBefore);
     BigInt(params.facilitatorFee);
-  } catch (e) {
+  } catch {
     throw new Error("Invalid numeric parameter");
   }
   if (!isValidHex(params.salt) || params.salt.length !== 66) {
@@ -203,17 +203,20 @@ var NETWORK_ALIASES_V1_TO_V2 = {
   "base-sepolia": "eip155:84532",
   "x-layer-testnet": "eip155:1952",
   "skale-base-sepolia": "eip155:324705682",
-  "base": "eip155:8453",
+  base: "eip155:8453",
   "x-layer": "eip155:196",
   "bsc-testnet": "eip155:97",
-  "bsc": "eip155:56"
+  bsc: "eip155:56"
 };
 var NETWORK_ALIASES = Object.entries(
   NETWORK_ALIASES_V1_TO_V2
-).reduce((acc, [name, caip2]) => {
-  acc[caip2] = name;
-  return acc;
-}, {});
+).reduce(
+  (acc, [name, caip2]) => {
+    acc[caip2] = name;
+    return acc;
+  },
+  {}
+);
 var DEFAULT_ASSETS = {
   "eip155:84532": {
     address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
@@ -282,7 +285,8 @@ function getNetworkAlias(network) {
   return networkAlias;
 }
 function getDefaultAsset(network) {
-  const assetInfo = DEFAULT_ASSETS[network];
+  const canonicalNetwork = toCanonicalNetworkKey(network);
+  const assetInfo = DEFAULT_ASSETS[canonicalNetwork];
   if (!assetInfo) {
     throw new Error(`No default asset configured for network: ${network}`);
   }
@@ -826,7 +830,10 @@ function validateSettlementExtra(extra) {
     return { valid: false, error: "salt is required" };
   }
   if (!isValid32ByteHex(extra.salt)) {
-    return { valid: false, error: "salt must be a 32-byte hex string (0x followed by 64 hex characters)" };
+    return {
+      valid: false,
+      error: "salt must be a 32-byte hex string (0x followed by 64 hex characters)"
+    };
   }
   return { valid: true };
 }
@@ -1031,8 +1038,8 @@ async function calculateFacilitatorFee(facilitatorUrl, network, hook, hookData,
       headers: {
         "Content-Type": "application/json"
       },
-      // Add timeout
-      signal: AbortSignal.timeout(3e3)
+      // Add timeout (10 seconds for remote facilitators with potential network latency)
+      signal: AbortSignal.timeout(1e4)
     });
     if (!response.ok) {
       const errorText = await response.text();
@@ -1160,7 +1167,9 @@ function createSettlementRouteConfig(baseConfig, settlementOptions) {
     const originalPayTo = typeof option.payTo === "string" ? option.payTo : void 0;
     const finalPayTo = settlementOptions?.finalPayTo || originalPayTo;
     if (!finalPayTo) {
-      throw new Error(`Cannot determine finalPayTo: neither settlementOptions.finalPayTo nor option.payTo (string) is provided for network ${network}`);
+      throw new Error(
+        `Cannot determine finalPayTo: neither settlementOptions.finalPayTo nor option.payTo (string) is provided for network ${network}`
+      );
     }
     const hook = settlementOptions?.hook || exports.TransferHook.getAddress(network);
     const hookData = settlementOptions?.hookData || exports.TransferHook.encode();
@@ -1182,10 +1191,15 @@ function createSettlementRouteConfig(baseConfig, settlementOptions) {
               extra: accepted.extra
             };
           } else {
-            console.warn("[x402x-settlement] Network/scheme mismatch in retry, falling back to probe");
+            console.warn(
+              "[x402x-settlement] Network/scheme mismatch in retry, falling back to probe"
+            );
           }
         } catch (error) {
-          console.error("[x402x-settlement] Failed to decode payment header, falling back to probe:", error);
+          console.error(
+            "[x402x-settlement] Failed to decode payment header, falling back to probe:",
+            error
+          );
         }
       }
       console.log("[x402x-settlement] Probe request, generating new salt and querying fee");
@@ -1209,7 +1223,11 @@ function createSettlementRouteConfig(baseConfig, settlementOptions) {
         facilitatorFee = settlementOptions.facilitatorFee;
         console.log("[x402x-settlement] Using fixed facilitatorFee:", facilitatorFee);
       } else {
-        console.log("[x402x-settlement] Querying facilitator for fee:", { network, hook, hookData });
+        console.log("[x402x-settlement] Querying facilitator for fee:", {
+          network,
+          hook,
+          hookData
+        });
         try {
           const feeResult = await calculateFacilitatorFee(facilitatorUrl, network, hook, hookData);
           if (!feeResult.hookAllowed) {
@@ -1268,10 +1286,7 @@ function createSettlementRouteConfig(baseConfig, settlementOptions) {
   };
 }
 function registerSettlementHooks(server, config = {}) {
-  const {
-    enableSaltExtraction = true,
-    validateSettlementParams = true
-  } = config;
+  const { enableSaltExtraction = true, validateSettlementParams = true } = config;
   if (enableSaltExtraction) {
     server.onBeforeVerify(async (context) => {
       const { paymentPayload, requirements } = context;
@@ -1283,11 +1298,13 @@ function registerSettlementHooks(server, config = {}) {
           }
           const info = extension.info;
           if (info.salt) requirements.extra.salt = info.salt;
-          if (info.settlementRouter) requirements.extra.settlementRouter = info.settlementRouter;
+          if (info.settlementRouter)
+            requirements.extra.settlementRouter = info.settlementRouter;
           if (info.hook) requirements.extra.hook = info.hook;
           if (info.hookData) requirements.extra.hookData = info.hookData;
           if (info.finalPayTo) requirements.extra.payTo = info.finalPayTo;
-          if (info.facilitatorFee !== void 0) requirements.extra.facilitatorFee = info.facilitatorFee;
+          if (info.facilitatorFee !== void 0)
+            requirements.extra.facilitatorFee = info.facilitatorFee;
         }
       }
       return void 0;
@@ -1541,7 +1558,7 @@ var ExactEvmSchemeWithRouterSettlement = class {
   }
   /**
    * Creates a payment payload for the Exact scheme with router settlement.
-   * 
+   *
    * This method:
    * 1. Extracts settlement parameters from PaymentRequired.extensions
    * 2. Calculates a commitment hash binding all parameters
@@ -1551,7 +1568,7 @@ var ExactEvmSchemeWithRouterSettlement = class {
    * @param x402Version - The x402 protocol version (must be 2)
    * @param paymentRequirements - The payment requirements from the server
    * @returns Promise resolving to a payment payload
-   * 
+   *
    * @throws Error if x402Version is not 2
    * @throws Error if x402x-router-settlement extension is missing
    * @throws Error if required settlement parameters are missing
@@ -1660,18 +1677,27 @@ function injectX402xExtensionHandler(client, onRouterSettlementExtension) {
     const { paymentRequired, selectedRequirements } = context;
     console.log("[x402x-handler] onBeforePaymentCreation called");
     console.log("[x402x-handler] selectedRequirements.network:", selectedRequirements.network);
-    console.log("[x402x-handler] selectedRequirements.extra keys:", Object.keys(selectedRequirements.extra || {}));
+    console.log(
+      "[x402x-handler] selectedRequirements.extra keys:",
+      Object.keys(selectedRequirements.extra || {})
+    );
     const perOptionExtension = selectedRequirements.extra?.[ROUTER_SETTLEMENT_KEY];
     if (perOptionExtension) {
       if (!paymentRequired.extensions) {
         paymentRequired.extensions = {};
       }
       paymentRequired.extensions[ROUTER_SETTLEMENT_KEY] = perOptionExtension;
-      console.log("[x402x-handler] \u2705 Copied per-option x402x info into PaymentRequired.extensions");
+      console.log(
+        "[x402x-handler] \u2705 Copied per-option x402x info into PaymentRequired.extensions"
+      );
       console.log("[x402x-handler] Extension info:", JSON.stringify(perOptionExtension, null, 2));
     } else {
-      console.warn("[x402x-handler] \u26A0\uFE0F No per-option x402x info found in selectedRequirements.extra");
-      console.warn("[x402x-handler] This may cause facilitator errors. Check server-side createSettlementRouteConfig.");
+      console.warn(
+        "[x402x-handler] \u26A0\uFE0F No per-option x402x info found in selectedRequirements.extra"
+      );
+      console.warn(
+        "[x402x-handler] This may cause facilitator errors. Check server-side createSettlementRouteConfig."
+      );
     }
     if (onRouterSettlementExtension) {
       const extensionToUse = perOptionExtension || paymentRequired.extensions?.[ROUTER_SETTLEMENT_KEY];