@armory-sh/base 0.2.30 → 0.2.32

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export type { FacilitatorClientConfig, SupportedKind, SupportedResponse, } from
 export { decodePayloadHeader, extractPayerAddress, getSupported, settlePayment, verifyPayment, } from "./payment-client";
 export { clearFacilitatorCapabilityCache, filterExtensionsForFacilitator, filterExtensionsForFacilitators, filterExtensionsForRequirements, } from "./facilitator-capabilities";
 export type { PaymentConfig, ResolvedRequirementsConfig, } from "./payment-requirements";
-export { createPaymentRequirements, findRequirementByAccepted, findRequirementByNetwork, resolveFacilitatorUrlFromRequirement, } from "./payment-requirements";
+export { createPaymentRequirements, enrichPaymentRequirement, enrichPaymentRequirements, findRequirementByAccepted, findRequirementByNetwork, resolveFacilitatorUrlFromRequirement, } from "./payment-requirements";
 export { calculateValidBefore, detectX402Version, generateNonce, getPaymentHeaderName, parseJsonOrBase64, } from "./protocol";
 export type { AcceptPaymentOptions, ArmoryPaymentResult, FacilitatorConfig, FacilitatorSettleResult, FacilitatorVerifyResult, NetworkId, PaymentError, PaymentErrorCode, PaymentResult, PayToAddress, PricingConfig, ResolvedFacilitator, ResolvedNetwork, ResolvedPaymentConfig, ResolvedToken, SettlementMode, TokenId, ValidationError, } from "./types/api";
 export type { BeforePaymentHook, ClientHook, ClientHookErrorContext, ExtensionHook, HookConfig, HookRegistry, HookResult, OnPaymentRequiredHook, PaymentPayloadContext, PaymentRequiredContext, } from "./types/hooks";

package/dist/index.js

@@ -1368,6 +1368,24 @@ var isResolvedToken = (value) => {
 };
 
 // src/payment-requirements.ts
+function resolveAmountForNetwork(config, network) {
+  const defaultAmount = config.amount ?? "1.0";
+  if (!config.amounts) {
+    return defaultAmount;
+  }
+  const explicitDefault = config.amounts.default;
+  const fallbackAmount = explicitDefault ?? defaultAmount;
+  for (const [networkKey, amount] of Object.entries(config.amounts)) {
+    if (networkKey === "default") {
+      continue;
+    }
+    const resolvedNetwork = resolveNetwork(networkKey);
+    if (!isValidationError2(resolvedNetwork) && resolvedNetwork.config.chainId === network.config.chainId) {
+      return amount;
+    }
+  }
+  return fallbackAmount;
+}
 var DEFAULT_NETWORKS = [
   "ethereum",
   "base",
@@ -1380,6 +1398,50 @@ var DEFAULT_TOKENS = ["usdc"];
 var isValidationError2 = (value) => {
   return typeof value === "object" && value !== null && "code" in value;
 };
+var coerceMetadata = (requirement) => {
+  if (typeof requirement.name === "string" && typeof requirement.version === "string") {
+    return { name: requirement.name, version: requirement.version };
+  }
+  const extraName = requirement.extra && typeof requirement.extra === "object" && typeof requirement.extra.name === "string" ? requirement.extra.name : void 0;
+  const extraVersion = requirement.extra && typeof requirement.extra === "object" && typeof requirement.extra.version === "string" ? requirement.extra.version : void 0;
+  return { name: extraName, version: extraVersion };
+};
+var resolveTokenMetadata = (requirement) => {
+  const chainId = parseInt(requirement.network.split(":")[1] || "0", 10);
+  if (!Number.isFinite(chainId) || chainId <= 0) {
+    return {};
+  }
+  const token = getToken(chainId, requirement.asset);
+  if (!token) {
+    return {};
+  }
+  return {
+    name: token.name,
+    version: token.version
+  };
+};
+function enrichPaymentRequirement(requirement) {
+  const metadata = coerceMetadata(requirement);
+  const fallback = resolveTokenMetadata(requirement);
+  const name = metadata.name ?? fallback.name;
+  const version = metadata.version ?? fallback.version;
+  if (!name || !version) {
+    return requirement;
+  }
+  return {
+    ...requirement,
+    name,
+    version,
+    extra: {
+      ...requirement.extra ?? {},
+      name,
+      version
+    }
+  };
+}
+function enrichPaymentRequirements(requirements) {
+  return requirements.map(enrichPaymentRequirement);
+}
 function resolvePayTo(config, network, token) {
   const chainId = network.config.chainId;
   if (config.payToByToken) {
@@ -1495,7 +1557,6 @@ function createPaymentRequirements(config) {
     chain,
     tokens,
     token,
-    amount = "1.0",
     maxTimeoutSeconds = 300
   } = config;
   const chainInputs = chain ? [chain] : chains;
@@ -1507,12 +1568,13 @@ function createPaymentRequirements(config) {
   const requirements = [];
   for (const network of networks) {
     const tokensToResolve = tokenInputs?.length ? tokenInputs : DEFAULT_TOKENS;
+    const resolvedAmount = resolveAmountForNetwork(config, network);
+    const atomicAmount = toAtomicUnits(resolvedAmount);
     for (const tokenId of tokensToResolve) {
       const resolvedToken = resolveToken(tokenId, network);
       if (isValidationError2(resolvedToken)) {
         continue;
       }
-      const atomicAmount = toAtomicUnits(amount);
       const tokenConfig = resolvedToken.config;
       const resolvedPayTo = resolvePayTo(config, network, resolvedToken);
       resolveFacilitatorUrl(
@@ -1527,6 +1589,8 @@ function createPaymentRequirements(config) {
         asset: tokenConfig.contractAddress,
         payTo: resolvedPayTo,
         maxTimeoutSeconds,
+        name: tokenConfig.name,
+        version: tokenConfig.version,
         extra: {
           name: tokenConfig.name,
           version: tokenConfig.version
@@ -1869,4 +1933,4 @@ function validateRouteConfig(config) {
   return null;
 }
 
-export { EIP712_TYPES, ERC20_ABI, EURC_BASE, NETWORKS, PAYMENT_REQUIRED_HEADER, PAYMENT_RESPONSE_HEADER, PAYMENT_SIGNATURE_HEADER, PaymentException, SCHEMES, SKL_SKALE_BASE, SKL_SKALE_BASE_SEPOLIA, SigningError, TOKENS, USDC_BASE, USDC_BASE_SEPOLIA, USDC_DOMAIN, USDC_SKALE_BASE, USDC_SKALE_BASE_SEPOLIA, USDT_SKALE_BASE, USDT_SKALE_BASE_SEPOLIA, V2_HEADERS, WBTC_SKALE_BASE, WBTC_SKALE_BASE_SEPOLIA, WETH_SKALE_BASE, WETH_SKALE_BASE_SEPOLIA, X402ClientError, X402_VERSION, addressToAssetId, assetIdToAddress, caip2ToNetwork, calculateValidBefore, checkFacilitatorSupport, clearFacilitatorCapabilityCache, combineSignature as combineSignatureV2, createEIP712Domain, createError, createNonce, createPaymentRequiredHeaders, createPaymentRequirements, createSettlementHeaders, createTransferWithAuthorization, decodeBase64ToUtf8, decodePayloadHeader, decodePayment, decodePaymentV2, decodeSettlementResponse, decodeSettlementV2, decodeX402Response, detectPaymentVersion, detectX402Version, encodePayment, encodePaymentV2, encodeSettlementResponse, encodeSettlementV2, encodeUtf8ToBase64, encodeX402Response, extractPayerAddress, extractPaymentFromHeaders, filterExtensionsForFacilitator, filterExtensionsForFacilitators, filterExtensionsForRequirements, findMatchingRoute, findRequirementByAccepted, findRequirementByNetwork, fromAtomicUnits, generateNonce, getAllCustomTokens, getAllTokens, getAvailableNetworks, getAvailableTokens, getCurrentTimestamp, getCustomToken, getEURCTokens, getMainnets, getNetworkByChainId, getNetworkConfig, getPaymentHeaderName, getSKLTokens, getSupported, getTestnets, getToken, getTokensByChain, getTokensBySymbol, getTxHash, getUSDCTokens, getUSDTTokens, getWBTCTokens, getWETHTokens, isAddress2 as isAddress, isCAIP2ChainId, isCAIPAssetId, isCustomToken, isExactEvmPayload, isPaymentPayload, isPaymentPayloadV2, isPaymentRequiredV2, isPaymentV2, isResolvedNetwork, isResolvedToken, isSettlementSuccessful, isSettlementV2, isValidAddress, isValidationError, isX402V2Payload, isX402V2PaymentRequired, isX402V2Requirements, isX402V2Settlement, matchRoute, networkToCaip2, normalizeAddress, normalizeBase64Url, normalizeNetworkName, parseJsonOrBase64, parseRoutePattern, parseSignature as parseSignatureV2, registerToken, resolveFacilitator, resolveFacilitatorUrlFromRequirement, resolveNetwork, resolveToken, runAfterPaymentResponseHooks, runBeforeSignPaymentHooks, runOnPaymentRequiredHooks, safeBase64Decode2 as safeBase64Decode, safeBase64Encode2 as safeBase64Encode, selectRequirementWithHooks, settlePayment, toAtomicUnits, toBase64Url, unregisterToken, validateAcceptConfig, validatePaymentConfig, validateRouteConfig, validateTransferWithAuthorization, verifyPayment };
+export { EIP712_TYPES, ERC20_ABI, EURC_BASE, NETWORKS, PAYMENT_REQUIRED_HEADER, PAYMENT_RESPONSE_HEADER, PAYMENT_SIGNATURE_HEADER, PaymentException, SCHEMES, SKL_SKALE_BASE, SKL_SKALE_BASE_SEPOLIA, SigningError, TOKENS, USDC_BASE, USDC_BASE_SEPOLIA, USDC_DOMAIN, USDC_SKALE_BASE, USDC_SKALE_BASE_SEPOLIA, USDT_SKALE_BASE, USDT_SKALE_BASE_SEPOLIA, V2_HEADERS, WBTC_SKALE_BASE, WBTC_SKALE_BASE_SEPOLIA, WETH_SKALE_BASE, WETH_SKALE_BASE_SEPOLIA, X402ClientError, X402_VERSION, addressToAssetId, assetIdToAddress, caip2ToNetwork, calculateValidBefore, checkFacilitatorSupport, clearFacilitatorCapabilityCache, combineSignature as combineSignatureV2, createEIP712Domain, createError, createNonce, createPaymentRequiredHeaders, createPaymentRequirements, createSettlementHeaders, createTransferWithAuthorization, decodeBase64ToUtf8, decodePayloadHeader, decodePayment, decodePaymentV2, decodeSettlementResponse, decodeSettlementV2, decodeX402Response, detectPaymentVersion, detectX402Version, encodePayment, encodePaymentV2, encodeSettlementResponse, encodeSettlementV2, encodeUtf8ToBase64, encodeX402Response, enrichPaymentRequirement, enrichPaymentRequirements, extractPayerAddress, extractPaymentFromHeaders, filterExtensionsForFacilitator, filterExtensionsForFacilitators, filterExtensionsForRequirements, findMatchingRoute, findRequirementByAccepted, findRequirementByNetwork, fromAtomicUnits, generateNonce, getAllCustomTokens, getAllTokens, getAvailableNetworks, getAvailableTokens, getCurrentTimestamp, getCustomToken, getEURCTokens, getMainnets, getNetworkByChainId, getNetworkConfig, getPaymentHeaderName, getSKLTokens, getSupported, getTestnets, getToken, getTokensByChain, getTokensBySymbol, getTxHash, getUSDCTokens, getUSDTTokens, getWBTCTokens, getWETHTokens, isAddress2 as isAddress, isCAIP2ChainId, isCAIPAssetId, isCustomToken, isExactEvmPayload, isPaymentPayload, isPaymentPayloadV2, isPaymentRequiredV2, isPaymentV2, isResolvedNetwork, isResolvedToken, isSettlementSuccessful, isSettlementV2, isValidAddress, isValidationError, isX402V2Payload, isX402V2PaymentRequired, isX402V2Requirements, isX402V2Settlement, matchRoute, networkToCaip2, normalizeAddress, normalizeBase64Url, normalizeNetworkName, parseJsonOrBase64, parseRoutePattern, parseSignature as parseSignatureV2, registerToken, resolveFacilitator, resolveFacilitatorUrlFromRequirement, resolveNetwork, resolveToken, runAfterPaymentResponseHooks, runBeforeSignPaymentHooks, runOnPaymentRequiredHooks, safeBase64Decode2 as safeBase64Decode, safeBase64Encode2 as safeBase64Encode, selectRequirementWithHooks, settlePayment, toAtomicUnits, toBase64Url, unregisterToken, validateAcceptConfig, validatePaymentConfig, validateRouteConfig, validateTransferWithAuthorization, verifyPayment };

package/dist/payment-requirements.d.ts

@@ -7,6 +7,7 @@ export interface PaymentConfig {
     tokens?: TokenId[];
     token?: TokenId;
     amount?: string;
+    amounts?: Record<string, string>;
     maxTimeoutSeconds?: number;
     payToByChain?: Record<string, Address | string>;
     payToByToken?: Record<string, Record<string, Address | string>>;
@@ -23,6 +24,8 @@ export interface FacilitatorRoutingConfig {
     facilitatorUrlByChain?: Record<string, string>;
     facilitatorUrlByToken?: Record<string, Record<string, string>>;
 }
+export declare function enrichPaymentRequirement(requirement: PaymentRequirementsV2): PaymentRequirementsV2;
+export declare function enrichPaymentRequirements(requirements: PaymentRequirementsV2[]): PaymentRequirementsV2[];
 export declare function resolveFacilitatorUrlFromRequirement(config: FacilitatorRoutingConfig, requirement: Pick<PaymentRequirementsV2, "network" | "asset">): string | undefined;
 export declare function createPaymentRequirements(config: PaymentConfig): ResolvedRequirementsConfig;
 export declare function findRequirementByNetwork(requirements: PaymentRequirementsV2[], network: string): PaymentRequirementsV2 | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/base",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "keywords": [

package/src/index.ts

@@ -128,6 +128,8 @@ export type {
 } from "./payment-requirements";
 export {
   createPaymentRequirements,
+  enrichPaymentRequirement,
+  enrichPaymentRequirements,
   findRequirementByAccepted,
   findRequirementByNetwork,
   resolveFacilitatorUrlFromRequirement,

package/src/payment-requirements.ts

@@ -6,6 +6,7 @@ import type {
   ValidationError,
 } from "./types/api";
 import { getNetworkConfig } from "./types/networks";
+import { getToken } from "./data/tokens";
 import type { Address, PaymentRequirementsV2 } from "./types/v2";
 import { toAtomicUnits } from "./utils/x402";
 import {
@@ -21,6 +22,7 @@ export interface PaymentConfig {
   tokens?: TokenId[];
   token?: TokenId;
   amount?: string;
+  amounts?: Record<string, string>;
   maxTimeoutSeconds?: number;
 
   payToByChain?: Record<string, Address | string>;
@@ -31,6 +33,35 @@ export interface PaymentConfig {
   facilitatorUrlByToken?: Record<string, Record<string, string>>;
 }
 
+function resolveAmountForNetwork(
+  config: PaymentConfig,
+  network: ResolvedNetwork,
+): string {
+  const defaultAmount = config.amount ?? "1.0";
+  if (!config.amounts) {
+    return defaultAmount;
+  }
+
+  const explicitDefault = config.amounts.default;
+  const fallbackAmount = explicitDefault ?? defaultAmount;
+
+  for (const [networkKey, amount] of Object.entries(config.amounts)) {
+    if (networkKey === "default") {
+      continue;
+    }
+
+    const resolvedNetwork = resolveNetwork(networkKey);
+    if (
+      !isValidationError(resolvedNetwork) &&
+      resolvedNetwork.config.chainId === network.config.chainId
+    ) {
+      return amount;
+    }
+  }
+
+  return fallbackAmount;
+}
+
 export interface ResolvedRequirementsConfig {
   requirements: PaymentRequirementsV2[];
   error?: ValidationError;
@@ -57,6 +88,78 @@ const isValidationError = (value: unknown): value is ValidationError => {
   return typeof value === "object" && value !== null && "code" in value;
 };
 
+const coerceMetadata = (
+  requirement: PaymentRequirementsV2,
+): { name?: string; version?: string } => {
+  if (typeof requirement.name === "string" && typeof requirement.version === "string") {
+    return { name: requirement.name, version: requirement.version };
+  }
+
+  const extraName =
+    requirement.extra &&
+    typeof requirement.extra === "object" &&
+    typeof requirement.extra.name === "string"
+      ? requirement.extra.name
+      : undefined;
+  const extraVersion =
+    requirement.extra &&
+    typeof requirement.extra === "object" &&
+    typeof requirement.extra.version === "string"
+      ? requirement.extra.version
+      : undefined;
+
+  return { name: extraName, version: extraVersion };
+};
+
+const resolveTokenMetadata = (
+  requirement: PaymentRequirementsV2,
+): { name?: string; version?: string } => {
+  const chainId = parseInt(requirement.network.split(":")[1] || "0", 10);
+  if (!Number.isFinite(chainId) || chainId <= 0) {
+    return {};
+  }
+
+  const token = getToken(chainId, requirement.asset);
+  if (!token) {
+    return {};
+  }
+
+  return {
+    name: token.name,
+    version: token.version,
+  };
+};
+
+export function enrichPaymentRequirement(
+  requirement: PaymentRequirementsV2,
+): PaymentRequirementsV2 {
+  const metadata = coerceMetadata(requirement);
+  const fallback = resolveTokenMetadata(requirement);
+  const name = metadata.name ?? fallback.name;
+  const version = metadata.version ?? fallback.version;
+
+  if (!name || !version) {
+    return requirement;
+  }
+
+  return {
+    ...requirement,
+    name,
+    version,
+    extra: {
+      ...(requirement.extra ?? {}),
+      name,
+      version,
+    },
+  };
+}
+
+export function enrichPaymentRequirements(
+  requirements: PaymentRequirementsV2[],
+): PaymentRequirementsV2[] {
+  return requirements.map(enrichPaymentRequirement);
+}
+
 function resolvePayTo(
   config: PaymentConfig,
   network: ResolvedNetwork,
@@ -235,7 +338,6 @@ export function createPaymentRequirements(
     chain,
     tokens,
     token,
-    amount = "1.0",
     maxTimeoutSeconds = 300,
   } = config;
 
@@ -251,6 +353,8 @@ export function createPaymentRequirements(
 
   for (const network of networks) {
     const tokensToResolve = tokenInputs?.length ? tokenInputs : DEFAULT_TOKENS;
+    const resolvedAmount = resolveAmountForNetwork(config, network);
+    const atomicAmount = toAtomicUnits(resolvedAmount);
 
     for (const tokenId of tokensToResolve) {
       const resolvedToken = resolveToken(tokenId, network);
@@ -258,7 +362,6 @@ export function createPaymentRequirements(
         continue;
       }
 
-      const atomicAmount = toAtomicUnits(amount);
       const tokenConfig = resolvedToken.config;
 
       const resolvedPayTo = resolvePayTo(config, network, resolvedToken);
@@ -275,6 +378,8 @@ export function createPaymentRequirements(
         asset: tokenConfig.contractAddress,
         payTo: resolvedPayTo as `0x${string}`,
         maxTimeoutSeconds,
+        name: tokenConfig.name,
+        version: tokenConfig.version,
         extra: {
           name: tokenConfig.name,
           version: tokenConfig.version,