@x402x/extensions 2.0.0 → 2.1.0

package/dist/index.js

@@ -2,6 +2,7 @@
 
 var viem = require('viem');
 var allChains = require('viem/chains');
+var http = require('@x402/core/http');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -197,7 +198,8 @@ function isValidHex(hex) {
 }
 
 // src/network-utils.ts
-var NETWORK_IDS = {
+var NETWORK_ALIASES_V1_TO_V2 = {
+  // V1 human-readable names -> V2 CAIP-2 canonical keys
   "base-sepolia": "eip155:84532",
   "x-layer-testnet": "eip155:1952",
   "skale-base-sepolia": "eip155:324705682",
@@ -206,15 +208,12 @@ var NETWORK_IDS = {
   "bsc-testnet": "eip155:97",
   "bsc": "eip155:56"
 };
-var NETWORK_NAMES = {
-  "eip155:84532": "base-sepolia",
-  "eip155:1952": "x-layer-testnet",
-  "eip155:324705682": "skale-base-sepolia",
-  "eip155:8453": "base",
-  "eip155:196": "x-layer",
-  "eip155:97": "bsc-testnet",
-  "eip155:56": "bsc"
-};
+var NETWORK_ALIASES = Object.entries(
+  NETWORK_ALIASES_V1_TO_V2
+).reduce((acc, [name, caip2]) => {
+  acc[caip2] = name;
+  return acc;
+}, {});
 var DEFAULT_ASSETS = {
   "eip155:84532": {
     address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
@@ -273,23 +272,14 @@ var DEFAULT_ASSETS = {
     }
   }
 };
-function getNetworkId(networkName) {
-  const networkId = NETWORK_IDS[networkName];
-  if (!networkId) {
-    throw new Error(
-      `Unsupported network: ${networkName}. Supported networks: ${Object.keys(NETWORK_IDS).join(", ")}`
-    );
-  }
-  return networkId;
-}
-function getNetworkName(network) {
-  const networkName = NETWORK_NAMES[network];
-  if (!networkName) {
+function getNetworkAlias(network) {
+  const networkAlias = NETWORK_ALIASES[network];
+  if (!networkAlias) {
     throw new Error(
-      `Unsupported network ID: ${network}. Supported network IDs: ${Object.keys(NETWORK_NAMES).join(", ")}`
+      `Unsupported network ID: ${network}. Supported network IDs: ${Object.keys(NETWORK_ALIASES).join(", ")}`
     );
   }
-  return networkName;
+  return networkAlias;
 }
 function getDefaultAsset(network) {
   const assetInfo = DEFAULT_ASSETS[network];
@@ -324,21 +314,8 @@ function processPriceToAtomicAmount(price, network) {
     };
   }
 }
-var NETWORK_ALIASES_V1_TO_V2 = {
-  // V1 human-readable names -> V2 CAIP-2 canonical keys
-  "base-sepolia": "eip155:84532",
-  "x-layer-testnet": "eip155:1952",
-  "skale-base-sepolia": "eip155:324705682",
-  "base": "eip155:8453",
-  "x-layer": "eip155:196",
-  "bsc-testnet": "eip155:97",
-  "bsc": "eip155:56"
-};
 function getSupportedNetworkIds() {
-  return Object.keys(NETWORK_NAMES);
-}
-function getSupportedNetworksV2() {
-  return getSupportedNetworkIds();
+  return Object.keys(NETWORK_ALIASES);
 }
 function getNetworkAliasesV1ToV2() {
   return { ...NETWORK_ALIASES_V1_TO_V2 };
@@ -346,11 +323,11 @@ function getNetworkAliasesV1ToV2() {
 function toCanonicalNetworkKey(network) {
   if (network.startsWith("eip155:")) {
     const canonicalNetwork2 = network;
-    if (canonicalNetwork2 in NETWORK_NAMES) {
+    if (canonicalNetwork2 in NETWORK_ALIASES) {
       return canonicalNetwork2;
     }
     throw new Error(
-      `Unsupported CAIP-2 network: ${network}. Supported networks: ${Object.keys(NETWORK_NAMES).join(", ")}`
+      `Unsupported CAIP-2 network: ${network}. Supported networks: ${Object.keys(NETWORK_ALIASES).join(", ")}`
     );
   }
   const canonicalNetwork = NETWORK_ALIASES_V1_TO_V2[network];
@@ -374,15 +351,33 @@ function getDefaultAssetConfig(network) {
     }
   };
 }
+function normalizeToCAIP2(network) {
+  if (network.startsWith("eip155:")) {
+    const caip22 = network;
+    if (!(caip22 in networks)) {
+      throw new Error(
+        `Unsupported CAIP-2 network: ${network}. Supported networks: ${Object.keys(networks).join(", ")}`
+      );
+    }
+    return caip22;
+  }
+  const caip2 = NETWORK_ALIASES_V1_TO_V2[network];
+  if (!caip2) {
+    throw new Error(
+      `Unknown network: ${network}. Supported networks: ${Object.keys(NETWORK_ALIASES_V1_TO_V2).join(", ")}`
+    );
+  }
+  return caip2;
+}
 var networks = {
-  "base-sepolia": {
-    chainId: parseInt(getNetworkId("base-sepolia").split(":")[1]),
+  "eip155:84532": {
+    chainId: 84532,
     name: "Base Sepolia",
     type: "testnet",
     addressExplorerBaseUrl: "https://sepolia.basescan.org/address/",
     txExplorerBaseUrl: "https://sepolia.basescan.org/tx/",
     settlementRouter: "0x817e4f0ee2fbdaac426f1178e149f7dc98873ecb",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("base-sepolia")),
+    defaultAsset: getDefaultAssetConfig("eip155:84532"),
     hooks: {
       transfer: "0x4DE234059C6CcC94B8fE1eb1BD24804794083569"
     },
@@ -397,14 +392,14 @@ var networks = {
       nativeToken: "ETH"
     }
   },
-  "x-layer-testnet": {
-    chainId: parseInt(getNetworkId("x-layer-testnet").split(":")[1]),
+  "eip155:1952": {
+    chainId: 1952,
     name: "X Layer Testnet",
     type: "testnet",
     addressExplorerBaseUrl: "https://www.oklink.com/xlayer-test/address/",
     txExplorerBaseUrl: "https://www.oklink.com/xlayer-test/tx/",
     settlementRouter: "0xba9980fb08771e2fd10c17450f52d39bcb9ed576",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("x-layer-testnet")),
+    defaultAsset: getDefaultAssetConfig("eip155:1952"),
     hooks: {
       transfer: "0xD4b98dd614c1Ea472fC4547a5d2B93f3D3637BEE"
     },
@@ -419,14 +414,14 @@ var networks = {
       nativeToken: "OKB"
     }
   },
-  "skale-base-sepolia": {
-    chainId: parseInt(getNetworkId("skale-base-sepolia").split(":")[1]),
+  "eip155:324705682": {
+    chainId: 324705682,
     name: "SKALE Base Sepolia",
     type: "testnet",
     addressExplorerBaseUrl: "https://base-sepolia-testnet-explorer.skalenodes.com/address/",
     txExplorerBaseUrl: "https://base-sepolia-testnet-explorer.skalenodes.com/tx/",
     settlementRouter: "0x1Ae0E196dC18355aF3a19985faf67354213F833D",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("skale-base-sepolia")),
+    defaultAsset: getDefaultAssetConfig("eip155:324705682"),
     hooks: {
       transfer: "0x2f05fe5674aE756E25C26855258B4877E9e021Fd"
     },
@@ -441,14 +436,14 @@ var networks = {
       nativeToken: "Credits"
     }
   },
-  "bsc-testnet": {
-    chainId: parseInt(getNetworkId("bsc-testnet").split(":")[1]),
+  "eip155:97": {
+    chainId: 97,
     name: "BSC Testnet",
     type: "testnet",
     addressExplorerBaseUrl: "https://testnet.bscscan.com/address/",
     txExplorerBaseUrl: "https://testnet.bscscan.com/tx/",
     settlementRouter: "0x1Ae0E196dC18355aF3a19985faf67354213F833D",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("bsc-testnet")),
+    defaultAsset: getDefaultAssetConfig("eip155:97"),
     hooks: {
       transfer: "0x2f05fe5674aE756E25C26855258B4877E9e021Fd"
     },
@@ -464,14 +459,14 @@ var networks = {
     }
   },
   // Mainnet configurations
-  base: {
-    chainId: parseInt(getNetworkId("base").split(":")[1]),
+  "eip155:8453": {
+    chainId: 8453,
     name: "Base Mainnet",
     type: "mainnet",
     addressExplorerBaseUrl: "https://basescan.org/address/",
     txExplorerBaseUrl: "https://basescan.org/tx/",
     settlementRouter: "0x73fc659Cd5494E69852bE8D9D23FE05Aab14b29B",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("base")),
+    defaultAsset: getDefaultAssetConfig("eip155:8453"),
     hooks: {
       transfer: "0x081258287F692D61575387ee2a4075f34dd7Aef7"
     },
@@ -486,14 +481,14 @@ var networks = {
       nativeToken: "ETH"
     }
   },
-  "x-layer": {
-    chainId: parseInt(getNetworkId("x-layer").split(":")[1]),
+  "eip155:196": {
+    chainId: 196,
     name: "X Layer Mainnet",
     type: "mainnet",
     addressExplorerBaseUrl: "https://www.oklink.com/xlayer/address/",
     txExplorerBaseUrl: "https://www.oklink.com/xlayer/tx/",
     settlementRouter: "0x73fc659Cd5494E69852bE8D9D23FE05Aab14b29B",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("x-layer")),
+    defaultAsset: getDefaultAssetConfig("eip155:196"),
     hooks: {
       transfer: "0x081258287F692D61575387ee2a4075f34dd7Aef7"
     },
@@ -508,14 +503,14 @@ var networks = {
       nativeToken: "OKB"
     }
   },
-  bsc: {
-    chainId: parseInt(getNetworkId("bsc").split(":")[1]),
+  "eip155:56": {
+    chainId: 56,
     name: "BSC Mainnet",
     type: "mainnet",
     addressExplorerBaseUrl: "https://bscscan.com/address/",
     txExplorerBaseUrl: "https://bscscan.com/tx/",
     settlementRouter: "0x1Ae0E196dC18355aF3a19985faf67354213F833D",
-    defaultAsset: getDefaultAssetConfig(getNetworkId("bsc")),
+    defaultAsset: getDefaultAssetConfig("eip155:56"),
     hooks: {
       transfer: "0x2f05fe5674aE756E25C26855258B4877E9e021Fd"
     },
@@ -532,7 +527,8 @@ var networks = {
   }
 };
 function getNetworkConfig(network) {
-  const config = networks[network];
+  const caip2Network = normalizeToCAIP2(network);
+  const config = networks[caip2Network];
   if (!config) {
     throw new Error(
       `Unsupported network: ${network}. Supported networks: ${Object.keys(networks).join(", ")}`
@@ -541,13 +537,18 @@ function getNetworkConfig(network) {
   return config;
 }
 function isNetworkSupported(network) {
-  return network in networks;
+  try {
+    const caip2Network = normalizeToCAIP2(network);
+    return caip2Network in networks;
+  } catch {
+    return false;
+  }
 }
-function getSupportedNetworkNames() {
-  return Object.keys(networks);
+function getSupportedNetworkAliases() {
+  return Object.keys(networks).map((caip2) => getNetworkAlias(caip2));
 }
 function getSupportedNetworks() {
-  return getSupportedNetworkNames();
+  return Object.keys(networks);
 }
 var customChains = {
   // X Layer Testnet
@@ -596,15 +597,31 @@ var customChains = {
   })
 };
 function getChain(network) {
-  const networkId = getNetworkId(network);
-  const chainId = parseInt(networkId.split(":")[1]);
+  let chainId;
+  if (network.startsWith("eip155:")) {
+    const caip2 = network;
+    if (!(caip2 in NETWORK_ALIASES)) {
+      throw new Error(
+        `Unsupported CAIP-2 network: ${network}. Supported networks: ${Object.keys(NETWORK_ALIASES).join(", ")}`
+      );
+    }
+    chainId = parseInt(network.split(":")[1]);
+  } else {
+    const caip2 = NETWORK_ALIASES_V1_TO_V2[network];
+    if (!caip2) {
+      throw new Error(
+        `Unknown network: ${network}. Supported networks: ${Object.keys(NETWORK_ALIASES_V1_TO_V2).join(", ")}`
+      );
+    }
+    chainId = parseInt(caip2.split(":")[1]);
+  }
   if (customChains[chainId]) {
     return customChains[chainId];
   }
   const chain = Object.values(allChains__namespace).find((c) => c.id === chainId);
   if (!chain) {
     throw new Error(
-      `Unsupported network: ${network} (chain ID: ${chainId}). Please add custom chain definition in chains.ts`
+      `Unsupported chain ID: ${chainId}. Please add custom chain definition in chains.ts`
     );
   }
   return chain;
@@ -664,15 +681,15 @@ exports.TransferHook = void 0;
     );
   }
   TransferHook2.encode = encode;
-  function getAddress(network) {
+  function getAddress2(network) {
     const config = getNetworkConfig(network);
     return config.hooks.transfer;
   }
-  TransferHook2.getAddress = getAddress;
+  TransferHook2.getAddress = getAddress2;
 })(exports.TransferHook || (exports.TransferHook = {}));
 exports.NFTMintHook = void 0;
 ((NFTMintHook2) => {
-  function getAddress(network) {
+  function getAddress2(network) {
     const config = getNetworkConfig(network);
     if (!config.demoHooks?.nftMint) {
       throw new Error(
@@ -681,7 +698,7 @@ exports.NFTMintHook = void 0;
     }
     return config.demoHooks.nftMint;
   }
-  NFTMintHook2.getAddress = getAddress;
+  NFTMintHook2.getAddress = getAddress2;
   function getNFTContractAddress(network) {
     const config = getNetworkConfig(network);
     if (!config.demoHooks?.randomNFT) {
@@ -711,7 +728,7 @@ exports.NFTMintHook = void 0;
 })(exports.NFTMintHook || (exports.NFTMintHook = {}));
 exports.RewardHook = void 0;
 ((RewardHook2) => {
-  function getAddress(network) {
+  function getAddress2(network) {
     const config = getNetworkConfig(network);
     if (!config.demoHooks?.reward) {
       throw new Error(
@@ -720,7 +737,7 @@ exports.RewardHook = void 0;
     }
     return config.demoHooks.reward;
   }
-  RewardHook2.getAddress = getAddress;
+  RewardHook2.getAddress = getAddress2;
   function getTokenAddress(network) {
     const config = getNetworkConfig(network);
     if (!config.demoHooks?.rewardToken) {
@@ -822,8 +839,8 @@ function assertValidSettlementExtra(extra) {
 
 // src/utils.ts
 function addSettlementExtra(requirements, params) {
-  const networkName = getNetworkName(requirements.network);
-  const config = getNetworkConfig(networkName);
+  const networkAlias = getNetworkAlias(requirements.network);
+  const config = getNetworkConfig(networkAlias);
   const existingExtra = requirements.extra || {};
   const name = existingExtra.name || config.defaultAsset.eip712.name;
   const version = existingExtra.version || config.defaultAsset.eip712.version;
@@ -859,6 +876,9 @@ function createRouterSettlementExtension(params) {
   if (params?.description !== void 0) {
     info.description = params.description;
   }
+  if (params?.salt) {
+    info.salt = params.salt;
+  }
   if (params?.settlementRouter) info.settlementRouter = params.settlementRouter;
   if (params?.hook) info.hook = params.hook;
   if (params?.hookData) info.hookData = params.hookData;
@@ -878,8 +898,9 @@ function createRouterSettlementExtension(params) {
         finalPayTo: { type: "string", pattern: "^0x[a-fA-F0-9]{40}$" },
         facilitatorFee: { type: "string" }
       },
-      // Salt is required in the final enriched version but not in the initial declaration
-      required: ["schemaVersion", "settlementRouter", "hook", "hookData", "finalPayTo"]
+      // Salt is required in the final enriched version
+      // facilitatorFee is optional (facilitator will calculate if missing)
+      required: ["schemaVersion", "salt", "settlementRouter", "hook", "hookData", "finalPayTo"]
     };
   }
   return {
@@ -920,202 +941,6 @@ function createExtensionDeclaration(params) {
   };
 }
 
-// src/settlement-routes.ts
-function createSettlementRouteConfig(baseConfig, settlementOptions) {
-  const acceptsArray = Array.isArray(baseConfig.accepts) ? baseConfig.accepts : [baseConfig.accepts];
-  const firstOption = acceptsArray[0];
-  const firstNetwork = firstOption.network;
-  const networkConfig = getNetworkConfig(firstNetwork);
-  if (!networkConfig) {
-    throw new Error(`Network configuration not found for: ${firstNetwork}`);
-  }
-  const hook = settlementOptions.hook || exports.TransferHook.getAddress(firstNetwork);
-  const hookData = settlementOptions.hookData || exports.TransferHook.encode();
-  const enhancedAccepts = acceptsArray.map((option) => {
-    const network = typeof option.network === "string" ? option.network : option.network;
-    const optionNetworkConfig = getNetworkConfig(network);
-    if (!optionNetworkConfig) {
-      throw new Error(`Network configuration not found for: ${network}`);
-    }
-    const enhancedOption = {
-      ...option,
-      // Override payTo to use settlementRouter as the immediate recipient
-      payTo: optionNetworkConfig.settlementRouter,
-      // Only include EIP-712 domain info in extra
-      extra: {
-        ...option.extra || {},
-        name: optionNetworkConfig.defaultAsset.eip712.name,
-        version: optionNetworkConfig.defaultAsset.eip712.version
-      }
-    };
-    return enhancedOption;
-  });
-  const extensions = {
-    ...baseConfig.extensions || {},
-    ...createExtensionDeclaration({
-      description: settlementOptions.description || "Router settlement with atomic fee distribution",
-      // Pass settlement parameters to be included in extension info
-      settlementRouter: networkConfig.settlementRouter,
-      hook,
-      hookData,
-      finalPayTo: settlementOptions.finalPayTo,
-      facilitatorFee: settlementOptions.facilitatorFee || "0"
-    })
-  };
-  return {
-    ...baseConfig,
-    accepts: enhancedAccepts.length === 1 ? enhancedAccepts[0] : enhancedAccepts,
-    extensions
-  };
-}
-function registerSettlementHooks(server, config = {}) {
-  const {
-    enableSaltExtraction = true,
-    validateSettlementParams = true
-  } = config;
-  if (enableSaltExtraction) {
-    server.onBeforeVerify(async (context) => {
-      const { paymentPayload, requirements } = context;
-      if (paymentPayload.extensions && "x402x-router-settlement" in paymentPayload.extensions) {
-        const extension = paymentPayload.extensions["x402x-router-settlement"];
-        if (extension?.info) {
-          if (!requirements.extra) {
-            requirements.extra = {};
-          }
-          const info = extension.info;
-          if (info.salt) requirements.extra.salt = info.salt;
-          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;
-        }
-      }
-      return void 0;
-    });
-  }
-  if (validateSettlementParams) {
-    server.onBeforeSettle(async (context) => {
-      const { paymentPayload, requirements } = context;
-      let settlementParams = {};
-      if (paymentPayload.extensions && "x402x-router-settlement" in paymentPayload.extensions) {
-        const extension = paymentPayload.extensions["x402x-router-settlement"];
-        if (extension?.info) {
-          settlementParams = extension.info;
-        }
-      }
-      if (!settlementParams.settlementRouter && requirements.extra) {
-        settlementParams = requirements.extra;
-      }
-      const requiredFields = ["settlementRouter", "hook", "hookData"];
-      const payToField = "finalPayTo" in settlementParams ? "finalPayTo" : "payTo";
-      const missingFields = requiredFields.filter((field) => !settlementParams[field]);
-      if (!settlementParams[payToField]) {
-        missingFields.push(payToField);
-      }
-      if (missingFields.length > 0) {
-        return {
-          abort: true,
-          reason: `Missing settlement parameters: ${missingFields.join(", ")}`
-        };
-      }
-      return void 0;
-    });
-  }
-}
-
-// src/helpers.ts
-function registerRouterSettlement2(server) {
-  return registerRouterSettlement(server);
-}
-async function createX402xFacilitator(config) {
-  try {
-    const importFn = new Function("specifier", "return import(specifier)");
-    const facilitatorModule = await importFn("@x402x/facilitator-sdk");
-    return facilitatorModule.createRouterSettlementFacilitator(config);
-  } catch (error) {
-    throw new Error(
-      "createX402xFacilitator requires @x402x/facilitator-sdk to be installed. Please install it using your package manager."
-    );
-  }
-}
-function withRouterSettlement(requirements, options) {
-  if (!requirements.network) {
-    throw new Error("Network is required in payment requirements");
-  }
-  if (!requirements.asset) {
-    throw new Error("Asset is required in payment requirements");
-  }
-  const networkConfig = getNetworkConfig(requirements.network);
-  if (!networkConfig) {
-    throw new Error(`Network configuration not found for network: ${requirements.network}`);
-  }
-  const salt = options.salt || generateSalt();
-  const settlementExtra = {
-    settlementRouter: networkConfig.settlementRouter,
-    salt,
-    payTo: options.payTo,
-    facilitatorFee: options.facilitatorFee,
-    hook: options.hook,
-    hookData: options.hookData,
-    name: options.name || networkConfig.defaultAsset.eip712.name,
-    version: options.version || networkConfig.defaultAsset.eip712.version
-  };
-  const extensionKey = getRouterSettlementExtensionKey();
-  const extensionDeclaration = createRouterSettlementExtension({
-    description: "Router settlement with atomic fee distribution"
-  });
-  const reqWithExtensions = requirements;
-  return {
-    ...requirements,
-    extra: {
-      ...reqWithExtensions.extra || {},
-      ...settlementExtra
-    },
-    extensions: {
-      ...reqWithExtensions.extensions || {},
-      [extensionKey]: extensionDeclaration
-    }
-  };
-}
-function isRouterSettlement(requirements) {
-  return !!(requirements.extra && "settlementRouter" in requirements.extra);
-}
-
-// src/amount.ts
-var AmountError = class extends Error {
-  constructor(message) {
-    super(message);
-    this.name = "AmountError";
-  }
-};
-function parseDefaultAssetAmount(amount, network) {
-  if (amount === null || amount === void 0 || amount === "") {
-    throw new AmountError("Amount is required");
-  }
-  const result = processPriceToAtomicAmount(amount, network);
-  if ("error" in result) {
-    throw new AmountError(`Invalid amount format: ${result.error}`);
-  }
-  return result.amount;
-}
-function formatDefaultAssetAmount(amount, network) {
-  const atomicAmount = BigInt(amount);
-  if (atomicAmount < 0n) {
-    throw new AmountError("Amount cannot be negative");
-  }
-  const asset = getDefaultAsset(network);
-  const decimals = asset.decimals;
-  const amountStr = atomicAmount.toString().padStart(decimals + 1, "0");
-  const integerPart = amountStr.slice(0, -decimals) || "0";
-  const decimalPart = amountStr.slice(-decimals);
-  const trimmedDecimal = decimalPart.replace(/0+$/, "");
-  if (trimmedDecimal) {
-    return `${integerPart}.${trimmedDecimal}`;
-  }
-  return integerPart;
-}
-
 // src/facilitator.ts
 function isSettlementMode(paymentRequirements) {
   return !!paymentRequirements.extra?.settlementRouter;
@@ -1322,6 +1147,274 @@ async function settle(facilitatorUrl, paymentPayload, paymentRequirements, timeo
   }
 }
 
+// src/settlement-routes.ts
+var DEFAULT_FACILITATOR_URL = "https://facilitator.x402x.dev";
+function createSettlementRouteConfig(baseConfig, settlementOptions) {
+  const acceptsArray = Array.isArray(baseConfig.accepts) ? baseConfig.accepts : [baseConfig.accepts];
+  const enhancedAccepts = acceptsArray.map((option) => {
+    const network = typeof option.network === "string" ? option.network : option.network;
+    const optionNetworkConfig = getNetworkConfig(network);
+    if (!optionNetworkConfig) {
+      throw new Error(`Network configuration not found for: ${network}`);
+    }
+    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}`);
+    }
+    const hook = settlementOptions?.hook || exports.TransferHook.getAddress(network);
+    const hookData = settlementOptions?.hookData || exports.TransferHook.encode();
+    const facilitatorUrl = settlementOptions?.facilitatorUrl || DEFAULT_FACILITATOR_URL;
+    const hasFixedFee = settlementOptions?.facilitatorFee !== void 0;
+    const dynamicPrice = async (context) => {
+      const httpContext = context;
+      const isRetry = !!httpContext.paymentHeader;
+      if (isRetry) {
+        console.log("[x402x-settlement] Retry request detected, replaying accepted");
+        try {
+          const paymentPayload = http.decodePaymentSignatureHeader(httpContext.paymentHeader);
+          const accepted = paymentPayload.accepted;
+          if (accepted.network === network && accepted.scheme === option.scheme) {
+            console.log("[x402x-settlement] Replaying accepted for network:", network);
+            return {
+              asset: accepted.asset,
+              amount: accepted.amount,
+              extra: accepted.extra
+            };
+          } else {
+            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.log("[x402x-settlement] Probe request, generating new salt and querying fee");
+      const basePrice = typeof option.price === "function" ? await option.price(context) : option.price;
+      let moneyPrice;
+      if (typeof basePrice === "object" && basePrice !== null && "asset" in basePrice) {
+        return basePrice;
+      } else {
+        moneyPrice = basePrice;
+      }
+      const amountStr = typeof moneyPrice === "number" ? moneyPrice.toString() : moneyPrice.toString().replace(/[^0-9.]/g, "");
+      const amountFloat = parseFloat(amountStr);
+      if (isNaN(amountFloat)) {
+        throw new Error(`Invalid price format: ${moneyPrice}`);
+      }
+      const { address, decimals, eip712 } = optionNetworkConfig.defaultAsset;
+      const atomicAmount = BigInt(Math.floor(amountFloat * 10 ** decimals)).toString();
+      const salt = generateSalt();
+      let facilitatorFee;
+      if (hasFixedFee) {
+        facilitatorFee = settlementOptions.facilitatorFee;
+        console.log("[x402x-settlement] Using fixed facilitatorFee:", facilitatorFee);
+      } else {
+        console.log("[x402x-settlement] Querying facilitator for fee:", { network, hook, hookData });
+        try {
+          const feeResult = await calculateFacilitatorFee(facilitatorUrl, network, hook, hookData);
+          if (!feeResult.hookAllowed) {
+            throw new Error(`Hook not allowed by facilitator: ${hook} on network ${network}`);
+          }
+          facilitatorFee = feeResult.facilitatorFee;
+          console.log("[x402x-settlement] Got facilitatorFee from facilitator:", facilitatorFee);
+        } catch (error) {
+          console.error("[x402x-settlement] Failed to query facilitator fee:", error);
+          throw new Error(
+            `Failed to calculate facilitator fee for network ${network}: ${error instanceof Error ? error.message : String(error)}`
+          );
+        }
+      }
+      const settlementExtension = createExtensionDeclaration({
+        description: settlementOptions?.description || "Router settlement with atomic fee distribution",
+        settlementRouter: optionNetworkConfig.settlementRouter,
+        hook,
+        hookData,
+        finalPayTo,
+        facilitatorFee,
+        salt
+      });
+      return {
+        asset: address,
+        amount: atomicAmount,
+        extra: {
+          // EIP-712 domain parameters (scheme-specific for signing)
+          name: eip712.name,
+          version: eip712.version,
+          // Network-specific settlement extension parameters (per-option x402x declaration with salt + fee)
+          [ROUTER_SETTLEMENT_KEY]: settlementExtension[ROUTER_SETTLEMENT_KEY]
+        }
+      };
+    };
+    const enhancedOption = {
+      ...option,
+      // Override payTo to use settlementRouter as the immediate recipient
+      payTo: optionNetworkConfig.settlementRouter,
+      // Use DynamicPrice that queries fee on probe and replays on retry
+      price: dynamicPrice,
+      // Keep option.extra for any user-provided context (primary data is now in price.extra via dynamic function)
+      extra: option.extra
+    };
+    return enhancedOption;
+  });
+  const extensions = {
+    ...baseConfig.extensions || {}
+    // Only include non-network-specific metadata at root level
+    // Per-option x402x info is already in accepts[i].price.extra[ROUTER_SETTLEMENT_KEY]
+  };
+  return {
+    ...baseConfig,
+    accepts: enhancedAccepts.length === 1 ? enhancedAccepts[0] : enhancedAccepts,
+    extensions
+  };
+}
+function registerSettlementHooks(server, config = {}) {
+  const {
+    enableSaltExtraction = true,
+    validateSettlementParams = true
+  } = config;
+  if (enableSaltExtraction) {
+    server.onBeforeVerify(async (context) => {
+      const { paymentPayload, requirements } = context;
+      if (paymentPayload.extensions && "x402x-router-settlement" in paymentPayload.extensions) {
+        const extension = paymentPayload.extensions["x402x-router-settlement"];
+        if (extension?.info) {
+          if (!requirements.extra) {
+            requirements.extra = {};
+          }
+          const info = extension.info;
+          if (info.salt) requirements.extra.salt = info.salt;
+          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;
+        }
+      }
+      return void 0;
+    });
+  }
+  if (validateSettlementParams) {
+    server.onBeforeSettle(async (context) => {
+      const { paymentPayload, requirements } = context;
+      let settlementParams = {};
+      if (paymentPayload.extensions && "x402x-router-settlement" in paymentPayload.extensions) {
+        const extension = paymentPayload.extensions["x402x-router-settlement"];
+        if (extension?.info) {
+          settlementParams = extension.info;
+        }
+      }
+      if (!settlementParams.settlementRouter && requirements.extra) {
+        settlementParams = requirements.extra;
+      }
+      const requiredFields = ["settlementRouter", "hook", "hookData"];
+      const payToField = "finalPayTo" in settlementParams ? "finalPayTo" : "payTo";
+      const missingFields = requiredFields.filter((field) => !settlementParams[field]);
+      if (!settlementParams[payToField]) {
+        missingFields.push(payToField);
+      }
+      if (missingFields.length > 0) {
+        return {
+          abort: true,
+          reason: `Missing settlement parameters: ${missingFields.join(", ")}`
+        };
+      }
+      return void 0;
+    });
+  }
+}
+
+// src/helpers.ts
+function registerRouterSettlement2(server) {
+  return registerRouterSettlement(server);
+}
+async function createX402xFacilitator(config) {
+  try {
+    const importFn = new Function("specifier", "return import(specifier)");
+    const facilitatorModule = await importFn("@x402x/facilitator-sdk");
+    return facilitatorModule.createRouterSettlementFacilitator(config);
+  } catch (error) {
+    throw new Error(
+      "createX402xFacilitator requires @x402x/facilitator-sdk to be installed. Please install it using your package manager."
+    );
+  }
+}
+function withRouterSettlement(requirements, options) {
+  if (!requirements.network) {
+    throw new Error("Network is required in payment requirements");
+  }
+  if (!requirements.asset) {
+    throw new Error("Asset is required in payment requirements");
+  }
+  const networkConfig = getNetworkConfig(requirements.network);
+  if (!networkConfig) {
+    throw new Error(`Network configuration not found for network: ${requirements.network}`);
+  }
+  const salt = options.salt || generateSalt();
+  const settlementExtra = {
+    settlementRouter: networkConfig.settlementRouter,
+    salt,
+    payTo: options.payTo,
+    facilitatorFee: options.facilitatorFee,
+    hook: options.hook,
+    hookData: options.hookData,
+    name: options.name || networkConfig.defaultAsset.eip712.name,
+    version: options.version || networkConfig.defaultAsset.eip712.version
+  };
+  const extensionKey = getRouterSettlementExtensionKey();
+  const extensionDeclaration = createRouterSettlementExtension({
+    description: "Router settlement with atomic fee distribution"
+  });
+  const reqWithExtensions = requirements;
+  return {
+    ...requirements,
+    extra: {
+      ...reqWithExtensions.extra || {},
+      ...settlementExtra
+    },
+    extensions: {
+      ...reqWithExtensions.extensions || {},
+      [extensionKey]: extensionDeclaration
+    }
+  };
+}
+function isRouterSettlement(requirements) {
+  return !!(requirements.extra && "settlementRouter" in requirements.extra);
+}
+
+// src/amount.ts
+var AmountError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "AmountError";
+  }
+};
+function parseDefaultAssetAmount(amount, network) {
+  if (amount === null || amount === void 0 || amount === "") {
+    throw new AmountError("Amount is required");
+  }
+  const result = processPriceToAtomicAmount(amount, network);
+  if ("error" in result) {
+    throw new AmountError(`Invalid amount format: ${result.error}`);
+  }
+  return result.amount;
+}
+function formatDefaultAssetAmount(amount, network) {
+  const atomicAmount = BigInt(amount);
+  if (atomicAmount < 0n) {
+    throw new AmountError("Amount cannot be negative");
+  }
+  const asset = getDefaultAsset(network);
+  const decimals = asset.decimals;
+  const amountStr = atomicAmount.toString().padStart(decimals + 1, "0");
+  const integerPart = amountStr.slice(0, -decimals) || "0";
+  const decimalPart = amountStr.slice(-decimals);
+  const trimmedDecimal = decimalPart.replace(/0+$/, "");
+  if (trimmedDecimal) {
+    return `${integerPart}.${trimmedDecimal}`;
+  }
+  return integerPart;
+}
+
 // src/abi.ts
 var SETTLEMENT_ROUTER_ABI = [
   {
@@ -1413,77 +1506,197 @@ var SettlementRouterError = class extends Error {
     this.name = "SettlementRouterError";
   }
 };
-
-// src/legacy-compat.ts
-var SupportedEVMNetworks = [
-  "eip155:84532",
-  // Base Sepolia
-  "eip155:1444673419",
-  // SKALE Base Sepolia
-  "eip155:8453"
-  // Base Mainnet
-];
-var moneySchema = {
-  parse: (value) => {
-    if (typeof value === "string" || typeof value === "number") {
-      return value;
+var authorizationTypes = {
+  TransferWithAuthorization: [
+    { name: "from", type: "address" },
+    { name: "to", type: "address" },
+    { name: "value", type: "uint256" },
+    { name: "validAfter", type: "uint256" },
+    { name: "validBefore", type: "uint256" },
+    { name: "nonce", type: "bytes32" }
+  ]
+};
+var ExactEvmSchemeWithRouterSettlement = class {
+  /**
+   * Creates a new ExactEvmSchemeWithRouterSettlement instance.
+   *
+   * @param signer - The EVM signer for client operations (viem WalletClient or LocalAccount)
+   */
+  constructor(signer) {
+    this.signer = signer;
+    this.scheme = "exact";
+  }
+  /**
+   * Set router-settlement extension data for the next payment payload creation.
+   *
+   * Intended to be called from an `x402Client.onBeforePaymentCreation` hook, which has access
+   * to `paymentRequired.extensions`.
+   */
+  setRouterSettlementExtensionFromPaymentRequired(ext) {
+    if (!ext) {
+      this.routerSettlementFromPaymentRequired = void 0;
+      return;
     }
-    throw new Error("Invalid money value");
+    this.routerSettlementFromPaymentRequired = ext;
+  }
+  /**
+   * 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
+   * 3. Uses the commitment as the EIP-3009 nonce
+   * 4. Signs with settlementRouter as the 'to' address
+   *
+   * @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
+   */
+  async createPaymentPayload(x402Version, paymentRequirements) {
+    if (x402Version !== 2) {
+      throw new Error(
+        `ExactEvmSchemeWithRouterSettlement only supports x402 version 2, got: ${x402Version}`
+      );
+    }
+    const routerSettlement = paymentRequirements.extra?.[ROUTER_SETTLEMENT_KEY] ?? this.routerSettlementFromPaymentRequired;
+    if (!routerSettlement?.info) {
+      throw new Error(
+        "x402x-router-settlement extension not available for scheme signing. Ensure the resource server includes the extension in PaymentRequired.extensions and the client registered x402x via registerX402xScheme() (or injected the handler)."
+      );
+    }
+    const { salt, settlementRouter, hook, hookData, finalPayTo, facilitatorFee } = routerSettlement.info;
+    this.routerSettlementFromPaymentRequired = void 0;
+    if (!salt) throw new Error("Missing required parameter: salt");
+    if (!settlementRouter) throw new Error("Missing required parameter: settlementRouter");
+    if (!hook) throw new Error("Missing required parameter: hook");
+    if (hookData === void 0) throw new Error("Missing required parameter: hookData");
+    if (!finalPayTo) throw new Error("Missing required parameter: finalPayTo");
+    const resolvedFacilitatorFee = facilitatorFee ?? "0";
+    const chainId = parseInt(paymentRequirements.network.split(":")[1]);
+    if (isNaN(chainId)) {
+      throw new Error(`Invalid network format: ${paymentRequirements.network}`);
+    }
+    const now = Math.floor(Date.now() / 1e3);
+    const validAfter = (now - 600).toString();
+    const validBefore = (now + paymentRequirements.maxTimeoutSeconds).toString();
+    const commitmentParams = {
+      chainId,
+      hub: settlementRouter,
+      asset: paymentRequirements.asset,
+      from: this.signer.address,
+      value: paymentRequirements.amount,
+      validAfter,
+      validBefore,
+      salt,
+      payTo: finalPayTo,
+      facilitatorFee: resolvedFacilitatorFee,
+      hook,
+      hookData
+    };
+    const nonce = calculateCommitment(commitmentParams);
+    const authorization = {
+      from: this.signer.address,
+      to: viem.getAddress(settlementRouter),
+      value: paymentRequirements.amount,
+      validAfter,
+      validBefore,
+      nonce
+    };
+    const signature = await this.signAuthorization(authorization, paymentRequirements, chainId);
+    const payload = {
+      authorization,
+      signature
+    };
+    return {
+      x402Version,
+      payload
+    };
   }
-};
-var settleResponseHeader = "X-Payment-Response";
-var evm = {
   /**
-   * Check if a value is a valid EVM address
+   * Sign the EIP-3009 authorization using EIP-712
+   *
+   * @param authorization - The authorization to sign
+   * @param requirements - The payment requirements
+   * @param chainId - The chain ID
+   * @returns Promise resolving to the signature
    */
-  isAddress: (value) => {
-    if (typeof value !== "string") return false;
-    return /^0x[a-fA-F0-9]{40}$/.test(value);
+  async signAuthorization(authorization, requirements, chainId) {
+    if (!requirements.extra?.name || !requirements.extra?.version) {
+      throw new Error(
+        `EIP-712 domain parameters (name, version) are required in payment requirements for asset ${requirements.asset}`
+      );
+    }
+    const { name, version } = requirements.extra;
+    const domain = {
+      name,
+      version,
+      chainId,
+      verifyingContract: viem.getAddress(requirements.asset)
+    };
+    const message = {
+      from: viem.getAddress(authorization.from),
+      to: viem.getAddress(authorization.to),
+      value: BigInt(authorization.value),
+      validAfter: BigInt(authorization.validAfter),
+      validBefore: BigInt(authorization.validBefore),
+      nonce: authorization.nonce
+    };
+    return await this.signer.signTypedData({
+      domain,
+      types: authorizationTypes,
+      primaryType: "TransferWithAuthorization",
+      message
+    });
   }
 };
-var exact = {
-  name: "exact"
-  // Additional scheme properties would go here
-};
-var ChainIdToNetwork = {
-  84532: "eip155:84532",
-  // Base Sepolia
-  1444673419: "eip155:1444673419",
-  // SKALE Base Sepolia  
-  8453: "eip155:8453"
-  // Base Mainnet
-};
-function isMultiNetworkSigner(signer) {
-  return !!(signer && typeof signer === "object" && "signTransaction" in signer);
-}
-function isSvmSignerWallet(signer) {
-  return !!(signer && typeof signer === "object" && "publicKey" in signer);
-}
-function createPaymentHeader(_requirements, _signer) {
-  throw new Error("createPaymentHeader is not implemented in v2 - use x402Client instead");
-}
-function selectPaymentRequirements(_requirements, _selector) {
-  throw new Error("selectPaymentRequirements is not implemented in v2 - use x402Client instead");
-}
-function decodeXPaymentResponse(_header) {
-  throw new Error("decodeXPaymentResponse is not implemented in v2 - use x402HTTPClient instead");
-}
-function useFacilitator(_config) {
-  throw new Error("useFacilitator is not implemented in v2 - use FacilitatorClient instead");
+
+// src/client/extension-handler.ts
+function injectX402xExtensionHandler(client, onRouterSettlementExtension) {
+  return client.onBeforePaymentCreation(async (context) => {
+    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 || {}));
+    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] 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.");
+    }
+    if (onRouterSettlementExtension) {
+      const extensionToUse = perOptionExtension || paymentRequired.extensions?.[ROUTER_SETTLEMENT_KEY];
+      onRouterSettlementExtension(extensionToUse);
+    }
+  });
 }
-function createSigner(_config) {
-  throw new Error("createSigner is not implemented in v2 - use appropriate v2 signer patterns");
+function registerX402xScheme(client, network, signer) {
+  const scheme = new ExactEvmSchemeWithRouterSettlement(signer);
+  injectX402xExtensionHandler(client, (ext) => {
+    scheme.setRouterSettlementExtensionFromPaymentRequired(ext);
+  });
+  client.register(network, scheme);
+  return client;
 }
 
 exports.AmountError = AmountError;
-exports.ChainIdToNetwork = ChainIdToNetwork;
+exports.ExactEvmSchemeWithRouterSettlement = ExactEvmSchemeWithRouterSettlement;
 exports.FacilitatorValidationError = FacilitatorValidationError;
+exports.NETWORK_ALIASES = NETWORK_ALIASES;
 exports.NETWORK_ALIASES_V1_TO_V2 = NETWORK_ALIASES_V1_TO_V2;
 exports.ROUTER_SETTLEMENT_KEY = ROUTER_SETTLEMENT_KEY;
 exports.SETTLEMENT_ROUTER_ABI = SETTLEMENT_ROUTER_ABI;
 exports.SettlementExtraError = SettlementExtraError;
 exports.SettlementRouterError = SettlementRouterError;
-exports.SupportedEVMNetworks = SupportedEVMNetworks;
 exports.addSettlementExtra = addSettlementExtra;
 exports.assertValidSettlementExtra = assertValidSettlementExtra;
 exports.calculateCommitment = calculateCommitment;
@@ -1491,14 +1704,9 @@ exports.calculateFacilitatorFee = calculateFacilitatorFee;
 exports.clearFeeCache = clearFeeCache;
 exports.computeRoutePatterns = computeRoutePatterns;
 exports.createExtensionDeclaration = createExtensionDeclaration;
-exports.createPaymentHeader = createPaymentHeader;
 exports.createRouterSettlementExtension = createRouterSettlementExtension;
 exports.createSettlementRouteConfig = createSettlementRouteConfig;
-exports.createSigner = createSigner;
 exports.createX402xFacilitator = createX402xFacilitator;
-exports.decodeXPaymentResponse = decodeXPaymentResponse;
-exports.evm = evm;
-exports.exact = exact;
 exports.findMatchingPaymentRequirements = findMatchingPaymentRequirements;
 exports.findMatchingRoute = findMatchingRoute;
 exports.formatDefaultAssetAmount = formatDefaultAssetAmount;
@@ -1507,39 +1715,33 @@ exports.getChain = getChain;
 exports.getChainById = getChainById;
 exports.getCustomChains = getCustomChains;
 exports.getDefaultAsset = getDefaultAsset;
+exports.getNetworkAlias = getNetworkAlias;
 exports.getNetworkAliasesV1ToV2 = getNetworkAliasesV1ToV2;
 exports.getNetworkConfig = getNetworkConfig;
-exports.getNetworkId = getNetworkId;
-exports.getNetworkName = getNetworkName;
 exports.getRouterSettlementExtensionKey = getRouterSettlementExtensionKey;
+exports.getSupportedNetworkAliases = getSupportedNetworkAliases;
 exports.getSupportedNetworkIds = getSupportedNetworkIds;
-exports.getSupportedNetworkNames = getSupportedNetworkNames;
 exports.getSupportedNetworks = getSupportedNetworks;
-exports.getSupportedNetworksV2 = getSupportedNetworksV2;
+exports.injectX402xExtensionHandler = injectX402xExtensionHandler;
 exports.isCustomChain = isCustomChain;
-exports.isMultiNetworkSigner = isMultiNetworkSigner;
 exports.isNetworkSupported = isNetworkSupported;
 exports.isRouterSettlement = isRouterSettlement;
 exports.isSettlementMode = isSettlementMode;
-exports.isSvmSignerWallet = isSvmSignerWallet;
 exports.isValid32ByteHex = isValid32ByteHex;
 exports.isValidAddress = isValidAddress2;
 exports.isValidHex = isValidHex2;
 exports.isValidNumericString = isValidNumericString;
-exports.moneySchema = moneySchema;
 exports.networks = networks;
 exports.parseDefaultAssetAmount = parseDefaultAssetAmount;
 exports.parseSettlementExtra = parseSettlementExtra;
 exports.processPriceToAtomicAmount = processPriceToAtomicAmount;
 exports.registerRouterSettlement = registerRouterSettlement2;
 exports.registerSettlementHooks = registerSettlementHooks;
+exports.registerX402xScheme = registerX402xScheme;
 exports.routerSettlementServerExtension = routerSettlementServerExtension;
-exports.selectPaymentRequirements = selectPaymentRequirements;
 exports.settle = settle;
-exports.settleResponseHeader = settleResponseHeader;
 exports.toCanonicalNetworkKey = toCanonicalNetworkKey;
 exports.toJsonSafe = toJsonSafe;
-exports.useFacilitator = useFacilitator;
 exports.validateCommitmentParams = validateCommitmentParams;
 exports.validateSettlementExtra = validateSettlementExtra;
 exports.verify = verify;