@armory-sh/client-ethers 0.2.26-alpha.23.76 → 0.2.26-alpha.23.78

package/dist/index.d.ts

@@ -1,37 +1,120 @@
+import { NetworkId, TokenId, ArmoryPaymentResult, ValidationError, X402ClientError, CustomToken, PaymentRequirementsV2, Address, PaymentPayloadV2 } from '@armory-sh/base';
+export { PaymentException as PaymentError, SigningError, X402ClientError } from '@armory-sh/base';
 import { Signer, Provider } from 'ethers';
 export { Provider, Signer } from 'ethers';
-import { PaymentRequirementsV2, Address, PaymentPayloadV2, X402ClientError, CustomToken, NetworkId, TokenId, ArmoryPaymentResult, ValidationError } from '@armory-sh/base';
-export { PaymentException as PaymentError, SigningError, X402ClientError } from '@armory-sh/base';
+import { ClientHook } from '@armory-sh/base/types/hooks';
 
 /**
- * X402 Protocol Implementation for Ethers Client (V2 Only)
- *
- * Handles parsing x402 V2 PAYMENT-REQUIRED headers
- * and generating x402 V2 PAYMENT-SIGNATURE payloads
+ * Simple one-line payment API for Armory (Ethers)
+ * Focus on DX/UX - "everything just magically works"
  */
 
 /**
- * Detect x402 protocol version from response headers
- * V2-only: Always returns 2
+ * Simple wallet input - accepts wallet directly or wrapped for backward compatibility
  */
-declare function detectX402Version(_response: Response): 2;
+type SimpleWalletInput = Signer | {
+    signer: Signer;
+};
 /**
- * Get payment header name for protocol version
+ * Normalized wallet (internal use)
  */
-declare function getPaymentHeaderName(_version: 2): string;
-interface ParsedPaymentRequirements {
-    version: 2;
-    requirements: PaymentRequirementsV2;
-}
+type NormalizedWallet = Signer;
 /**
- * Parse x402 PAYMENT-REQUIRED header from response
- * V2 only
+ * Normalize wallet input to internal format
  */
-declare function parsePaymentRequired(response: Response): ParsedPaymentRequirements;
+declare const normalizeWallet: (wallet: SimpleWalletInput) => NormalizedWallet;
 /**
- * Create x402 payment payload (V2-only wrapper)
+ * Make a payment-protected API request with one line of code
  */
-declare function createX402Payment(signer: Signer, parsed: ParsedPaymentRequirements, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
+declare const armoryPay: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: {
+    /** Request method (default: GET) */
+    method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+    /** Request body (for POST/PUT/PATCH) */
+    body?: unknown;
+    /** Request headers */
+    headers?: Record<string, string>;
+    /** Protocol version (V2 only) */
+    version?: 2;
+    /** Payment amount in token units (default: from 402 header) */
+    amount?: string;
+    /** Enable debug logging */
+    debug?: boolean;
+}) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Make a GET request with payment
+ */
+declare const armoryGet: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: Omit<Parameters<typeof armoryPay>[4], "method">) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Make a POST request with payment
+ */
+declare const armoryPost: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Make a PUT request with payment
+ */
+declare const armoryPut: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Make a DELETE request with payment
+ */
+declare const armoryDelete: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: Omit<Parameters<typeof armoryPay>[4], "method">) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Make a PATCH request with payment
+ */
+declare const armoryPatch: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
+/**
+ * Get the wallet address from a SimpleWalletInput
+ */
+declare const getWalletAddress: (wallet: SimpleWalletInput) => Promise<string>;
+/**
+ * Validate a network identifier without making a request
+ */
+declare const validateNetwork: (network: NetworkId) => ValidationError | {
+    success: true;
+    network: string;
+};
+/**
+ * Validate a token identifier without making a request
+ */
+declare const validateToken: (token: TokenId, network?: NetworkId) => ValidationError | {
+    success: true;
+    token: string;
+    network: string;
+};
+/**
+ * Get list of available networks
+ */
+declare const getNetworks: () => string[];
+/**
+ * Get list of available tokens
+ */
+declare const getTokens: () => string[];
+
+/**
+ * Armory API - Simplified payment interface (Ethers)
+ * Provides a configurable object with method-based payment functions
+ */
+
+type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+interface ArmoryConfig {
+    wallet: SimpleWalletInput;
+    methods?: HttpMethod[] | HttpMethod;
+    tokens?: TokenId[] | TokenId;
+    chains?: NetworkId[] | NetworkId;
+    debug?: boolean;
+}
+interface PaymentOptions {
+    method?: HttpMethod;
+    body?: unknown;
+}
+interface ArmoryInstance {
+    get<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
+    post<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
+    put<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
+    delete<T>(url: string): Promise<ArmoryPaymentResult<T>>;
+    patch<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
+    pay<T>(url: string, options?: PaymentOptions): Promise<ArmoryPaymentResult<T>>;
+    call<T>(url: string): Promise<ArmoryPaymentResult<T>>;
+}
+declare const createArmory: (config: ArmoryConfig) => ArmoryInstance;
 
 declare class SignerRequiredError extends X402ClientError {
     constructor(message?: string);
@@ -58,6 +141,7 @@ interface X402ClientConfig {
     domainName?: string;
     /** Override EIP-712 domain version for custom tokens */
     domainVersion?: string;
+    hooks?: ClientHook<Signer>[];
 }
 interface SignerClientConfig extends X402ClientConfig {
     signer: Signer;
@@ -77,6 +161,7 @@ interface X402TransportConfig {
     onPaymentRequired?: (requirements: unknown) => boolean | Promise<boolean>;
     onPaymentSuccess?: (settlement: unknown) => void;
     onPaymentError?: (error: Error) => void;
+    hooks?: ClientHook<Signer>[];
 }
 interface X402RequestInit extends Omit<RequestInit, "headers"> {
     headers?: Record<string, string> | Headers;
@@ -98,40 +183,6 @@ interface EIP712Domain {
     verifyingContract: `0x${string}`;
 }
 
-interface X402Transport {
-    fetch(url: string, init?: X402RequestInit): Promise<Response>;
-    get(url: string, init?: X402RequestInit): Promise<Response>;
-    post(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
-    put(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
-    del(url: string, init?: X402RequestInit): Promise<Response>;
-    patch(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
-    setSigner(signer: Signer): void;
-    getSigner(): Signer | undefined;
-}
-declare const createX402Transport: (config?: X402TransportConfig) => X402Transport;
-
-declare function signEIP3009(signer: Signer, params: TransferWithAuthorizationParams, domain: EIP712Domain): Promise<{
-    v: number;
-    r: string;
-    s: string;
-}>;
-declare function signEIP3009WithDomain(signer: Signer, params: TransferWithAuthorizationParams, chainId: number, verifyingContract: `0x${string}`, domainName?: string, domainVersion?: string): Promise<{
-    v: number;
-    r: string;
-    s: string;
-}>;
-declare function signPayment(signer: Signer, from: `0x${string}`, to: `0x${string}`, value: bigint, chainId: number, verifyingContract: `0x${string}`, expirySeconds?: number, domainName?: string, domainVersion?: string): Promise<{
-    v: number;
-    r: string;
-    s: string;
-    nonce: `0x${string}`;
-}>;
-declare function recoverEIP3009Signer(params: TransferWithAuthorizationParams, signature: {
-    v: number;
-    r: string;
-    s: string;
-}, domain: EIP712Domain): Promise<`0x${string}`>;
-
 /**
  * X402 Client Factory for Ethers
  *
@@ -184,116 +235,68 @@ declare function createX402Client(config: X402ClientConfig & SignerClientConfig
 }): X402Client;
 declare function createX402Client(config: X402ClientConfig & ProviderClientConfig): X402Client;
 
-/**
- * Simple one-line payment API for Armory (Ethers)
- * Focus on DX/UX - "everything just magically works"
- */
+declare function signEIP3009(signer: Signer, params: TransferWithAuthorizationParams, domain: EIP712Domain): Promise<{
+    v: number;
+    r: string;
+    s: string;
+}>;
+declare function signEIP3009WithDomain(signer: Signer, params: TransferWithAuthorizationParams, chainId: number, verifyingContract: `0x${string}`, domainName?: string, domainVersion?: string): Promise<{
+    v: number;
+    r: string;
+    s: string;
+}>;
+declare function signPayment(signer: Signer, from: `0x${string}`, to: `0x${string}`, value: bigint, chainId: number, verifyingContract: `0x${string}`, expirySeconds?: number, domainName?: string, domainVersion?: string): Promise<{
+    v: number;
+    r: string;
+    s: string;
+    nonce: `0x${string}`;
+}>;
+declare function recoverEIP3009Signer(params: TransferWithAuthorizationParams, signature: {
+    v: number;
+    r: string;
+    s: string;
+}, domain: EIP712Domain): Promise<`0x${string}`>;
 
 /**
- * Simple wallet input - accepts wallet directly or wrapped for backward compatibility
- */
-type SimpleWalletInput = Signer | {
-    signer: Signer;
-};
-/**
- * Normalized wallet (internal use)
- */
-type NormalizedWallet = Signer;
-/**
- * Normalize wallet input to internal format
- */
-declare const normalizeWallet: (wallet: SimpleWalletInput) => NormalizedWallet;
-/**
- * Make a payment-protected API request with one line of code
- */
-declare const armoryPay: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: {
-    /** Request method (default: GET) */
-    method?: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
-    /** Request body (for POST/PUT/PATCH) */
-    body?: unknown;
-    /** Request headers */
-    headers?: Record<string, string>;
-    /** Protocol version (V2 only) */
-    version?: 2;
-    /** Payment amount in token units (default: from 402 header) */
-    amount?: string;
-    /** Enable debug logging */
-    debug?: boolean;
-}) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Make a GET request with payment
- */
-declare const armoryGet: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: Omit<Parameters<typeof armoryPay>[4], "method">) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Make a POST request with payment
- */
-declare const armoryPost: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Make a PUT request with payment
- */
-declare const armoryPut: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Make a DELETE request with payment
- */
-declare const armoryDelete: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, options?: Omit<Parameters<typeof armoryPay>[4], "method">) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Make a PATCH request with payment
- */
-declare const armoryPatch: <T = unknown>(wallet: SimpleWalletInput, url: string, network: NetworkId, token: TokenId, body?: unknown, options?: Omit<Parameters<typeof armoryPay>[4], "method" | "body">) => Promise<ArmoryPaymentResult<T>>;
-/**
- * Get the wallet address from a SimpleWalletInput
- */
-declare const getWalletAddress: (wallet: SimpleWalletInput) => Promise<string>;
-/**
- * Validate a network identifier without making a request
+ * X402 Protocol Implementation for Ethers Client (V2 Only)
+ *
+ * Handles parsing x402 V2 PAYMENT-REQUIRED headers
+ * and generating x402 V2 PAYMENT-SIGNATURE payloads
  */
-declare const validateNetwork: (network: NetworkId) => ValidationError | {
-    success: true;
-    network: string;
-};
+
 /**
- * Validate a token identifier without making a request
+ * Detect x402 protocol version from response headers
+ * V2-only: Always returns 2
  */
-declare const validateToken: (token: TokenId, network?: NetworkId) => ValidationError | {
-    success: true;
-    token: string;
-    network: string;
-};
+declare function detectX402Version(_response: Response): 2;
 /**
- * Get list of available networks
+ * Get payment header name for protocol version
  */
-declare const getNetworks: () => string[];
+declare function getPaymentHeaderName(_version: 2): string;
+interface ParsedPaymentRequirements {
+    version: 2;
+    accepts: PaymentRequirementsV2[];
+}
 /**
- * Get list of available tokens
+ * Parse x402 PAYMENT-REQUIRED header from response
+ * V2 only
  */
-declare const getTokens: () => string[];
-
+declare function parsePaymentRequired(response: Response): ParsedPaymentRequirements;
 /**
- * Armory API - Simplified payment interface (Ethers)
- * Provides a configurable object with method-based payment functions
+ * Create x402 payment payload (V2-only wrapper)
  */
+declare function createX402Payment(signer: Signer, requirement: PaymentRequirementsV2, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
 
-type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
-interface ArmoryConfig {
-    wallet: SimpleWalletInput;
-    methods?: HttpMethod[] | HttpMethod;
-    tokens?: TokenId[] | TokenId;
-    chains?: NetworkId[] | NetworkId;
-    debug?: boolean;
-}
-interface PaymentOptions {
-    method?: HttpMethod;
-    body?: unknown;
-}
-interface ArmoryInstance {
-    get<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
-    post<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
-    put<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
-    delete<T>(url: string): Promise<ArmoryPaymentResult<T>>;
-    patch<T>(url: string, body?: unknown): Promise<ArmoryPaymentResult<T>>;
-    pay<T>(url: string, options?: PaymentOptions): Promise<ArmoryPaymentResult<T>>;
-    call<T>(url: string): Promise<ArmoryPaymentResult<T>>;
+interface X402Transport {
+    fetch(url: string, init?: X402RequestInit): Promise<Response>;
+    get(url: string, init?: X402RequestInit): Promise<Response>;
+    post(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
+    put(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
+    del(url: string, init?: X402RequestInit): Promise<Response>;
+    patch(url: string, body?: unknown, init?: X402RequestInit): Promise<Response>;
+    setSigner(signer: Signer): void;
+    getSigner(): Signer | undefined;
 }
-declare const createArmory: (config: ArmoryConfig) => ArmoryInstance;
+declare const createX402Transport: (config?: X402TransportConfig) => X402Transport;
 
 export { type ArmoryConfig, type ArmoryInstance, AuthorizationError, type ClientConfig, type HttpMethod, type NormalizedWallet, type ParsedPaymentRequirements, type PaymentOptions, ProviderRequiredError, SignerRequiredError, type SimpleWalletInput, type X402Client, type X402ClientConfig, type X402RequestInit, type X402Transport, type X402TransportConfig, armoryDelete, armoryGet, armoryPatch, armoryPay, armoryPost, armoryPut, createArmory, createX402Client, createX402Payment, createX402Transport, detectX402Version, getNetworks, getPaymentHeaderName, getTokens, getWalletAddress, normalizeWallet, parsePaymentRequired, recoverEIP3009Signer, signEIP3009, signEIP3009WithDomain, signPayment, validateNetwork, validateToken };

package/dist/index.js

@@ -1,5 +1,6 @@
 import { X402ClientError, createEIP712Domain, V2_HEADERS, PaymentException, isX402V2PaymentRequired, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, normalizeBase64Url, decodeBase64ToUtf8, getNetworkConfig, normalizeNetworkName, encodePaymentV2, decodeSettlementV2 } from '@armory-sh/base';
 export { PaymentException as PaymentError, SigningError, X402ClientError } from '@armory-sh/base';
+import { runOnPaymentRequiredHooks, selectRequirementWithHooks, runBeforeSignPaymentHooks, runAfterPaymentResponseHooks } from '@armory-sh/base/client-hooks-runtime';
 import { ethers } from 'ethers';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -26,8 +27,6 @@ var ProviderRequiredError = class extends X402ClientError {
     this.name = "ProviderRequiredError";
   }
 };
-
-// src/eip3009.ts
 var EIP712_TYPES_ETHERS = {
   TransferWithAuthorization: [
     { name: "from", type: "address" },
@@ -48,7 +47,11 @@ async function signEIP3009(signer, params, domain) {
       validBefore: BigInt(params.validBefore),
       nonce: params.nonce
     };
-    const signature = await signer.signTypedData(domain, EIP712_TYPES_ETHERS, message);
+    const signature = await signer.signTypedData(
+      domain,
+      EIP712_TYPES_ETHERS,
+      message
+    );
     const { v, r, s } = ethers.Signature.from(signature);
     return { v: Number(v), r, s };
   } catch (error) {
@@ -60,7 +63,11 @@ async function signEIP3009(signer, params, domain) {
 }
 async function signEIP3009WithDomain(signer, params, chainId, verifyingContract, domainName, domainVersion) {
   const domain = createEIP712Domain(chainId, verifyingContract);
-  const customDomain = domainName || domainVersion ? { ...domain, name: domainName ?? domain.name, version: domainVersion ?? domain.version } : domain;
+  const customDomain = domainName || domainVersion ? {
+    ...domain,
+    name: domainName ?? domain.name,
+    version: domainVersion ?? domain.version
+  } : domain;
   return signEIP3009(signer, params, customDomain);
 }
 async function signPayment(signer, from, to, value, chainId, verifyingContract, expirySeconds = 3600, domainName, domainVersion) {
@@ -68,7 +75,14 @@ async function signPayment(signer, from, to, value, chainId, verifyingContract,
   const nonce = `0x${(now * 1e3).toString(16).padStart(64, "0")}`;
   const signature = await signEIP3009WithDomain(
     signer,
-    { from, to, value, validAfter: 0n, validBefore: BigInt(now + expirySeconds), nonce },
+    {
+      from,
+      to,
+      value,
+      validAfter: 0n,
+      validBefore: BigInt(now + expirySeconds),
+      nonce
+    },
     chainId,
     verifyingContract,
     domainName,
@@ -90,7 +104,12 @@ async function recoverEIP3009Signer(params, signature, domain) {
     r: signature.r,
     s: signature.s
   });
-  const address = ethers.verifyTypedData(domain, EIP712_TYPES_ETHERS, message, sig);
+  const address = ethers.verifyTypedData(
+    domain,
+    EIP712_TYPES_ETHERS,
+    message,
+    sig
+  );
   return address;
 }
 
@@ -124,11 +143,13 @@ function parsePaymentRequired(response) {
     }
     return {
       version: 2,
-      requirements: parsed.accepts[0]
+      accepts: parsed.accepts
     };
   } catch (error) {
     if (error instanceof PaymentException) throw error;
-    throw new PaymentException(`Failed to parse V2 PAYMENT-REQUIRED header: ${error}`);
+    throw new PaymentException(
+      `Failed to parse V2 PAYMENT-REQUIRED header: ${error}`
+    );
   }
 }
 function extractChainId(network) {
@@ -150,7 +171,11 @@ async function createX402V2Payment(signer, requirements, fromAddress, nonce, val
   const chainId = extractChainId(requirements.network);
   const now = Math.floor(Date.now() / 1e3);
   const domain = createEIP712Domain(chainId, contractAddress);
-  const customDomain = domainName || domainVersion ? { ...domain, name: domainName ?? domain.name, version: domainVersion ?? domain.version } : domain;
+  const customDomain = domainName || domainVersion ? {
+    ...domain,
+    name: domainName ?? domain.name,
+    version: domainVersion ?? domain.version
+  } : domain;
   const authorization = {
     from: fromAddress,
     to: requirements.payTo,
@@ -179,12 +204,12 @@ async function createX402V2Payment(signer, requirements, fromAddress, nonce, val
     payload
   };
 }
-async function createX402Payment(signer, parsed, fromAddress, nonce, validBefore, domainName, domainVersion) {
+async function createX402Payment(signer, requirement, fromAddress, nonce, validBefore, domainName, domainVersion) {
   const effectiveNonce = nonce ?? createNonce();
   const effectiveValidBefore = validBefore ?? Math.floor(Date.now() / 1e3) + 3600;
   return createX402V2Payment(
     signer,
-    parsed.requirements,
+    requirement,
     fromAddress,
     effectiveNonce,
     effectiveValidBefore,
@@ -192,6 +217,8 @@ async function createX402Payment(signer, parsed, fromAddress, nonce, validBefore
     domainVersion
   );
 }
+
+// src/transport.ts
 var defaultConfig = {
   baseURL: "",
   headers: {},
@@ -203,7 +230,8 @@ var defaultConfig = {
   onPaymentSuccess: () => {
   },
   onPaymentError: () => {
-  }
+  },
+  hooks: []
 };
 var createState = (config) => ({
   config: { ...defaultConfig, ...config }
@@ -224,11 +252,11 @@ var fetchWithTimeout = async (url, init, timeout) => {
   }
 };
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var getRequirementDomainOverrides = (parsed) => {
-  const requirement = parsed.requirements;
+var getRequirementDomainOverrides = (_parsed, requirement) => {
   const extra = requirement.extra;
-  const extraName = extra && typeof extra === "object" && typeof extra["name"] === "string" ? extra["name"] : void 0;
-  const extraVersion = extra && typeof extra === "object" && typeof extra["version"] === "string" ? extra["version"] : void 0;
+  const extraRecord = extra && typeof extra === "object" ? extra : void 0;
+  const extraName = extraRecord && typeof extraRecord.name === "string" ? extraRecord.name : void 0;
+  const extraVersion = extraRecord && typeof extraRecord.version === "string" ? extraRecord.version : void 0;
   return {
     domainName: requirement.name ?? extraName,
     domainVersion: requirement.version ?? extraVersion
@@ -236,21 +264,52 @@ var getRequirementDomainOverrides = (parsed) => {
 };
 var handlePaymentRequired = async (state, response) => {
   if (!state.signer) {
-    throw new SignerRequiredError("Cannot handle payment: no signer configured.");
+    throw new SignerRequiredError(
+      "Cannot handle payment: no signer configured."
+    );
   }
   try {
     const parsed = parsePaymentRequired(response);
+    const initialRequirement = parsed.accepts[0];
+    if (!initialRequirement) {
+      throw new Error("No payment requirements found in accepts array");
+    }
     const from = await state.signer.getAddress();
-    const requirementDomain = getRequirementDomainOverrides(parsed);
+    const paymentRequiredContext = {
+      url: response.url,
+      requestInit: void 0,
+      accepts: parsed.accepts,
+      requirements: initialRequirement,
+      selectedRequirement: initialRequirement,
+      serverExtensions: void 0,
+      fromAddress: from,
+      nonce: `0x${Date.now().toString(16).padStart(64, "0")}`,
+      validBefore: Math.floor(Date.now() / 1e3) + initialRequirement.maxTimeoutSeconds
+    };
+    await runOnPaymentRequiredHooks(state.config.hooks, paymentRequiredContext);
+    const selectedRequirement = await selectRequirementWithHooks(
+      state.config.hooks,
+      paymentRequiredContext
+    );
+    const requirementDomain = getRequirementDomainOverrides(
+      parsed,
+      selectedRequirement
+    );
     const payload = await createX402Payment(
       state.signer,
-      parsed,
+      selectedRequirement,
       from,
-      void 0,
-      Math.floor(Date.now() / 1e3) + parsed.requirements.maxTimeoutSeconds,
+      paymentRequiredContext.nonce,
+      paymentRequiredContext.validBefore,
       requirementDomain.domainName,
       requirementDomain.domainVersion
     );
+    await runBeforeSignPaymentHooks(state.config.hooks, {
+      payload,
+      requirements: selectedRequirement,
+      wallet: state.signer,
+      paymentContext: paymentRequiredContext
+    });
     const encoded = encodePaymentV2(payload);
     const headerName = getPaymentHeaderName(parsed.version);
     const paymentResponse = await fetchWithTimeout(
@@ -261,30 +320,48 @@ var handlePaymentRequired = async (state, response) => {
       },
       state.config.timeout
     );
-    const settlement = decodeSettlementV2(paymentResponse.headers.get(V2_HEADERS.PAYMENT_RESPONSE) || "");
+    const settlement = decodeSettlementV2(
+      paymentResponse.headers.get(V2_HEADERS.PAYMENT_RESPONSE) || ""
+    );
+    await runAfterPaymentResponseHooks(state.config.hooks, {
+      payload,
+      requirements: selectedRequirement,
+      wallet: state.signer,
+      paymentContext: paymentRequiredContext,
+      response: paymentResponse
+    });
     return { success: true, settlement };
   } catch (error) {
-    return { success: false, error: error instanceof Error ? error : new Error(String(error)) };
+    return {
+      success: false,
+      error: error instanceof Error ? error : new Error(String(error))
+    };
   }
 };
 var shouldRetryPayment = async (state, response) => {
   if (!state.config.autoPay) return false;
   const parsed = parsePaymentRequired(response);
-  return await state.config.onPaymentRequired(parsed.requirements);
+  return await state.config.onPaymentRequired(parsed.accepts[0]);
 };
 var x402Fetch = async (state, url, init = {}) => {
   const fullUrl = state.config.baseURL ? new URL(url, state.config.baseURL).toString() : url;
   const headers = new Headers({ ...state.config.headers, ...init.headers });
   for (let attempt = 1; attempt <= state.config.maxRetries; attempt++) {
     try {
-      const response = await fetchWithTimeout(fullUrl, { ...init, headers }, state.config.timeout);
+      const response = await fetchWithTimeout(
+        fullUrl,
+        { ...init, headers },
+        state.config.timeout
+      );
       if (response.status === 402 && !init.skipAutoPay && await shouldRetryPayment(state, response)) {
         const paymentResult = await handlePaymentRequired(state, response);
         if (paymentResult.success) {
           state.config.onPaymentSuccess(paymentResult.settlement);
           continue;
         }
-        state.config.onPaymentError(paymentResult.error ?? new Error("Payment failed"));
+        state.config.onPaymentError(
+          paymentResult.error ?? new Error("Payment failed")
+        );
       }
       return response;
     } catch (error) {
@@ -307,7 +384,7 @@ var createMethod = (state, method) => async (url, bodyOrInit, init) => {
   });
 };
 var createX402Transport = (config) => {
-  let state = createState(config);
+  const state = createState(config);
   return {
     fetch: (url, init) => x402Fetch(state, url, init),
     get: createMethod(state, "GET"),
@@ -322,37 +399,7 @@ var createX402Transport = (config) => {
   };
 };
 
-// src/client.ts
-function createX402Client(config) {
-  const transport = createX402Transport(void 0);
-  if ("signer" in config && config.signer) {
-    transport.setSigner(config.signer);
-  } else if ("provider" in config && config.provider) {
-    const provider = config.provider;
-    if (provider.getSigner) {
-      try {
-        const signer = provider.getSigner();
-        if (signer) {
-          transport.setSigner(signer);
-        }
-      } catch {
-      }
-    }
-  } else {
-    throw new SignerRequiredError(
-      "Either 'signer' or 'provider' with getSigner() must be provided"
-    );
-  }
-  return {
-    get: (url, init) => transport.get(url, init),
-    post: (url, body, init) => transport.post(url, body, init),
-    put: (url, body, init) => transport.put(url, body, init),
-    del: (url, init) => transport.del(url, init),
-    patch: (url, body, init) => transport.patch(url, body, init),
-    setSigner: (signer) => transport.setSigner(signer),
-    getSigner: () => transport.getSigner()
-  };
-}
+// src/payment-api.ts
 var normalizeWallet = (wallet) => {
   if (typeof wallet === "object" && wallet !== null && "signer" in wallet) {
     return wallet.signer;
@@ -414,19 +461,37 @@ var armoryPay = async (wallet, url, network, token, options) => {
   }
 };
 var armoryGet = (wallet, url, network, token, options) => {
-  return armoryPay(wallet, url, network, token, { ...options, method: "GET" });
+  return armoryPay(wallet, url, network, token, {
+    ...options,
+    method: "GET"
+  });
 };
 var armoryPost = (wallet, url, network, token, body, options) => {
-  return armoryPay(wallet, url, network, token, { ...options, method: "POST", body });
+  return armoryPay(wallet, url, network, token, {
+    ...options,
+    method: "POST",
+    body
+  });
 };
 var armoryPut = (wallet, url, network, token, body, options) => {
-  return armoryPay(wallet, url, network, token, { ...options, method: "PUT", body });
+  return armoryPay(wallet, url, network, token, {
+    ...options,
+    method: "PUT",
+    body
+  });
 };
 var armoryDelete = (wallet, url, network, token, options) => {
-  return armoryPay(wallet, url, network, token, { ...options, method: "DELETE" });
+  return armoryPay(wallet, url, network, token, {
+    ...options,
+    method: "DELETE"
+  });
 };
 var armoryPatch = (wallet, url, network, token, body, options) => {
-  return armoryPay(wallet, url, network, token, { ...options, method: "PATCH", body });
+  return armoryPay(wallet, url, network, token, {
+    ...options,
+    method: "PATCH",
+    body
+  });
 };
 var getWalletAddress = async (wallet) => {
   const signer = normalizeWallet(wallet);
@@ -440,7 +505,7 @@ var validateNetwork = (network) => {
   return { success: true, network: resolved.config.name };
 };
 var validateToken = (token, network) => {
-  let resolvedNetwork = void 0;
+  let resolvedNetwork;
   if (network) {
     const networkResult = resolveNetwork(network);
     if (isValidationError(networkResult)) {
@@ -466,7 +531,15 @@ var getTokens = () => {
   const { getAvailableTokens } = __require("@armory-sh/base");
   return getAvailableTokens();
 };
-var ALL_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "DELETE", "PATCH"]);
+
+// src/armory-api.ts
+var ALL_METHODS = /* @__PURE__ */ new Set([
+  "GET",
+  "POST",
+  "PUT",
+  "DELETE",
+  "PATCH"
+]);
 var arrayify = (value) => {
   if (value === void 0) return void 0;
   return Array.isArray(value) ? value : [value];
@@ -534,4 +607,38 @@ var createArmory = (config) => {
   };
 };
 
+// src/client.ts
+function createX402Client(config) {
+  const transport = createX402Transport({
+    hooks: config.hooks
+  });
+  if ("signer" in config && config.signer) {
+    transport.setSigner(config.signer);
+  } else if ("provider" in config && config.provider) {
+    const provider = config.provider;
+    if (provider.getSigner) {
+      try {
+        const signer = provider.getSigner();
+        if (signer) {
+          transport.setSigner(signer);
+        }
+      } catch {
+      }
+    }
+  } else {
+    throw new SignerRequiredError(
+      "Either 'signer' or 'provider' with getSigner() must be provided"
+    );
+  }
+  return {
+    get: (url, init) => transport.get(url, init),
+    post: (url, body, init) => transport.post(url, body, init),
+    put: (url, body, init) => transport.put(url, body, init),
+    del: (url, init) => transport.del(url, init),
+    patch: (url, body, init) => transport.patch(url, body, init),
+    setSigner: (signer) => transport.setSigner(signer),
+    getSigner: () => transport.getSigner()
+  };
+}
+
 export { AuthorizationError, ProviderRequiredError, SignerRequiredError, armoryDelete, armoryGet, armoryPatch, armoryPay, armoryPost, armoryPut, createArmory, createX402Client, createX402Payment, createX402Transport, detectX402Version, getNetworks, getPaymentHeaderName, getTokens, getWalletAddress, normalizeWallet, parsePaymentRequired, recoverEIP3009Signer, signEIP3009, signEIP3009WithDomain, signPayment, validateNetwork, validateToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/client-ethers",
-  "version": "0.2.26-alpha.23.76",
+  "version": "0.2.26-alpha.23.78",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "keywords": [
@@ -47,7 +47,7 @@
     "directory": "packages/client-ethers"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.27-alpha.23.76",
+    "@armory-sh/base": "0.2.27-alpha.23.78",
     "ethers": "6.16.0"
   },
   "devDependencies": {
@@ -56,6 +56,8 @@
   },
   "scripts": {
     "build": "rm -rf dist && tsup",
+    "lint": "bun run build",
+    "format": "bun run lint",
     "test": "bun test",
     "example": "bun run examples/"
   }