@armory-sh/client-web3 0.2.9 → 0.2.10

package/dist/index.d.ts

@@ -48,6 +48,7 @@ interface X402TransportOptions {
     maxRetries?: number;
 }
 interface Web3X402Client {
+    fetch(url: string | Request, init?: RequestInit): Promise<Response>;
     getAccount(): Web3Account;
     getNetwork(): NetworkConfig;
     getVersion(): 1 | 2;

package/dist/index.js

@@ -6,7 +6,9 @@ import {
   encodePaymentV2,
   isX402V1Requirements,
   isX402V2Requirements,
-  combineSignatureV2
+  combineSignatureV2,
+  V1_HEADERS as V1_HEADERS2,
+  V2_HEADERS as V2_HEADERS2
 } from "@armory-sh/base";
 
 // src/eip3009.ts
@@ -236,8 +238,9 @@ var createX402V2Payment = (params) => {
   };
   return {
     x402Version: 2,
+    scheme: params.accepted.scheme,
+    network: params.accepted.network,
     resource: params.resource,
-    accepted: params.accepted,
     payload: {
       signature: params.signature,
       authorization
@@ -359,6 +362,36 @@ var signPaymentV1 = async (state, params) => {
   };
   return { v: signature.v, r: signature.r, s: signature.s, payload: legacyPayload };
 };
+var handlePaymentRequirements = async (requirements, state) => {
+  const version = detectVersionFromRequirements(requirements);
+  if (version === 1) {
+    const req2 = requirements;
+    if (isX402V1Requirements(req2)) {
+      const x402Req = req2;
+      return signPayment({
+        amount: x402Req.maxAmountRequired,
+        to: x402Req.payTo
+      }, state);
+    }
+    const legacyReq = req2;
+    return signPayment({
+      amount: legacyReq.amount,
+      to: legacyReq.payTo,
+      expiry: legacyReq.expiry
+    }, state);
+  }
+  const req = requirements;
+  const to = typeof req.payTo === "string" ? req.payTo : "0x0000000000000000000000000000000000000000";
+  const from = getAddress(state.account);
+  return signPaymentV2(state, {
+    from,
+    to,
+    amount: req.amount,
+    nonce: crypto.randomUUID(),
+    expiry: Math.floor(Date.now() / 1e3) + DEFAULT_EXPIRY_SECONDS,
+    accepted: req
+  });
+};
 var signPaymentV2 = async (state, params) => {
   const { from, to, amount, nonce, expiry, accepted } = params;
   const { network, domainName, domainVersion } = state;
@@ -402,7 +435,43 @@ var signPaymentV2 = async (state, params) => {
 };
 var createX402Client = (config) => {
   const state = createClientState(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 selectedRequirements = selectSchemeRequirements(parsed.requirements, "exact");
+      if (!selectedRequirements) {
+        throw new Error("No supported payment scheme found in requirements");
+      }
+      const from = getAddress(state.account);
+      let result;
+      if (version === 1) {
+        result = await handlePaymentRequirements(selectedRequirements, state);
+      } else {
+        const req = selectedRequirements;
+        const to = typeof req.payTo === "string" ? req.payTo : "0x0000000000000000000000000000000000000000";
+        result = await signPaymentV2(state, {
+          from,
+          to,
+          amount: req.amount,
+          nonce: crypto.randomUUID(),
+          expiry: Math.floor(Date.now() / 1e3) + DEFAULT_EXPIRY_SECONDS,
+          accepted: req
+        });
+      }
+      const paymentHeaders = new Headers(init?.headers);
+      if (version === 1) {
+        paymentHeaders.set(V1_HEADERS2.PAYMENT, encodePaymentV1(result.payload));
+      } else {
+        paymentHeaders.set(V2_HEADERS2.PAYMENT_SIGNATURE, encodePaymentV2(result.payload));
+      }
+      response = await fetch2(url, { ...init, headers: paymentHeaders });
+    }
+    return response;
+  };
   return {
+    fetch: fetch2,
     getAccount: () => state.account,
     getNetwork: () => state.network,
     getVersion: () => state.version,
@@ -435,34 +504,7 @@ var createX402Client = (config) => {
       return headers;
     },
     handlePaymentRequired: async (requirements) => {
-      const version = detectVersionFromRequirements(requirements);
-      if (version === 1) {
-        const req2 = requirements;
-        if (isX402V1Requirements(req2)) {
-          const x402Req = req2;
-          return signPayment({
-            amount: x402Req.maxAmountRequired,
-            to: x402Req.payTo
-          }, state);
-        }
-        const legacyReq = req2;
-        return signPayment({
-          amount: legacyReq.amount,
-          to: legacyReq.payTo,
-          expiry: legacyReq.expiry
-        }, state);
-      }
-      const req = requirements;
-      const to = typeof req.payTo === "string" ? req.payTo : "0x0000000000000000000000000000000000000000";
-      const from = getAddress(state.account);
-      return signPaymentV2(state, {
-        from,
-        to,
-        amount: req.amount,
-        nonce: crypto.randomUUID(),
-        expiry: Math.floor(Date.now() / 1e3) + DEFAULT_EXPIRY_SECONDS,
-        accepted: req
-      });
+      return handlePaymentRequirements(requirements, state);
     },
     verifySettlement: (response) => {
       if ("success" in response) {
@@ -507,8 +549,8 @@ var signPayment = async (options, state) => {
 
 // src/transport.ts
 import {
-  V1_HEADERS as V1_HEADERS2,
-  V2_HEADERS as V2_HEADERS2,
+  V1_HEADERS as V1_HEADERS3,
+  V2_HEADERS as V2_HEADERS3,
   encodePaymentV1 as encodePaymentV12,
   encodePaymentV2 as encodePaymentV22,
   isX402V1Requirements as isX402V1Requirements2,
@@ -518,9 +560,9 @@ var DEFAULT_MAX_RETRIES = 3;
 var createPaymentHeaders = (payload, version) => {
   const headers = new Headers();
   if (version === 1) {
-    headers.set(V1_HEADERS2.PAYMENT, encodePaymentV12(payload));
+    headers.set(V1_HEADERS3.PAYMENT, encodePaymentV12(payload));
   } else {
-    headers.set(V2_HEADERS2.PAYMENT_SIGNATURE, encodePaymentV22(payload));
+    headers.set(V2_HEADERS3.PAYMENT_SIGNATURE, encodePaymentV22(payload));
   }
   return headers;
 };
@@ -599,8 +641,8 @@ var isV2Settlement = (response) => "status" in response;
 
 // src/index.ts
 import {
-  V1_HEADERS as V1_HEADERS3,
-  V2_HEADERS as V2_HEADERS3,
+  V1_HEADERS as V1_HEADERS4,
+  V2_HEADERS as V2_HEADERS4,
   encodePaymentV1 as encodePaymentV13,
   decodePaymentV1,
   encodeSettlementV1,
@@ -645,8 +687,8 @@ export {
   EIP712_TYPES,
   NETWORKS,
   USDC_DOMAIN,
-  V1_HEADERS3 as V1_HEADERS,
-  V2_HEADERS3 as V2_HEADERS,
+  V1_HEADERS4 as V1_HEADERS,
+  V2_HEADERS4 as V2_HEADERS,
   adjustVForChainId,
   combineSignatureV22 as combineSignatureV2,
   concatenateSignature,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/client-web3",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -27,7 +27,7 @@
     "directory": "packages/client-web3"
   },
   "dependencies": {
-    "@armory-sh/base": "^0.2.12",
+    "@armory-sh/base": "^0.2.13",
     "web3": "4.16.0",
     "web3-types": "1.10.0"
   },
@@ -36,7 +36,7 @@
     "bun-types": "latest"
   },
   "scripts": {
-    "build": "tsup",
+    "build": "rm -rf dist && tsup",
     "test": "bun test",
     "example": "bun run examples/"
   }