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

package/dist/index.d.ts

@@ -32,6 +32,10 @@ declare function parsePaymentRequired(response: Response): ParsedPaymentRequirem
  * Create x402 payment payload (V2-only wrapper)
  */
 declare function createX402Payment(signer: Signer, parsed: ParsedPaymentRequirements, fromAddress: Address, nonce?: `0x${string}`, validBefore?: number, domainName?: string, domainVersion?: string): Promise<PaymentPayloadV2>;
+/**
+ * Encode x402 payment payload to Base64 for transport
+ */
+declare function encodeX402Payment(payload: PaymentPayloadV2): string;
 
 declare class X402ClientError extends Error {
     readonly cause?: unknown;
@@ -306,4 +310,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, 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, encodeX402Payment, getNetworks, getPaymentHeaderName, getTokens, getWalletAddress, normalizeWallet, parsePaymentRequired, recoverEIP3009Signer, signEIP3009, signEIP3009WithDomain, signPayment, validateNetwork, validateToken };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createEIP712Domain, V2_HEADERS, isX402V2PaymentRequired, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, getNetworkConfig, normalizeNetworkName, encodePaymentV2, decodeSettlementV2 } from '@armory-sh/base';
+import { createEIP712Domain, V2_HEADERS, isX402V2PaymentRequired, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, getNetworkConfig, normalizeNetworkName, 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 { ethers } from 'ethers';
 
@@ -117,7 +117,7 @@ async function recoverEIP3009Signer(params, signature, domain) {
 }
 
 // src/bytes.ts
-new TextEncoder();
+var textEncoder = new TextEncoder();
 var textDecoder = new TextDecoder();
 function getNodeBuffer() {
   if ("Buffer" in globalThis) {
@@ -125,6 +125,20 @@ function getNodeBuffer() {
   }
   return void 0;
 }
+function toBase64(bytes) {
+  if (typeof btoa === "function") {
+    let binary = "";
+    for (let index = 0; index < bytes.length; index += 1) {
+      binary += String.fromCharCode(bytes[index]);
+    }
+    return btoa(binary);
+  }
+  const nodeBuffer = getNodeBuffer();
+  if (nodeBuffer) {
+    return nodeBuffer.from(bytes).toString("base64");
+  }
+  throw new Error("No base64 encoder available in this runtime");
+}
 function fromBase64(base64) {
   if (typeof atob === "function") {
     const binary = atob(base64);
@@ -140,6 +154,10 @@ function fromBase64(base64) {
   }
   throw new Error("No base64 decoder available in this runtime");
 }
+function encodeUtf8ToBase64(value) {
+  const bytes = textEncoder.encode(value);
+  return toBase64(bytes);
+}
 function decodeBase64ToUtf8(value) {
   const bytes = fromBase64(value);
   return textDecoder.decode(bytes);
@@ -185,6 +203,9 @@ function parsePaymentRequired(response) {
     throw new PaymentError(`Failed to parse V2 PAYMENT-REQUIRED header: ${error}`);
   }
 }
+function toAtomicUnits(amount) {
+  return Math.floor(parseFloat(amount) * 1e6).toString();
+}
 function extractChainId(network) {
   if (network.startsWith("eip155:")) {
     return parseInt(network.split(":")[1], 10);
@@ -207,7 +228,7 @@ async function createX402V2Payment(signer, requirements, fromAddress, nonce, val
   const authorization = {
     from: fromAddress,
     to: requirements.payTo,
-    value: requirements.amount,
+    value: toAtomicUnits(requirements.amount),
     validAfter: "0",
     validBefore: validBefore.toString(),
     nonce
@@ -245,6 +266,9 @@ async function createX402Payment(signer, parsed, fromAddress, nonce, validBefore
     domainVersion
   );
 }
+function encodeX402Payment(payload) {
+  return encodeUtf8ToBase64(JSON.stringify(payload));
+}
 var defaultConfig = {
   baseURL: "",
   headers: {},
@@ -277,16 +301,6 @@ var fetchWithTimeout = async (url, init, timeout) => {
   }
 };
 var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var getRequirementDomainOverrides = (parsed) => {
-  const requirement = parsed.requirements;
-  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;
-  return {
-    domainName: requirement.name ?? extraName,
-    domainVersion: requirement.version ?? extraVersion
-  };
-};
 var handlePaymentRequired = async (state, response) => {
   if (!state.signer) {
     throw new SignerRequiredError("Cannot handle payment: no signer configured.");
@@ -294,17 +308,8 @@ var handlePaymentRequired = async (state, response) => {
   try {
     const parsed = parsePaymentRequired(response);
     const from = await state.signer.getAddress();
-    const requirementDomain = getRequirementDomainOverrides(parsed);
-    const payload = await createX402Payment(
-      state.signer,
-      parsed,
-      from,
-      void 0,
-      void 0,
-      requirementDomain.domainName,
-      requirementDomain.domainVersion
-    );
-    const encoded = encodePaymentV2(payload);
+    const payload = await createX402Payment(state.signer, parsed, from);
+    const encoded = encodeX402Payment(payload);
     const headerName = getPaymentHeaderName(parsed.version);
     const paymentResponse = await fetchWithTimeout(
       response.url,
@@ -587,4 +592,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, PaymentError, ProviderRequiredError, SignerRequiredError, SigningError, X402ClientError, armoryDelete, armoryGet, armoryPatch, armoryPay, armoryPost, armoryPut, createArmory, createX402Client, createX402Payment, createX402Transport, detectX402Version, encodeX402Payment, 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.27",
   "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.28",
     "ethers": "6.16.0"
   },
   "devDependencies": {