@armory-sh/client-web3 0.2.22-beta.20260216.68 → 0.2.23-alpha.23.73

package/dist/index.js

@@ -1,5 +1,5 @@
 import { Web3 } from 'web3';
-import { encodePaymentV2, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, V2_HEADERS, getNetworkConfig, getNetworkByChainId, combineSignatureV2, networkToCaip2, isX402V2PaymentRequired } from '@armory-sh/base';
+import { encodePaymentV2, validatePaymentConfig, isValidationError, resolveNetwork, resolveToken, V2_HEADERS, getNetworkConfig, getNetworkByChainId, networkToCaip2, combineSignatureV2, 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]
@@ -262,8 +262,21 @@ var signTypedDataWrapper = async (account, domain, message) => {
 };
 var signPaymentV2 = async (state, network, params) => {
   const { from, to, amount, nonce, expiry, accepted } = params;
-  const { domainName, domainVersion } = state;
-  const domain = createEIP712Domain(network.chainId, network.usdcAddress, domainName, domainVersion);
+  const defaultAccepted = accepted ?? {
+    scheme: "exact",
+    network: networkToCaip2(network.name),
+    amount,
+    asset: network.usdcAddress,
+    payTo: to,
+    maxTimeoutSeconds: expiry - Math.floor(Date.now() / 1e3)
+  };
+  const domainExtra = defaultAccepted.extra;
+  const requirementDomainName = defaultAccepted.name ?? (domainExtra && typeof domainExtra === "object" && typeof domainExtra["name"] === "string" ? domainExtra["name"] : void 0);
+  const requirementDomainVersion = defaultAccepted.version ?? (domainExtra && typeof domainExtra === "object" && typeof domainExtra["version"] === "string" ? domainExtra["version"] : void 0);
+  const effectiveDomainName = state.domainName ?? requirementDomainName;
+  const effectiveDomainVersion = state.domainVersion ?? requirementDomainVersion;
+  const chainId = parseInt(defaultAccepted.network.split(":")[1], 10);
+  const domain = createEIP712Domain(chainId, defaultAccepted.asset, effectiveDomainName, effectiveDomainVersion);
   const message = createTransferWithAuthorization({
     from,
     to,
@@ -274,14 +287,6 @@ var signPaymentV2 = async (state, network, params) => {
   });
   const signature = await signTypedDataWrapper(state.account, domain, message);
   const combinedSig = combineSignatureV2(signature.v, signature.r, signature.s);
-  const defaultAccepted = accepted ?? {
-    scheme: "exact",
-    network: networkToCaip2(network.name),
-    amount,
-    asset: network.usdcAddress,
-    payTo: to,
-    maxTimeoutSeconds: expiry - Math.floor(Date.now() / 1e3)
-  };
   const x402Payload = createX402V2Payment({
     from,
     to,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/client-web3",
-  "version": "0.2.22-beta.20260216.68",
+  "version": "0.2.23-alpha.23.73",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "keywords": [
@@ -46,7 +46,7 @@
     "directory": "packages/client-web3"
   },
   "dependencies": {
-    "@armory-sh/base": "0.2.26-beta.20260216.68",
+    "@armory-sh/base": "0.2.27-alpha.23.73",
     "web3": "4.16.0",
     "web3-types": "1.10.0"
   },