@armory-sh/client-web3 0.2.17 → 0.2.18-alpha.3.20

package/dist/index.js

@@ -1,3 +1,6 @@
+import { Web3 } from 'web3';
+import { encodePaymentV2, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, V2_HEADERS, getNetworkConfig, getNetworkByChainId, combineSignatureV2, networkToCaip2, isX402V2PaymentRequired } from '@armory-sh/base';
+
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -5,17 +8,6 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// src/client.ts
-import { Web3 } from "web3";
-import {
-  getNetworkConfig,
-  getNetworkByChainId,
-  encodePaymentV2,
-  networkToCaip2,
-  combineSignatureV2,
-  V2_HEADERS as V2_HEADERS2
-} from "@armory-sh/base";
-
 // src/eip3009.ts
 var USDC_DOMAIN = {
   NAME: "USD Coin",
@@ -111,12 +103,6 @@ var signWithPrivateKey = async (_privateKey, _domain, _message) => {
     "Direct private key signing not implemented. Use wallet provider's signTypedData method instead."
   );
 };
-
-// src/protocol.ts
-import {
-  V2_HEADERS,
-  isX402V2PaymentRequired
-} from "@armory-sh/base";
 var detectX402Version = (_response, _fallbackVersion = 2) => {
   return 2;
 };
@@ -130,7 +116,8 @@ var parsePaymentRequired = async (response, _version) => {
     try {
       parsed = JSON.parse(v2Header);
     } catch {
-      const decoded = Buffer.from(v2Header, "base64").toString("utf-8");
+      const normalized = v2Header.replace(/-/g, "+").replace(/_/g, "/").padEnd(Math.ceil(v2Header.length / 4) * 4, "=");
+      const decoded = Buffer.from(normalized, "base64").toString("utf-8");
       parsed = JSON.parse(decoded);
     }
     if (!isX402V2PaymentRequired(parsed)) {
@@ -256,7 +243,7 @@ var signPaymentV2 = async (state, network, params) => {
   const defaultAccepted = accepted ?? {
     scheme: "exact",
     network: networkToCaip2(network.name),
-    amount,
+    maxAmountRequired: amount,
     asset: network.usdcAddress,
     payTo: to,
     maxTimeoutSeconds: expiry - Math.floor(Date.now() / 1e3)
@@ -299,8 +286,7 @@ var createX402Client = (config) => {
   const fetch2 = async (url, init) => {
     let response = await fetch2(url, init);
     if (response.status === 402) {
-      const version = detectX402Version(response, state.version);
-      const parsed = await parsePaymentRequired(response, version);
+      const parsed = await parsePaymentRequired(response);
       const selectedRequirements = parsed.requirements[0];
       if (!selectedRequirements) {
         throw new Error("No supported payment scheme found in requirements");
@@ -312,13 +298,13 @@ var createX402Client = (config) => {
       const result = await signPaymentV2(state, network, {
         from,
         to,
-        amount: req.amount,
+        amount: req.maxAmountRequired,
         nonce: crypto.randomUUID(),
         expiry: Math.floor(Date.now() / 1e3) + DEFAULT_EXPIRY_SECONDS,
         accepted: req
       });
       const paymentHeaders = new Headers(init?.headers);
-      paymentHeaders.set(V2_HEADERS2.PAYMENT_SIGNATURE, encodePaymentV2(result.payload));
+      paymentHeaders.set(V2_HEADERS.PAYMENT_SIGNATURE, encodePaymentV2(result.payload));
       response = await fetch2(url, { ...init, headers: paymentHeaders });
     }
     return response;
@@ -360,7 +346,7 @@ var createX402Client = (config) => {
       return signPaymentV2(state, network, {
         from,
         to,
-        amount: requirements.amount,
+        amount: requirements.maxAmountRequired,
         nonce: crypto.randomUUID(),
         expiry: Math.floor(Date.now() / 1e3) + DEFAULT_EXPIRY_SECONDS,
         accepted: requirements
@@ -371,16 +357,10 @@ var createX402Client = (config) => {
     }
   };
 };
-
-// src/transport.ts
-import {
-  V2_HEADERS as V2_HEADERS3,
-  encodePaymentV2 as encodePaymentV22
-} from "@armory-sh/base";
 var DEFAULT_MAX_RETRIES = 3;
 var createPaymentHeaders = (payload, _version) => {
   const headers = new Headers();
-  headers.set(V2_HEADERS3.PAYMENT_SIGNATURE, encodePaymentV22(payload));
+  headers.set(V2_HEADERS.PAYMENT_SIGNATURE, encodePaymentV2(payload));
   return headers;
 };
 var isPaymentRelatedError = (error) => error.message.includes("402") || error.message.includes("payment") || error.message.includes("signature") || error.message.includes("Payment");
@@ -390,15 +370,15 @@ var backoff = (attempt) => {
   return new Promise((resolve) => setTimeout(resolve, baseDelay + jitter));
 };
 var handlePaymentRequired = async (response, client) => {
-  const version = detectX402Version(response, client.getVersion());
-  const parsed = await parsePaymentRequired(response, version);
+  detectX402Version(response, client.getVersion());
+  const parsed = await parsePaymentRequired(response);
   const selectedRequirements = parsed.requirements[0];
   if (!selectedRequirements) {
     throw new Error("No supported payment scheme found in requirements");
   }
   const req = selectedRequirements;
   const result = await client.handlePaymentRequired(req);
-  return createPaymentHeaders(result.payload, version);
+  return createPaymentHeaders(result.payload);
 };
 var mergePaymentHeaders = (init = {}, paymentHeaders) => {
   const existingHeaders = new Headers(init.headers);
@@ -440,14 +420,6 @@ var createX402Transport = (options) => {
     }
   };
 };
-
-// src/payment-api.ts
-import {
-  resolveNetwork,
-  resolveToken,
-  validatePaymentConfig,
-  isValidationError
-} from "@armory-sh/base";
 var normalizeWallet = (wallet) => {
   if (typeof wallet === "object" && wallet !== null && "account" in wallet) {
     return wallet.account;
@@ -500,7 +472,7 @@ var armoryPay = async (wallet, url, network, token, options) => {
       };
     }
     const data = await response.json();
-    const txHash = response.headers.get("X-PAYMENT-RESPONSE") || response.headers.get("PAYMENT-RESPONSE");
+    const txHash = response.headers.get("PAYMENT-RESPONSE");
     return {
       success: true,
       data,
@@ -585,7 +557,7 @@ var normalizeArmoryConfig = (config) => ({
   debug: config.debug ?? false
 });
 var createArmory = (config) => {
-  const internal = normalizeArmoryConfig(config);
+  normalizeArmoryConfig(config);
   const makeRequest = async (url, method, body) => {
     try {
       const headers = new Headers();
@@ -603,7 +575,7 @@ var createArmory = (config) => {
         };
       }
       const data = await response.json();
-      const txHash = response.headers.get("X-PAYMENT-RESPONSE") || response.headers.get("PAYMENT-RESPONSE");
+      const txHash = response.headers.get("PAYMENT-RESPONSE");
       return {
         success: true,
         data,
@@ -628,28 +600,5 @@ var createArmory = (config) => {
     call: (url) => makeRequest(url, "GET")
   };
 };
-export {
-  adjustVForChainId,
-  armoryDelete,
-  armoryGet,
-  armoryPatch,
-  armoryPay,
-  armoryPost,
-  armoryPut,
-  concatenateSignature,
-  createArmory,
-  createEIP712Domain,
-  createTransferWithAuthorization,
-  createX402Client,
-  createX402Transport,
-  getNetworks,
-  getTokens,
-  getWalletAddress,
-  normalizeWallet,
-  parseSignature,
-  signTypedData,
-  signWithPrivateKey,
-  validateNetwork,
-  validateToken,
-  validateTransferWithAuthorization
-};
+
+export { adjustVForChainId, armoryDelete, armoryGet, armoryPatch, armoryPay, armoryPost, armoryPut, concatenateSignature, createArmory, createEIP712Domain, createTransferWithAuthorization, createX402Client, createX402Transport, getNetworks, getTokens, getWalletAddress, normalizeWallet, parseSignature, signTypedData, signWithPrivateKey, validateNetwork, validateToken, validateTransferWithAuthorization };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/client-web3",
-  "version": "0.2.17",
+  "version": "0.2.18-alpha.3.20",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -23,11 +23,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/thegreataxios/armory.git",
+    "url": "git+https://github.com/TheGreatAxios/armory.git",
     "directory": "packages/client-web3"
   },
   "dependencies": {
-    "@armory-sh/base": "^0.2.21",
+    "@armory-sh/base": "^0.2.22",
     "web3": "4.16.0",
     "web3-types": "1.10.0"
   },