@armory-sh/base 0.2.27-alpha.23.81 → 0.2.28-alpha.23.83

package/dist/client-hooks-runtime.d.ts

@@ -2,6 +2,7 @@ import type { ClientHook, PaymentPayloadContext, PaymentRequiredContext } from "
 import type { PaymentRequirementsV2 } from "./types/v2";
 export declare const runOnPaymentRequiredHooks: <TWallet>(hooks: ClientHook<TWallet>[] | undefined, context: PaymentRequiredContext) => Promise<void>;
 export declare const selectRequirementWithHooks: <TWallet>(hooks: ClientHook<TWallet>[] | undefined, context: PaymentRequiredContext) => Promise<PaymentRequirementsV2>;
+export declare const getRequirementAttemptOrderWithHooks: <TWallet>(hooks: ClientHook<TWallet>[] | undefined, context: PaymentRequiredContext) => Promise<PaymentRequirementsV2[]>;
 export declare const runBeforeSignPaymentHooks: <TWallet>(hooks: ClientHook<TWallet>[] | undefined, context: PaymentPayloadContext<TWallet>) => Promise<void>;
 export declare const runAfterPaymentResponseHooks: <TWallet>(hooks: ClientHook<TWallet>[] | undefined, context: PaymentPayloadContext<TWallet> & {
     response: Response;

package/dist/index.d.ts

@@ -11,7 +11,7 @@ export { PaymentException, SigningError, X402ClientError, } from "./errors";
 export type { FacilitatorClientConfig, SupportedKind, SupportedResponse, } from "./payment-client";
 export { decodePayloadHeader, extractPayerAddress, getSupported, settlePayment, verifyPayment, } from "./payment-client";
 export type { PaymentConfig, ResolvedRequirementsConfig, } from "./payment-requirements";
-export { createPaymentRequirements, findRequirementByNetwork, } from "./payment-requirements";
+export { createPaymentRequirements, findRequirementByAccepted, findRequirementByNetwork, } 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

@@ -1311,17 +1311,16 @@ var validateAcceptConfig = (options, payTo, amount) => {
   }
   const tokens = [];
   for (const tokenId of tokenIds) {
-    let found = false;
+    let matches = 0;
     for (const network of networks) {
       const resolved = resolveToken(tokenId, network);
       if ("code" in resolved) {
         continue;
       }
       tokens.push(resolved);
-      found = true;
-      break;
+      matches += 1;
     }
-    if (!found) {
+    if (matches === 0) {
       return {
         success: false,
         error: createError(
@@ -1522,6 +1521,24 @@ function findRequirementByNetwork(requirements, network) {
   if (!netConfig) return void 0;
   return requirements.find((r) => r.network === netConfig.caip2Id);
 }
+function findRequirementByAccepted(requirements, accepted) {
+  const acceptedPayTo = typeof accepted.payTo === "string" ? accepted.payTo.toLowerCase() : "";
+  const exactMatch = requirements.find(
+    (requirement) => requirement.scheme === accepted.scheme && requirement.network === accepted.network && requirement.amount === accepted.amount && requirement.asset.toLowerCase() === accepted.asset.toLowerCase() && typeof requirement.payTo === "string" && requirement.payTo.toLowerCase() === acceptedPayTo
+  );
+  if (exactMatch) {
+    return exactMatch;
+  }
+  const payToAwareMatch = requirements.find(
+    (requirement) => requirement.scheme === accepted.scheme && requirement.network === accepted.network && acceptedPayTo.length > 0 && typeof requirement.payTo === "string" && requirement.payTo.toLowerCase() === acceptedPayTo
+  );
+  if (payToAwareMatch) {
+    return payToAwareMatch;
+  }
+  return requirements.find(
+    (requirement) => requirement.scheme === accepted.scheme && requirement.network === accepted.network
+  );
+}
 
 // src/protocol.ts
 function parseJsonOrBase64(value) {
@@ -1736,4 +1753,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, 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, findMatchingRoute, 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, 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, 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, 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, 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

@@ -20,3 +20,10 @@ export interface ResolvedRequirementsConfig {
 }
 export declare function createPaymentRequirements(config: PaymentConfig): ResolvedRequirementsConfig;
 export declare function findRequirementByNetwork(requirements: PaymentRequirementsV2[], network: string): PaymentRequirementsV2 | undefined;
+export declare function findRequirementByAccepted(requirements: PaymentRequirementsV2[], accepted: {
+    scheme: string;
+    network: string;
+    amount: string;
+    asset: string;
+    payTo: string;
+}): PaymentRequirementsV2 | undefined;

package/package.json

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

package/src/client-hooks-runtime.ts

@@ -90,6 +90,26 @@ export const selectRequirementWithHooks = async <TWallet>(
   return selected;
 };
 
+export const getRequirementAttemptOrderWithHooks = async <TWallet>(
+  hooks: ClientHook<TWallet>[] | undefined,
+  context: PaymentRequiredContext,
+): Promise<PaymentRequirementsV2[]> => {
+  if (!context.accepts.length) {
+    throw new Error("No payment requirements found in accepts array");
+  }
+
+  const hasSelectorHook = Boolean(hooks?.some((hook) => hook.selectRequirement));
+  if (!hasSelectorHook) {
+    const first = context.accepts[0];
+    context.selectedRequirement = first;
+    context.requirements = first;
+    return context.accepts;
+  }
+
+  const selected = await selectRequirementWithHooks(hooks, context);
+  return [selected];
+};
+
 export const runBeforeSignPaymentHooks = async <TWallet>(
   hooks: ClientHook<TWallet>[] | undefined,
   context: PaymentPayloadContext<TWallet>,

package/src/index.ts

@@ -122,6 +122,7 @@ export type {
 } from "./payment-requirements";
 export {
   createPaymentRequirements,
+  findRequirementByAccepted,
   findRequirementByNetwork,
 } from "./payment-requirements";
 // ============================================

package/src/payment-requirements.ts

@@ -254,3 +254,47 @@ export function findRequirementByNetwork(
 
   return requirements.find((r) => r.network === netConfig.caip2Id);
 }
+
+export function findRequirementByAccepted(
+  requirements: PaymentRequirementsV2[],
+  accepted: {
+    scheme: string;
+    network: string;
+    amount: string;
+    asset: string;
+    payTo: string;
+  },
+): PaymentRequirementsV2 | undefined {
+  const acceptedPayTo =
+    typeof accepted.payTo === "string" ? accepted.payTo.toLowerCase() : "";
+  const exactMatch = requirements.find(
+    (requirement) =>
+      requirement.scheme === accepted.scheme &&
+      requirement.network === accepted.network &&
+      requirement.amount === accepted.amount &&
+      requirement.asset.toLowerCase() === accepted.asset.toLowerCase() &&
+      typeof requirement.payTo === "string" &&
+      requirement.payTo.toLowerCase() === acceptedPayTo,
+  );
+  if (exactMatch) {
+    return exactMatch;
+  }
+
+  const payToAwareMatch = requirements.find(
+    (requirement) =>
+      requirement.scheme === accepted.scheme &&
+      requirement.network === accepted.network &&
+      acceptedPayTo.length > 0 &&
+      typeof requirement.payTo === "string" &&
+      requirement.payTo.toLowerCase() === acceptedPayTo,
+  );
+  if (payToAwareMatch) {
+    return payToAwareMatch;
+  }
+
+  return requirements.find(
+    (requirement) =>
+      requirement.scheme === accepted.scheme &&
+      requirement.network === accepted.network,
+  );
+}

package/src/validation.ts

@@ -573,17 +573,16 @@ export const validateAcceptConfig = (
 
   const tokens: ResolvedToken[] = [];
   for (const tokenId of tokenIds) {
-    let found = false;
+    let matches = 0;
     for (const network of networks) {
       const resolved = resolveToken(tokenId, network);
       if ("code" in resolved) {
         continue;
       }
       tokens.push(resolved);
-      found = true;
-      break;
+      matches += 1;
     }
-    if (!found) {
+    if (matches === 0) {
       return {
         success: false,
         error: createError(