@x402x/extensions 2.2.0 → 2.3.0

package/LICENSE

@@ -0,0 +1,190 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2025 Nuwa Protocol
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

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];