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

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { PaymentRequirementsV2, Address, PaymentPayloadV2, CustomToken, NetworkId, TokenId, ArmoryPaymentResult, ValidationError } from '@armory-sh/base';
-export { Address, BalanceOfParams, CAIP2ChainId, CAIPAssetId, EIP712_TYPES, ERC20_ABI, Extensions, NETWORKS, NetworkConfig, PayToV2, PaymentPayload, PaymentPayloadV2, PaymentRequirements, PaymentRequirementsV2, SettlementResponse, SettlementResponseV2, Signature, TransferWithAuthorizationParams, V2_HEADERS, createEIP712Domain, createTransferWithAuthorization, decodePayment, decodePaymentV2, decodeSettlementV2, detectPaymentVersion, encodePaymentV2, encodeSettlementV2, getMainnets, getNetworkByChainId, getNetworkConfig, getTestnets, getTxHash, isCAIP2ChainId, isCAIPAssetId, isPaymentV2, isSettlementSuccessful, isSettlementV2, isX402V2PaymentRequired, safeBase64Decode, validateTransferWithAuthorization } 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';
 
 /**
  * X402 Protocol Implementation for Ethers Client (V2 Only)
@@ -33,16 +33,6 @@ declare function parsePaymentRequired(response: Response): ParsedPaymentRequirem
  */
 declare function createX402Payment(signer: Signer, parsed: ParsedPaymentRequirements, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
 
-declare class X402ClientError extends Error {
-    readonly cause?: unknown;
-    constructor(message: string, cause?: unknown);
-}
-declare class SigningError extends X402ClientError {
-    constructor(message: string, cause?: unknown);
-}
-declare class PaymentError extends X402ClientError {
-    constructor(message: string, cause?: unknown);
-}
 declare class SignerRequiredError extends X402ClientError {
     constructor(message?: string);
 }
@@ -306,4 +296,4 @@ interface ArmoryInstance {
 }
 declare const createArmory: (config: ArmoryConfig) => ArmoryInstance;
 
-export { type ArmoryConfig, type ArmoryInstance, AuthorizationError, type ClientConfig, type HttpMethod, type NormalizedWallet, type ParsedPaymentRequirements, PaymentError, type PaymentOptions, ProviderRequiredError, SignerRequiredError, SigningError, type SimpleWalletInput, type X402Client, type X402ClientConfig, X402ClientError, 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 };
+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,5 @@
-import { createEIP712Domain, V2_HEADERS, isX402V2PaymentRequired, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, getNetworkConfig, normalizeNetworkName, encodePaymentV2, decodeSettlementV2 } from '@armory-sh/base';
-export { EIP712_TYPES, ERC20_ABI, NETWORKS, V2_HEADERS, createEIP712Domain, createTransferWithAuthorization, decodePayment, decodePaymentV2, decodeSettlementV2, detectPaymentVersion, encodePaymentV2, encodeSettlementV2, getMainnets, getNetworkByChainId, getNetworkConfig, getTestnets, getTxHash, isCAIP2ChainId, isCAIPAssetId, isPaymentV2, isSettlementSuccessful, isSettlementV2, isX402V2PaymentRequired, safeBase64Decode, validateTransferWithAuthorization } from '@armory-sh/base';
+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 { ethers } from 'ethers';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
@@ -8,28 +8,6 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-
-// src/errors.ts
-var X402ClientError = class extends Error {
-  cause;
-  constructor(message, cause) {
-    super(message);
-    this.name = "X402ClientError";
-    this.cause = cause;
-  }
-};
-var SigningError = class extends X402ClientError {
-  constructor(message, cause) {
-    super(`Signing failed: ${message}`, cause);
-    this.name = "SigningError";
-  }
-};
-var PaymentError = class extends X402ClientError {
-  constructor(message, cause) {
-    super(`Payment failed: ${message}`, cause);
-    this.name = "PaymentError";
-  }
-};
 var SignerRequiredError = class extends X402ClientError {
   constructor(message = "Signer is required for this operation") {
     super(message);
@@ -116,38 +94,6 @@ async function recoverEIP3009Signer(params, signature, domain) {
   return address;
 }
 
-// src/bytes.ts
-new TextEncoder();
-var textDecoder = new TextDecoder();
-function getNodeBuffer() {
-  if ("Buffer" in globalThis) {
-    return globalThis.Buffer;
-  }
-  return void 0;
-}
-function fromBase64(base64) {
-  if (typeof atob === "function") {
-    const binary = atob(base64);
-    const bytes = new Uint8Array(binary.length);
-    for (let index = 0; index < binary.length; index += 1) {
-      bytes[index] = binary.charCodeAt(index);
-    }
-    return bytes;
-  }
-  const nodeBuffer = getNodeBuffer();
-  if (nodeBuffer) {
-    return Uint8Array.from(nodeBuffer.from(base64, "base64"));
-  }
-  throw new Error("No base64 decoder available in this runtime");
-}
-function decodeBase64ToUtf8(value) {
-  const bytes = fromBase64(value);
-  return textDecoder.decode(bytes);
-}
-function normalizeBase64Url(value) {
-  return value.replace(/-/g, "+").replace(/_/g, "/").padEnd(Math.ceil(value.length / 4) * 4, "=");
-}
-
 // src/protocol.ts
 function detectX402Version(_response) {
   return 2;
@@ -166,23 +112,23 @@ function parseJsonOrBase64(value) {
 function parsePaymentRequired(response) {
   const v2Header = response.headers.get(V2_HEADERS.PAYMENT_REQUIRED);
   if (!v2Header) {
-    throw new PaymentError("No PAYMENT-REQUIRED header found in V2 response");
+    throw new PaymentException("No PAYMENT-REQUIRED header found in V2 response");
   }
   try {
     const parsed = parseJsonOrBase64(v2Header);
     if (!isX402V2PaymentRequired(parsed)) {
-      throw new PaymentError("Invalid x402 V2 payment required format");
+      throw new PaymentException("Invalid x402 V2 payment required format");
     }
     if (!parsed.accepts || parsed.accepts.length === 0) {
-      throw new PaymentError("No payment requirements found in accepts array");
+      throw new PaymentException("No payment requirements found in accepts array");
     }
     return {
       version: 2,
       requirements: parsed.accepts[0]
     };
   } catch (error) {
-    if (error instanceof PaymentError) throw error;
-    throw new PaymentError(`Failed to parse V2 PAYMENT-REQUIRED header: ${error}`);
+    if (error instanceof PaymentException) throw error;
+    throw new PaymentException(`Failed to parse V2 PAYMENT-REQUIRED header: ${error}`);
   }
 }
 function extractChainId(network) {
@@ -193,7 +139,7 @@ function extractChainId(network) {
   if (net) {
     return net.chainId;
   }
-  throw new PaymentError(`Unsupported network: ${network}`);
+  throw new PaymentException(`Unsupported network: ${network}`);
 }
 function createNonce() {
   const now = Math.floor(Date.now() / 1e3);
@@ -202,13 +148,14 @@ function createNonce() {
 async function createX402V2Payment(signer, requirements, fromAddress, nonce, validBefore, domainName, domainVersion) {
   const contractAddress = requirements.asset;
   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 authorization = {
     from: fromAddress,
     to: requirements.payTo,
     value: requirements.amount,
-    validAfter: "0",
+    validAfter: (now - 600).toString(),
     validBefore: validBefore.toString(),
     nonce
   };
@@ -300,7 +247,7 @@ var handlePaymentRequired = async (state, response) => {
       parsed,
       from,
       void 0,
-      void 0,
+      Math.floor(Date.now() / 1e3) + parsed.requirements.maxTimeoutSeconds,
       requirementDomain.domainName,
       requirementDomain.domainVersion
     );
@@ -587,4 +534,4 @@ var createArmory = (config) => {
   };
 };
 
-export { AuthorizationError, PaymentError, ProviderRequiredError, SignerRequiredError, SigningError, X402ClientError, armoryDelete, armoryGet, armoryPatch, armoryPay, armoryPost, armoryPut, createArmory, createX402Client, createX402Payment, createX402Transport, detectX402Version, getNetworks, getPaymentHeaderName, getTokens, getWalletAddress, normalizeWallet, parsePaymentRequired, recoverEIP3009Signer, signEIP3009, signEIP3009WithDomain, signPayment, validateNetwork, validateToken };
+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.73",
+  "version": "0.2.26-alpha.23.76",
   "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.73",
+    "@armory-sh/base": "0.2.27-alpha.23.76",
     "ethers": "6.16.0"
   },
   "devDependencies": {