@agirails/sdk 3.1.0 → 3.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/README.md +12 -14
- package/dist/ACTPClient.d.ts +8 -11
- package/dist/ACTPClient.d.ts.map +1 -1
- package/dist/ACTPClient.js +79 -20
- package/dist/ACTPClient.js.map +1 -1
- package/dist/__tests__/helpers/mockX402Server.d.ts +67 -0
- package/dist/__tests__/helpers/mockX402Server.d.ts.map +1 -0
- package/dist/__tests__/helpers/mockX402Server.js +121 -0
- package/dist/__tests__/helpers/mockX402Server.js.map +1 -0
- package/dist/adapters/BaseAdapter.d.ts +7 -1
- package/dist/adapters/BaseAdapter.d.ts.map +1 -1
- package/dist/adapters/BaseAdapter.js +11 -6
- package/dist/adapters/BaseAdapter.js.map +1 -1
- package/dist/adapters/BasicAdapter.d.ts.map +1 -1
- package/dist/adapters/BasicAdapter.js +12 -2
- package/dist/adapters/BasicAdapter.js.map +1 -1
- package/dist/adapters/StandardAdapter.d.ts.map +1 -1
- package/dist/adapters/StandardAdapter.js +12 -2
- package/dist/adapters/StandardAdapter.js.map +1 -1
- package/dist/adapters/X402Adapter.d.ts +161 -199
- package/dist/adapters/X402Adapter.d.ts.map +1 -1
- package/dist/adapters/X402Adapter.js +603 -414
- package/dist/adapters/X402Adapter.js.map +1 -1
- package/dist/adapters/index.d.ts +1 -1
- package/dist/adapters/index.d.ts.map +1 -1
- package/dist/adapters/index.js.map +1 -1
- package/dist/builders/DeliveryProofBuilder.d.ts.map +1 -1
- package/dist/builders/DeliveryProofBuilder.js +3 -2
- package/dist/builders/DeliveryProofBuilder.js.map +1 -1
- package/dist/cli/agirails.js +12 -4
- package/dist/cli/agirails.js.map +1 -1
- package/dist/cli/commands/autopublish.js +9 -1
- package/dist/cli/commands/autopublish.js.map +1 -1
- package/dist/cli/commands/config.js +1 -12
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/deploy-env.js +1 -1
- package/dist/cli/commands/deploy-env.js.map +1 -1
- package/dist/cli/commands/diff.js +38 -4
- package/dist/cli/commands/diff.js.map +1 -1
- package/dist/cli/commands/health.js +3 -1
- package/dist/cli/commands/health.js.map +1 -1
- package/dist/cli/commands/init.d.ts +2 -0
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +75 -2
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/pay.d.ts.map +1 -1
- package/dist/cli/commands/pay.js +23 -0
- package/dist/cli/commands/pay.js.map +1 -1
- package/dist/cli/commands/publish.js +15 -8
- package/dist/cli/commands/publish.js.map +1 -1
- package/dist/cli/commands/pull.js +3 -1
- package/dist/cli/commands/pull.js.map +1 -1
- package/dist/cli/commands/receipt.d.ts +17 -3
- package/dist/cli/commands/receipt.d.ts.map +1 -1
- package/dist/cli/commands/receipt.js +95 -33
- package/dist/cli/commands/receipt.js.map +1 -1
- package/dist/cli/commands/test.d.ts.map +1 -1
- package/dist/cli/commands/test.js +222 -60
- package/dist/cli/commands/test.js.map +1 -1
- package/dist/cli/commands/tx.js +13 -0
- package/dist/cli/commands/tx.js.map +1 -1
- package/dist/cli/commands/verify.d.ts +14 -0
- package/dist/cli/commands/verify.d.ts.map +1 -0
- package/dist/cli/commands/verify.js +253 -0
- package/dist/cli/commands/verify.js.map +1 -0
- package/dist/cli/index.js +5 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/receiptUpload.d.ts +52 -0
- package/dist/cli/receiptUpload.d.ts.map +1 -0
- package/dist/cli/receiptUpload.js +134 -0
- package/dist/cli/receiptUpload.js.map +1 -0
- package/dist/cli/utils/banner.d.ts +31 -0
- package/dist/cli/utils/banner.d.ts.map +1 -0
- package/dist/cli/utils/banner.js +92 -0
- package/dist/cli/utils/banner.js.map +1 -0
- package/dist/cli/utils/config.d.ts +0 -2
- package/dist/cli/utils/config.d.ts.map +1 -1
- package/dist/cli/utils/config.js +40 -25
- package/dist/cli/utils/config.js.map +1 -1
- package/dist/cli/utils/output.d.ts +2 -0
- package/dist/cli/utils/output.d.ts.map +1 -1
- package/dist/cli/utils/output.js +7 -1
- package/dist/cli/utils/output.js.map +1 -1
- package/dist/cli/utils/share.d.ts +51 -0
- package/dist/cli/utils/share.d.ts.map +1 -0
- package/dist/cli/utils/share.js +133 -0
- package/dist/cli/utils/share.js.map +1 -0
- package/dist/config/agirailsmd.d.ts.map +1 -1
- package/dist/config/agirailsmd.js +2 -1
- package/dist/config/agirailsmd.js.map +1 -1
- package/dist/config/defaults.d.ts +2 -2
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +9 -3
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/networks.d.ts +7 -0
- package/dist/config/networks.d.ts.map +1 -1
- package/dist/config/networks.js +20 -11
- package/dist/config/networks.js.map +1 -1
- package/dist/config/pendingPublish.d.ts.map +1 -1
- package/dist/config/pendingPublish.js +10 -3
- package/dist/config/pendingPublish.js.map +1 -1
- package/dist/config/syncOperations.d.ts.map +1 -1
- package/dist/config/syncOperations.js +4 -2
- package/dist/config/syncOperations.js.map +1 -1
- package/dist/erc8004/ERC8004Bridge.d.ts.map +1 -1
- package/dist/erc8004/ERC8004Bridge.js +0 -1
- package/dist/erc8004/ERC8004Bridge.js.map +1 -1
- package/dist/errors/ACTPError.d.ts +24 -0
- package/dist/errors/ACTPError.d.ts.map +1 -0
- package/dist/errors/ACTPError.js +35 -0
- package/dist/errors/ACTPError.js.map +1 -0
- package/dist/errors/X402Errors.d.ts +106 -0
- package/dist/errors/X402Errors.d.ts.map +1 -0
- package/dist/errors/X402Errors.js +160 -0
- package/dist/errors/X402Errors.js.map +1 -0
- package/dist/errors/index.d.ts +3 -9
- package/dist/errors/index.d.ts.map +1 -1
- package/dist/errors/index.js +38 -33
- package/dist/errors/index.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -3
- package/dist/index.js.map +1 -1
- package/dist/level0/Provider.d.ts +5 -0
- package/dist/level0/Provider.d.ts.map +1 -1
- package/dist/level0/ServiceDirectory.d.ts.map +1 -1
- package/dist/level0/ServiceDirectory.js +3 -2
- package/dist/level0/ServiceDirectory.js.map +1 -1
- package/dist/level0/provide.d.ts.map +1 -1
- package/dist/level0/provide.js +11 -8
- package/dist/level0/provide.js.map +1 -1
- package/dist/level0/request.d.ts.map +1 -1
- package/dist/level0/request.js +14 -6
- package/dist/level0/request.js.map +1 -1
- package/dist/level1/Agent.d.ts +1 -1
- package/dist/level1/Agent.d.ts.map +1 -1
- package/dist/level1/Agent.js +12 -6
- package/dist/level1/Agent.js.map +1 -1
- package/dist/level1/pricing/PriceCalculator.d.ts.map +1 -1
- package/dist/level1/pricing/PriceCalculator.js +4 -12
- package/dist/level1/pricing/PriceCalculator.js.map +1 -1
- package/dist/protocol/ACTPKernel.d.ts +4 -1
- package/dist/protocol/ACTPKernel.d.ts.map +1 -1
- package/dist/protocol/ACTPKernel.js +2 -1
- package/dist/protocol/ACTPKernel.js.map +1 -1
- package/dist/protocol/EventMonitor.d.ts +27 -1
- package/dist/protocol/EventMonitor.d.ts.map +1 -1
- package/dist/protocol/EventMonitor.js +11 -9
- package/dist/protocol/EventMonitor.js.map +1 -1
- package/dist/protocol/ProofGenerator.d.ts.map +1 -1
- package/dist/protocol/ProofGenerator.js +3 -2
- package/dist/protocol/ProofGenerator.js.map +1 -1
- package/dist/runtime/BlockchainRuntime.d.ts +2 -0
- package/dist/runtime/BlockchainRuntime.d.ts.map +1 -1
- package/dist/runtime/BlockchainRuntime.js +19 -6
- package/dist/runtime/BlockchainRuntime.js.map +1 -1
- package/dist/runtime/MockRuntime.d.ts +3 -2
- package/dist/runtime/MockRuntime.d.ts.map +1 -1
- package/dist/runtime/MockRuntime.js +16 -22
- package/dist/runtime/MockRuntime.js.map +1 -1
- package/dist/runtime/types/MockState.d.ts +4 -0
- package/dist/runtime/types/MockState.d.ts.map +1 -1
- package/dist/runtime/types/MockState.js.map +1 -1
- package/dist/server/buildX402Server.d.ts +131 -0
- package/dist/server/buildX402Server.d.ts.map +1 -0
- package/dist/server/buildX402Server.js +151 -0
- package/dist/server/buildX402Server.js.map +1 -0
- package/dist/server/index.d.ts +33 -0
- package/dist/server/index.d.ts.map +1 -0
- package/dist/server/index.js +36 -0
- package/dist/server/index.js.map +1 -0
- package/dist/types/adapter.d.ts +42 -12
- package/dist/types/adapter.d.ts.map +1 -1
- package/dist/types/adapter.js +6 -1
- package/dist/types/adapter.js.map +1 -1
- package/dist/types/eip712.d.ts +20 -0
- package/dist/types/eip712.d.ts.map +1 -1
- package/dist/types/x402.d.ts +8 -8
- package/dist/utils/security.d.ts.map +1 -1
- package/dist/utils/security.js +4 -6
- package/dist/utils/security.js.map +1 -1
- package/dist/wallet/AutoWalletProvider.d.ts +45 -1
- package/dist/wallet/AutoWalletProvider.d.ts.map +1 -1
- package/dist/wallet/AutoWalletProvider.js +154 -1
- package/dist/wallet/AutoWalletProvider.js.map +1 -1
- package/dist/wallet/EOAWalletProvider.d.ts +13 -1
- package/dist/wallet/EOAWalletProvider.d.ts.map +1 -1
- package/dist/wallet/EOAWalletProvider.js +24 -0
- package/dist/wallet/EOAWalletProvider.js.map +1 -1
- package/dist/wallet/IWalletProvider.d.ts +34 -0
- package/dist/wallet/IWalletProvider.d.ts.map +1 -1
- package/dist/wallet/SmartWalletRouter.d.ts.map +1 -1
- package/dist/wallet/SmartWalletRouter.js +3 -1
- package/dist/wallet/SmartWalletRouter.js.map +1 -1
- package/dist/wallet/aa/BundlerClient.js +8 -4
- package/dist/wallet/aa/BundlerClient.js.map +1 -1
- package/dist/wallet/aa/DualNonceManager.d.ts +4 -1
- package/dist/wallet/aa/DualNonceManager.d.ts.map +1 -1
- package/dist/wallet/aa/DualNonceManager.js +3 -0
- package/dist/wallet/aa/DualNonceManager.js.map +1 -1
- package/dist/wallet/keystore.d.ts.map +1 -1
- package/dist/wallet/keystore.js +6 -4
- package/dist/wallet/keystore.js.map +1 -1
- package/package.json +16 -3
- package/dist/adapters/BeginnerAdapter.d.ts +0 -152
- package/dist/adapters/BeginnerAdapter.d.ts.map +0 -1
- package/dist/adapters/BeginnerAdapter.js +0 -168
- package/dist/adapters/BeginnerAdapter.js.map +0 -1
- package/dist/adapters/IntermediateAdapter.d.ts +0 -211
- package/dist/adapters/IntermediateAdapter.d.ts.map +0 -1
- package/dist/adapters/IntermediateAdapter.js +0 -260
- package/dist/adapters/IntermediateAdapter.js.map +0 -1
package/dist/utils/security.js
CHANGED
|
@@ -54,11 +54,9 @@ function timingSafeEqual(a, b) {
|
|
|
54
54
|
// Convert to buffers for crypto.timingSafeEqual
|
|
55
55
|
const bufA = Buffer.from(a);
|
|
56
56
|
const bufB = Buffer.from(b);
|
|
57
|
-
//
|
|
57
|
+
// Length mismatch → not equal. Length is not secret in ACTP
|
|
58
|
+
// (hashes are always 32 bytes, signatures 65 bytes).
|
|
58
59
|
if (bufA.length !== bufB.length) {
|
|
59
|
-
// Compare against a dummy buffer of the same length to maintain constant time
|
|
60
|
-
const dummy = Buffer.alloc(bufA.length);
|
|
61
|
-
crypto.timingSafeEqual(bufA, dummy);
|
|
62
60
|
return false;
|
|
63
61
|
}
|
|
64
62
|
return crypto.timingSafeEqual(bufA, bufB);
|
|
@@ -204,8 +202,8 @@ function safeJSONParse(jsonString, schema) {
|
|
|
204
202
|
// Invalid JSON
|
|
205
203
|
return null;
|
|
206
204
|
}
|
|
207
|
-
// Ensure we got
|
|
208
|
-
if (typeof parsed !== 'object' || parsed === null) {
|
|
205
|
+
// Ensure we got a plain object (not a primitive, null, or array)
|
|
206
|
+
if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
|
|
209
207
|
return null;
|
|
210
208
|
}
|
|
211
209
|
// Remove dangerous properties that could be used for prototype pollution
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/utils/security.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAiC;AACjC,2CAA6B;AAE7B;;;;;;;;;GASG;AACH,SAAgB,eAAe,CAAC,CAAS,EAAE,CAAS;IAClD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,gDAAgD;IAChD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAE5B,
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/utils/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* @module wallet/AutoWalletProvider
|
|
15
15
|
*/
|
|
16
16
|
import { ethers } from 'ethers';
|
|
17
|
-
import { IWalletProvider, TransactionRequest, TransactionReceipt, WalletInfo, BatchedPayParams, BatchedPayResult, CreateACTPTransactionParams, CreateACTPTransactionResult } from './IWalletProvider';
|
|
17
|
+
import { IWalletProvider, TransactionRequest, TransactionReceipt, WalletInfo, BatchedPayParams, BatchedPayResult, CreateACTPTransactionParams, CreateACTPTransactionResult, EIP712TypedData } from './IWalletProvider';
|
|
18
18
|
import { SmartWalletCall } from './aa/constants';
|
|
19
19
|
import { DualNonceManager } from './aa/DualNonceManager';
|
|
20
20
|
export interface AutoWalletConfig {
|
|
@@ -48,6 +48,8 @@ export declare class AutoWalletProvider implements IWalletProvider {
|
|
|
48
48
|
private readonly nonceManager;
|
|
49
49
|
private smartWalletAddress;
|
|
50
50
|
private isDeployed;
|
|
51
|
+
private viemSmartAccount;
|
|
52
|
+
private viemSmartAccountInit;
|
|
51
53
|
private constructor();
|
|
52
54
|
/**
|
|
53
55
|
* Factory method — computes counterfactual address and checks deployment.
|
|
@@ -65,6 +67,48 @@ export declare class AutoWalletProvider implements IWalletProvider {
|
|
|
65
67
|
* Check if the Smart Wallet is deployed on-chain.
|
|
66
68
|
*/
|
|
67
69
|
getIsDeployed(): boolean;
|
|
70
|
+
/**
|
|
71
|
+
* Expose the underlying ethers JsonRpcProvider for read-only contract calls.
|
|
72
|
+
* Used by X402Adapter to check USDC.allowance() before Permit2 approve so
|
|
73
|
+
* we don't re-sponsor the same approve across restarts or horizontal scale.
|
|
74
|
+
*/
|
|
75
|
+
getReadProvider(): unknown;
|
|
76
|
+
/**
|
|
77
|
+
* Sign EIP-712 typed data via viem's `toCoinbaseSmartAccount`.
|
|
78
|
+
*
|
|
79
|
+
* Handles the full Smart Wallet signing flow automatically:
|
|
80
|
+
* 1. Hash typed data (domain + types + message)
|
|
81
|
+
* 2. Wrap in Coinbase Smart Wallet replay-safe hash
|
|
82
|
+
* (CoinbaseSmartWalletMessage struct with verifyingContract=SmartWallet)
|
|
83
|
+
* 3. Owner EOA signs the replay-safe hash
|
|
84
|
+
* 4. Encode as `SignatureWrapper(ownerIndex=0, rawSig)` for deployed wallet
|
|
85
|
+
* 5. For counterfactual (undeployed) wallet, wrap in ERC-6492 envelope
|
|
86
|
+
* so facilitators can validate via simulation before first UserOp
|
|
87
|
+
*
|
|
88
|
+
* Required by X402Adapter for x402 v2 payments (EIP-3009 + Permit2 flows).
|
|
89
|
+
*
|
|
90
|
+
* Lazy-constructs the viem account on first call and caches it on the
|
|
91
|
+
* instance via a shared init promise (I2: concurrent callers wait on the
|
|
92
|
+
* same promise instead of double-constructing). Includes a runtime parity
|
|
93
|
+
* check between our counterfactual address (`computeSmartWalletAddress`)
|
|
94
|
+
* and viem's `toCoinbaseSmartAccount.getAddress()` — divergence would mean
|
|
95
|
+
* signatures validate at the wrong contract, which is a silent failure
|
|
96
|
+
* we refuse to allow.
|
|
97
|
+
*
|
|
98
|
+
* Bundler compatibility note (N3): this method uses `require('viem')` at
|
|
99
|
+
* runtime so ACTP-only users never pay viem's ~80KB bundle cost. Under
|
|
100
|
+
* webpack/esbuild/Next.js this `require` will not be resolved unless viem
|
|
101
|
+
* is declared as an external. For Node applications (the primary target
|
|
102
|
+
* for @agirails/sdk) it works out of the box.
|
|
103
|
+
*/
|
|
104
|
+
signTypedData(typedData: EIP712TypedData): Promise<string>;
|
|
105
|
+
/**
|
|
106
|
+
* Lazily construct (and cache) the viem Smart Account used for EIP-712
|
|
107
|
+
* signing. Uses an init promise so concurrent calls share the same
|
|
108
|
+
* construction and parity check.
|
|
109
|
+
*/
|
|
110
|
+
private getViemSmartAccount;
|
|
111
|
+
private constructViemSmartAccount;
|
|
68
112
|
/**
|
|
69
113
|
* Execute a batched ACTP payment atomically.
|
|
70
114
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/AutoWalletProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,2BAA2B,EAC3B,2BAA2B,
|
|
1
|
+
{"version":3,"file":"AutoWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/AutoWalletProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,2BAA2B,EAC3B,2BAA2B,EAC3B,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AASzD,MAAM,WAAW,gBAAgB;IAC/B,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;IACtB,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC;IACjC,eAAe;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qFAAqF;IACrF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,4BAA4B;IAC5B,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,8BAA8B;IAC9B,SAAS,EAAE;QACT,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAMD,qBAAa,kBAAmB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkB;IAC5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,kBAAkB,CAAc;IACxC,OAAO,CAAC,UAAU,CAAkB;IAMpC,OAAO,CAAC,gBAAgB,CAAiB;IACzC,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO;IA8BP;;OAEG;WACU,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB1E,UAAU,IAAI,MAAM;IAId,eAAe,CAAC,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAIpE,oBAAoB,CACxB,GAAG,EAAE,kBAAkB,EAAE,GACxB,OAAO,CAAC,kBAAkB,CAAC;IAyB9B,aAAa,IAAI,UAAU;IAU3B;;OAEG;IACH,eAAe,IAAI,gBAAgB;IAInC;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;;;OAIG;IACH,eAAe,IAAI,OAAO;IAI1B;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACG,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBhE;;;;OAIG;YACW,mBAAmB;YAmBnB,yBAAyB;IA8EvC;;;;;OAKG;IACG,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,YAAY,CAAC,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyE3G;;;;;;OAMG;IACG,qBAAqB,CAAC,MAAM,EAAE,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC;IA2CtG;;OAEG;YACW,YAAY;CAyD3B"}
|
|
@@ -24,6 +24,7 @@ const PaymasterClient_1 = require("./aa/PaymasterClient");
|
|
|
24
24
|
const DualNonceManager_1 = require("./aa/DualNonceManager");
|
|
25
25
|
const TransactionBatcher_1 = require("./aa/TransactionBatcher");
|
|
26
26
|
const Logger_1 = require("../utils/Logger");
|
|
27
|
+
const X402Errors_1 = require("../errors/X402Errors");
|
|
27
28
|
// ============================================================================
|
|
28
29
|
// AutoWalletProvider
|
|
29
30
|
// ============================================================================
|
|
@@ -31,6 +32,13 @@ class AutoWalletProvider {
|
|
|
31
32
|
constructor(config, smartWalletAddress, isDeployed) {
|
|
32
33
|
this.smartWalletAddress = '';
|
|
33
34
|
this.isDeployed = false;
|
|
35
|
+
// Lazy-constructed viem Coinbase Smart Account for EIP-712 signing (x402 v2).
|
|
36
|
+
// Null until first signTypedData() call. Never reconstructed after creation.
|
|
37
|
+
// I2: concurrent signTypedData calls share a single init promise to avoid
|
|
38
|
+
// double-constructing the viem account (which would open two RPC clients
|
|
39
|
+
// and run parity checks twice).
|
|
40
|
+
this.viemSmartAccount = null;
|
|
41
|
+
this.viemSmartAccountInit = null;
|
|
34
42
|
this.signer = config.signer;
|
|
35
43
|
this.provider = config.provider;
|
|
36
44
|
this.chainId = config.chainId;
|
|
@@ -110,6 +118,146 @@ class AutoWalletProvider {
|
|
|
110
118
|
getIsDeployed() {
|
|
111
119
|
return this.isDeployed;
|
|
112
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Expose the underlying ethers JsonRpcProvider for read-only contract calls.
|
|
123
|
+
* Used by X402Adapter to check USDC.allowance() before Permit2 approve so
|
|
124
|
+
* we don't re-sponsor the same approve across restarts or horizontal scale.
|
|
125
|
+
*/
|
|
126
|
+
getReadProvider() {
|
|
127
|
+
return this.provider;
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Sign EIP-712 typed data via viem's `toCoinbaseSmartAccount`.
|
|
131
|
+
*
|
|
132
|
+
* Handles the full Smart Wallet signing flow automatically:
|
|
133
|
+
* 1. Hash typed data (domain + types + message)
|
|
134
|
+
* 2. Wrap in Coinbase Smart Wallet replay-safe hash
|
|
135
|
+
* (CoinbaseSmartWalletMessage struct with verifyingContract=SmartWallet)
|
|
136
|
+
* 3. Owner EOA signs the replay-safe hash
|
|
137
|
+
* 4. Encode as `SignatureWrapper(ownerIndex=0, rawSig)` for deployed wallet
|
|
138
|
+
* 5. For counterfactual (undeployed) wallet, wrap in ERC-6492 envelope
|
|
139
|
+
* so facilitators can validate via simulation before first UserOp
|
|
140
|
+
*
|
|
141
|
+
* Required by X402Adapter for x402 v2 payments (EIP-3009 + Permit2 flows).
|
|
142
|
+
*
|
|
143
|
+
* Lazy-constructs the viem account on first call and caches it on the
|
|
144
|
+
* instance via a shared init promise (I2: concurrent callers wait on the
|
|
145
|
+
* same promise instead of double-constructing). Includes a runtime parity
|
|
146
|
+
* check between our counterfactual address (`computeSmartWalletAddress`)
|
|
147
|
+
* and viem's `toCoinbaseSmartAccount.getAddress()` — divergence would mean
|
|
148
|
+
* signatures validate at the wrong contract, which is a silent failure
|
|
149
|
+
* we refuse to allow.
|
|
150
|
+
*
|
|
151
|
+
* Bundler compatibility note (N3): this method uses `require('viem')` at
|
|
152
|
+
* runtime so ACTP-only users never pay viem's ~80KB bundle cost. Under
|
|
153
|
+
* webpack/esbuild/Next.js this `require` will not be resolved unless viem
|
|
154
|
+
* is declared as an external. For Node applications (the primary target
|
|
155
|
+
* for @agirails/sdk) it works out of the box.
|
|
156
|
+
*/
|
|
157
|
+
async signTypedData(typedData) {
|
|
158
|
+
try {
|
|
159
|
+
const account = await this.getViemSmartAccount();
|
|
160
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
161
|
+
const sig = await account.signTypedData({
|
|
162
|
+
domain: typedData.domain,
|
|
163
|
+
types: typedData.types,
|
|
164
|
+
primaryType: typedData.primaryType,
|
|
165
|
+
message: typedData.message,
|
|
166
|
+
});
|
|
167
|
+
return sig;
|
|
168
|
+
}
|
|
169
|
+
catch (e) {
|
|
170
|
+
if (e instanceof X402Errors_1.X402SignatureFailedError)
|
|
171
|
+
throw e;
|
|
172
|
+
throw new X402Errors_1.X402SignatureFailedError(`AutoWallet signTypedData failed: ${e instanceof Error ? e.message : String(e)}`);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* Lazily construct (and cache) the viem Smart Account used for EIP-712
|
|
177
|
+
* signing. Uses an init promise so concurrent calls share the same
|
|
178
|
+
* construction and parity check.
|
|
179
|
+
*/
|
|
180
|
+
async getViemSmartAccount() {
|
|
181
|
+
if (this.viemSmartAccount)
|
|
182
|
+
return this.viemSmartAccount;
|
|
183
|
+
if (!this.viemSmartAccountInit) {
|
|
184
|
+
this.viemSmartAccountInit = this.constructViemSmartAccount();
|
|
185
|
+
}
|
|
186
|
+
try {
|
|
187
|
+
const account = await this.viemSmartAccountInit;
|
|
188
|
+
this.viemSmartAccount = account;
|
|
189
|
+
return account;
|
|
190
|
+
}
|
|
191
|
+
catch (e) {
|
|
192
|
+
// Reset on failure so the next caller can retry (otherwise a single
|
|
193
|
+
// RPC hiccup would poison all future signTypedData calls forever).
|
|
194
|
+
this.viemSmartAccountInit = null;
|
|
195
|
+
throw e;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
async constructViemSmartAccount() {
|
|
199
|
+
// Dynamic require to avoid pulling viem into the call path of
|
|
200
|
+
// ACTP-only users who never touch x402.
|
|
201
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
202
|
+
const { createPublicClient, http } = require('viem');
|
|
203
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
204
|
+
const { privateKeyToAccount } = require('viem/accounts');
|
|
205
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
206
|
+
const { toCoinbaseSmartAccount } = require('viem/account-abstraction');
|
|
207
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
208
|
+
const viemChains = require('viem/chains');
|
|
209
|
+
// I4: chain mapping MUST stay in sync with X402Adapter's DEFAULT_EVM_NETWORKS.
|
|
210
|
+
// Any EVM chain we advertise as supported at the adapter layer must also
|
|
211
|
+
// resolve to a viem chain here, or signing will fail after successful
|
|
212
|
+
// requirement selection.
|
|
213
|
+
const chainMap = {
|
|
214
|
+
1: viemChains.mainnet,
|
|
215
|
+
8453: viemChains.base,
|
|
216
|
+
84532: viemChains.baseSepolia,
|
|
217
|
+
10: viemChains.optimism,
|
|
218
|
+
42161: viemChains.arbitrum,
|
|
219
|
+
137: viemChains.polygon,
|
|
220
|
+
};
|
|
221
|
+
const chain = chainMap[this.chainId];
|
|
222
|
+
if (!chain) {
|
|
223
|
+
throw new X402Errors_1.X402SignatureFailedError(`AutoWalletProvider.signTypedData: chainId ${this.chainId} is not a ` +
|
|
224
|
+
`supported x402 chain. Add to viem/chains mapping in AutoWalletProvider.`);
|
|
225
|
+
}
|
|
226
|
+
// Build viem public client against the same RPC URL as our ethers provider.
|
|
227
|
+
// ethers v6 stores the RPC URL in provider._getConnection().url.
|
|
228
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
229
|
+
const rpcUrl = this.provider._getConnection?.()?.url;
|
|
230
|
+
if (!rpcUrl) {
|
|
231
|
+
throw new X402Errors_1.X402SignatureFailedError('Cannot extract RPC URL from ethers provider for viem client construction');
|
|
232
|
+
}
|
|
233
|
+
const publicClient = createPublicClient({
|
|
234
|
+
chain,
|
|
235
|
+
transport: http(rpcUrl),
|
|
236
|
+
});
|
|
237
|
+
// Owner LocalAccount from the same private key as our ethers signer.
|
|
238
|
+
const owner = privateKeyToAccount(this.signer.privateKey);
|
|
239
|
+
const account = await toCoinbaseSmartAccount({
|
|
240
|
+
client: publicClient,
|
|
241
|
+
owners: [owner],
|
|
242
|
+
ownerIndex: 0,
|
|
243
|
+
// version: '1.1' matches our SMART_WALLET_FACTORY (0xBA5ED110...).
|
|
244
|
+
// viem defaults to '1' (factory 0x0ba5ed0c...) which produces a different
|
|
245
|
+
// CREATE2 address. Must stay in sync with aa/constants.ts.
|
|
246
|
+
version: '1.1',
|
|
247
|
+
});
|
|
248
|
+
// CRITICAL parity check: viem-computed Smart Wallet address MUST match
|
|
249
|
+
// our counterfactual address. If these differ, signatures validate at
|
|
250
|
+
// the wrong contract and everything fails silently on the facilitator side.
|
|
251
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
252
|
+
const viemAddr = await account.getAddress();
|
|
253
|
+
if (viemAddr.toLowerCase() !== this.smartWalletAddress.toLowerCase()) {
|
|
254
|
+
throw new X402Errors_1.X402SignatureFailedError(`Smart Wallet address parity mismatch: ours=${this.smartWalletAddress}, ` +
|
|
255
|
+
`viem=${viemAddr}. Our computeSmartWalletAddress and viem's ` +
|
|
256
|
+
`toCoinbaseSmartAccount disagree. x402 payments cannot proceed — ` +
|
|
257
|
+
`signatures would validate at the wrong contract.`);
|
|
258
|
+
}
|
|
259
|
+
return account;
|
|
260
|
+
}
|
|
113
261
|
/**
|
|
114
262
|
* Execute a batched ACTP payment atomically.
|
|
115
263
|
*
|
|
@@ -129,8 +277,13 @@ class AutoWalletProvider {
|
|
|
129
277
|
const allCalls = prependCalls && prependCalls.length > 0
|
|
130
278
|
? [...prependCalls, ...batch.calls]
|
|
131
279
|
: batch.calls;
|
|
280
|
+
// On retry, re-read EntryPoint nonce — the previous UserOp consumed it
|
|
281
|
+
// even if the inner ACTP call reverted.
|
|
282
|
+
const currentEPNonce = i === 0
|
|
283
|
+
? entryPointNonce
|
|
284
|
+
: await this.nonceManager.readEntryPointNonce();
|
|
132
285
|
try {
|
|
133
|
-
const receipt = await this.submitUserOp(allCalls,
|
|
286
|
+
const receipt = await this.submitUserOp(allCalls, currentEPNonce);
|
|
134
287
|
if (!receipt.success) {
|
|
135
288
|
const failed = {
|
|
136
289
|
result: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutoWalletProvider.js","sourceRoot":"","sources":["../../src/wallet/AutoWalletProvider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"AutoWalletProvider.js","sourceRoot":"","sources":["../../src/wallet/AutoWalletProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* @module wallet/EOAWalletProvider
|
|
9
9
|
*/
|
|
10
10
|
import { ethers } from 'ethers';
|
|
11
|
-
import { IWalletProvider, TransactionRequest, TransactionReceipt, WalletInfo } from './IWalletProvider';
|
|
11
|
+
import { IWalletProvider, TransactionRequest, TransactionReceipt, WalletInfo, EIP712TypedData } from './IWalletProvider';
|
|
12
12
|
export declare class EOAWalletProvider implements IWalletProvider {
|
|
13
13
|
private readonly wallet;
|
|
14
14
|
private readonly chainId;
|
|
@@ -17,5 +17,17 @@ export declare class EOAWalletProvider implements IWalletProvider {
|
|
|
17
17
|
sendTransaction(tx: TransactionRequest): Promise<TransactionReceipt>;
|
|
18
18
|
sendBatchTransaction(txs: TransactionRequest[]): Promise<TransactionReceipt>;
|
|
19
19
|
getWalletInfo(): WalletInfo;
|
|
20
|
+
/**
|
|
21
|
+
* Expose the underlying ethers provider for read-only contract calls.
|
|
22
|
+
* Used by X402Adapter to check USDC.allowance() before Permit2 approve.
|
|
23
|
+
*/
|
|
24
|
+
getReadProvider(): unknown;
|
|
25
|
+
/**
|
|
26
|
+
* Sign EIP-712 typed data via ethers.Wallet.signTypedData.
|
|
27
|
+
*
|
|
28
|
+
* Ethers v6 rejects an explicit `EIP712Domain` entry in the types bag
|
|
29
|
+
* (it infers the domain type internally), so we strip it before calling.
|
|
30
|
+
*/
|
|
31
|
+
signTypedData(typedData: EIP712TypedData): Promise<string>;
|
|
20
32
|
}
|
|
21
33
|
//# sourceMappingURL=EOAWalletProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EOAWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/EOAWalletProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,
|
|
1
|
+
{"version":3,"file":"EOAWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/EOAWalletProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAG3B,qBAAa,iBAAkB,YAAW,eAAe;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM;IAKlD,UAAU,IAAI,MAAM;IAId,eAAe,CAAC,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAapE,oBAAoB,CAAC,GAAG,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAelF,aAAa,IAAI,UAAU;IAU3B;;;OAGG;IACH,eAAe,IAAI,OAAO;IAI1B;;;;;OAKG;IACG,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;CAkBjE"}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.EOAWalletProvider = void 0;
|
|
13
|
+
const X402Errors_1 = require("../errors/X402Errors");
|
|
13
14
|
class EOAWalletProvider {
|
|
14
15
|
constructor(wallet, chainId) {
|
|
15
16
|
this.wallet = wallet;
|
|
@@ -52,6 +53,29 @@ class EOAWalletProvider {
|
|
|
52
53
|
chainId: this.chainId,
|
|
53
54
|
};
|
|
54
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Expose the underlying ethers provider for read-only contract calls.
|
|
58
|
+
* Used by X402Adapter to check USDC.allowance() before Permit2 approve.
|
|
59
|
+
*/
|
|
60
|
+
getReadProvider() {
|
|
61
|
+
return this.wallet.provider;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Sign EIP-712 typed data via ethers.Wallet.signTypedData.
|
|
65
|
+
*
|
|
66
|
+
* Ethers v6 rejects an explicit `EIP712Domain` entry in the types bag
|
|
67
|
+
* (it infers the domain type internally), so we strip it before calling.
|
|
68
|
+
*/
|
|
69
|
+
async signTypedData(typedData) {
|
|
70
|
+
try {
|
|
71
|
+
// Strip EIP712Domain — ethers v6 derives it from the domain argument.
|
|
72
|
+
const { EIP712Domain: _omit, ...types } = typedData.types;
|
|
73
|
+
return await this.wallet.signTypedData(typedData.domain, types, typedData.message);
|
|
74
|
+
}
|
|
75
|
+
catch (e) {
|
|
76
|
+
throw new X402Errors_1.X402SignatureFailedError(`EOA signTypedData failed: ${e instanceof Error ? e.message : String(e)}`);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
55
79
|
}
|
|
56
80
|
exports.EOAWalletProvider = EOAWalletProvider;
|
|
57
81
|
//# sourceMappingURL=EOAWalletProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EOAWalletProvider.js","sourceRoot":"","sources":["../../src/wallet/EOAWalletProvider.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAUH,MAAa,iBAAiB;IAI5B,YAAY,MAAqB,EAAE,OAAe;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAsB;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjD,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,OAAO;YACL,IAAI,EAAE,OAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,OAAQ,CAAC,MAAM,KAAK,CAAC;SAC/B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAyB;QAClD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,WAA2C,CAAC;QAChD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzB,OAAO,WAAW,CAAC,CAAC,YAAY;YAClC,CAAC;QACH,CAAC;QACD,OAAO,WAAY,CAAC;IACtB,CAAC;IAED,aAAa;QACX,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,IAAI,EAAE,KAAK;YACX,gBAAgB,EAAE,KAAK;YACvB,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"EOAWalletProvider.js","sourceRoot":"","sources":["../../src/wallet/EOAWalletProvider.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAUH,qDAAgE;AAEhE,MAAa,iBAAiB;IAI5B,YAAY,MAAqB,EAAE,OAAe;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAsB;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;YACjD,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,IAAI,EAAE,EAAE,CAAC,IAAI;YACb,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;SACxC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtC,OAAO;YACL,IAAI,EAAE,OAAQ,CAAC,IAAI;YACnB,OAAO,EAAE,OAAQ,CAAC,MAAM,KAAK,CAAC;SAC/B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAyB;QAClD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,WAA2C,CAAC;QAChD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBACzB,OAAO,WAAW,CAAC,CAAC,YAAY;YAClC,CAAC;QACH,CAAC;QACD,OAAO,WAAY,CAAC;IACtB,CAAC;IAED,aAAa;QACX,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,IAAI,EAAE,KAAK;YACX,gBAAgB,EAAE,KAAK;YACvB,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CAAC,SAA0B;QAC5C,IAAI,CAAC;YACH,sEAAsE;YACtE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,GAAG,SAAS,CAAC,KAGnD,CAAC;YACF,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CACpC,SAAS,CAAC,MAAgC,EAC1C,KAAK,EACL,SAAS,CAAC,OAAO,CAClB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAI,qCAAwB,CAChC,6BAA6B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAC1E,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAnFD,8CAmFC"}
|
|
@@ -83,6 +83,8 @@ export interface CreateACTPTransactionResult {
|
|
|
83
83
|
/** Transaction receipt */
|
|
84
84
|
receipt: TransactionReceipt;
|
|
85
85
|
}
|
|
86
|
+
import type { EIP712TypedData } from '../types/eip712';
|
|
87
|
+
export type { EIP712TypedData };
|
|
86
88
|
/**
|
|
87
89
|
* Parameters for batched ACTP payment.
|
|
88
90
|
*/
|
|
@@ -149,5 +151,37 @@ export interface IWalletProvider {
|
|
|
149
151
|
* @returns Pre-computed txId and transaction receipt
|
|
150
152
|
*/
|
|
151
153
|
createACTPTransaction?(params: CreateACTPTransactionParams): Promise<CreateACTPTransactionResult>;
|
|
154
|
+
/**
|
|
155
|
+
* Sign an EIP-712 typed data message.
|
|
156
|
+
*
|
|
157
|
+
* Optional — required for x402 v2 payments (both EIP-3009 and Permit2 flows).
|
|
158
|
+
* EOA wallets delegate directly to `ethers.Wallet.signTypedData`. Smart Wallet
|
|
159
|
+
* providers (Tier 1 / AA) wrap the signature via replay-safe hashing and
|
|
160
|
+
* ERC-1271 / ERC-6492 encoding so the result validates on-chain via
|
|
161
|
+
* `isValidSignature` calls to the Smart Wallet contract.
|
|
162
|
+
*
|
|
163
|
+
* Consumers (like X402Adapter) should check `typeof walletProvider.signTypedData === 'function'`
|
|
164
|
+
* before attempting to use it.
|
|
165
|
+
*
|
|
166
|
+
* @param typedData - EIP-712 message to sign
|
|
167
|
+
* @returns 0x-prefixed hex signature bytes
|
|
168
|
+
*/
|
|
169
|
+
signTypedData?(typedData: EIP712TypedData): Promise<string>;
|
|
170
|
+
/**
|
|
171
|
+
* Get the underlying read-only provider for on-chain contract calls.
|
|
172
|
+
*
|
|
173
|
+
* Optional — used by adapters that need to read chain state before
|
|
174
|
+
* submitting transactions (e.g. X402Adapter checks USDC.allowance() to
|
|
175
|
+
* avoid sending a redundant Permit2 approve after restart).
|
|
176
|
+
*
|
|
177
|
+
* Returned value is typed `unknown` to respect the "no library types at
|
|
178
|
+
* the interface boundary" convention. Callers that know the concrete
|
|
179
|
+
* wallet type (EOA / Auto) can duck-type against the ethers v6 provider
|
|
180
|
+
* shape (`call({to, data}): Promise<string>`).
|
|
181
|
+
*
|
|
182
|
+
* Consumers should check `typeof walletProvider.getReadProvider === 'function'`
|
|
183
|
+
* before calling.
|
|
184
|
+
*/
|
|
185
|
+
getReadProvider?(): unknown;
|
|
152
186
|
}
|
|
153
187
|
//# sourceMappingURL=IWalletProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/IWalletProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,4CAA4C;IAC5C,EAAE,EAAE,MAAM,CAAC;IACX,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,KAAK,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,qDAAqD;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,4EAA4E;IAC5E,gBAAgB,EAAE,OAAO,CAAC;IAC1B,0DAA0D;IAC1D,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE;QACT,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,iDAAiD;IACjD,IAAI,EAAE,MAAM,CAAC;IACb,0BAA0B;IAC1B,OAAO,EAAE,kBAAkB,CAAC;CAC7B;
|
|
1
|
+
{"version":3,"file":"IWalletProvider.d.ts","sourceRoot":"","sources":["../../src/wallet/IWalletProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartWalletRouter.d.ts","sourceRoot":"","sources":["../../src/wallet/SmartWalletRouter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAuBlE;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAHV,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,4BAA4B,EAC/C,OAAO,EAAE,YAAY,EACrB,SAAS,CAAC,uBAAW;IAGxC;;;OAGG;IACH,WAAW,IAAI,OAAO;IAItB;;OAEG;IACH,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAa,GAAG,kBAAkB;IAOnG;;;OAGG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB;IAIhD;;;;;;;;OAQG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAa,EAAE,KAAK,GAAE,MAA0B,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAS5I;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAS3D;;;;;;;;;;OAUG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BpG;;;;;;;;;OASG;IACG,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"SmartWalletRouter.d.ts","sourceRoot":"","sources":["../../src/wallet/SmartWalletRouter.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAuBlE;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAHV,cAAc,EAAE,eAAe,EAC/B,iBAAiB,EAAE,4BAA4B,EAC/C,OAAO,EAAE,YAAY,EACrB,SAAS,CAAC,uBAAW;IAGxC;;;OAGG;IACH,WAAW,IAAI,OAAO;IAItB;;OAEG;IACH,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAa,GAAG,kBAAkB;IAOnG;;;OAGG;IACH,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB;IAIhD;;;;;;;;OAQG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,GAAE,MAAa,EAAE,KAAK,GAAE,MAA0B,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAS5I;;;;;OAKG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAS3D;;;;;;;;;;OAUG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BpG;;;;;;;;;OASG;IACG,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IA6C9F;;;;;;;;OAQG;IACG,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BpF;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAI7C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAO3F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,cAAc,CAAC,EAAE,eAAe,EAChC,iBAAiB,CAAC,EAAE,4BAA4B,EAChD,OAAO,CAAC,EAAE,YAAY,EACtB,SAAS,CAAC,EAAE,SAAS,GACpB,iBAAiB,GAAG,SAAS,CAK/B"}
|
|
@@ -156,7 +156,9 @@ class SmartWalletRouter {
|
|
|
156
156
|
// Mock mode: completedAt = delivery timestamp, disputeWindow = duration in seconds.
|
|
157
157
|
// Blockchain mode: completedAt = 0 (V1), disputeWindow = absolute timestamp from chain.
|
|
158
158
|
// Heuristic: if disputeWindow > 1 billion, it's an absolute timestamp (post-2001).
|
|
159
|
-
|
|
159
|
+
// Skip dispute window check when completedAt is 0 (blockchain V1 limitation — not yet populated).
|
|
160
|
+
// On-chain contract still enforces dispute window via _validateSettlementConditions().
|
|
161
|
+
if (tx.completedAt && tx.completedAt !== 0) {
|
|
160
162
|
const disputeWindowEnds = computeDisputeWindowEnds(tx.completedAt, tx.disputeWindow);
|
|
161
163
|
const now = this.runtime.time.now();
|
|
162
164
|
if (now < disputeWindowEnds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartWalletRouter.js","sourceRoot":"","sources":["../../src/wallet/SmartWalletRouter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SmartWalletRouter.js","sourceRoot":"","sources":["../../src/wallet/SmartWalletRouter.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,mCAAgC;AAIhC,0DAAmE;AAGnE;;;GAGG;AACH,MAAM,iBAAiB,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC;IAC7C,8EAA8E;IAC9E,0EAA0E;CAC3E,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC;IACvC,mDAAmD;CACpD,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,4BAA4B,GAAG,UAAa,CAAC;AAWnD;;;;;;GAMG;AACH,MAAa,iBAAiB;IAC5B,YACmB,cAA+B,EAC/B,iBAA+C,EAC/C,OAAqB,EACrB,SAAqB;QAHrB,mBAAc,GAAd,cAAc,CAAiB;QAC/B,sBAAiB,GAAjB,iBAAiB,CAA8B;QAC/C,YAAO,GAAP,OAAO,CAAc;QACrB,cAAS,GAAT,SAAS,CAAY;IACrC,CAAC;IAEJ;;;OAGG;IACH,WAAW;QACT,OAAO,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,uBAAuB,CAAC,IAAY,EAAE,UAAkB,EAAE,QAAgB,IAAI;QAC5E,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU;YACrC,IAAI,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;SACzF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,iCAAqB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,UAAkB,EAAE,QAAgB,IAAI,EAAE,QAAgB,iBAAiB;QAC5G,MAAM,EAAE,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,mBAAmB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,IAAY;QAC3B,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,cAAc,CAAC,IAAY,EAAE,MAAc,EAAE,WAAmB;QACpE,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,MAAM,WAAW,GAAG,WAAW,CAAC,kBAAkB,CAAC,SAAS,EAAE;YAC5D,IAAI,CAAC,iBAAiB,CAAC,WAAW;YAClC,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,YAAY,EAAE;YACxE,IAAI;YACJ,IAAI,CAAC,iBAAiB,CAAC,WAAW;YAClC,IAAI,EAAE,kCAAkC;SACzC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAyB;YAChC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;YACtC,EAAE,EAAE,EAAE,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE;SAChE,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,4BAA4B,CAAC,MAAgC;QACjE,MAAM,EAAE,GAAG,OAAO,MAAM,KAAK,QAAQ;YACnC,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,MAAM,CAAC;QAEX,MAAM,IAAI,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;QAE7D,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,YAAY,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,EAAE,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACb,sCAAsC,IAAI,gBAAgB,EAAE,CAAC,KAAK,uBAAuB,CAC1F,CAAC;QACJ,CAAC;QAED,wBAAwB;QACxB,2EAA2E;QAC3E,oFAAoF;QACpF,wFAAwF;QACxF,mFAAmF;QACnF,kGAAkG;QAClG,uFAAuF;QACvF,IAAI,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACpC,IAAI,GAAG,GAAG,iBAAiB,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,CAAC;gBAC9D,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC7C,MAAM,WAAW,GAAG,MAAM,KAAK,SAAS,CAAC;gBAEzC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,SAAS,GAAG,iBAAiB,GAAG,GAAG,CAAC;oBAC1C,MAAM,IAAI,KAAK,CACb,sEAAsE,IAAI,IAAI;wBAC5E,qBAAqB,SAAS,WAAW,CAC5C,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,wBAAwB,CAAC,IAAY,EAAE,cAAuB;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAc,CAAC;QACvC,MAAM,8BAA8B,GAClC,OAAO,UAAU,EAAE,qBAAqB,KAAK,UAAU,CAAC;QAE1D,MAAM,mBAAmB,GAAY,8BAA8B;YACjE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;YAC7C,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,mBAAmB,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,2DAA2D;gBACzD,yDAAyD,CAC5D,CAAC;QACJ,CAAC;QAED,IAAI,mBAAmB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,yEAAyE,CAC1E,CAAC;QACJ,CAAC;QAED,IAAI,cAAc,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,WAAW,CAAC,QAAgB;QACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACxD,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACjD,CAAC;CACF;AA7MD,8CA6MC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,wBAAwB,CAAC,WAAmB,EAAE,aAAqB;IACjF,IAAI,aAAa,GAAG,4BAA4B,EAAE,CAAC;QACjD,+DAA+D;QAC/D,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,iEAAiE;IACjE,OAAO,WAAW,GAAG,aAAa,CAAC;AACrC,CAAC;AAPD,4DAOC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CACrC,cAAgC,EAChC,iBAAgD,EAChD,OAAsB,EACtB,SAAqB;IAErB,IAAI,cAAc,EAAE,cAAc,IAAI,iBAAiB,IAAI,OAAO,EAAE,CAAC;QACnE,OAAO,IAAI,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACtF,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAVD,0DAUC"}
|
|
@@ -171,13 +171,17 @@ function sleep(ms) {
|
|
|
171
171
|
*/
|
|
172
172
|
function isNonTransient(error) {
|
|
173
173
|
const code = error.code;
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
174
|
+
if (typeof code === 'number') {
|
|
175
|
+
// JSON-RPC protocol errors: -32700 to -32600
|
|
176
|
+
if (code >= -32700 && code <= -32600)
|
|
177
|
+
return true;
|
|
178
|
+
// ERC-4337 AA validation errors: -32521 to -32500
|
|
179
|
+
if (code >= -32521 && code <= -32500)
|
|
180
|
+
return true;
|
|
177
181
|
}
|
|
178
182
|
const msg = error.message.toLowerCase();
|
|
179
183
|
if (msg.includes('aa') && (msg.includes('invalid') || msg.includes('rejected'))) {
|
|
180
|
-
return true; // AA validation errors
|
|
184
|
+
return true; // AA validation errors by message pattern
|
|
181
185
|
}
|
|
182
186
|
return false;
|
|
183
187
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundlerClient.js","sourceRoot":"","sources":["../../../src/wallet/aa/BundlerClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BundlerClient.js","sourceRoot":"","sources":["../../../src/wallet/aa/BundlerClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,8 +44,11 @@ export declare class DualNonceManager {
|
|
|
44
44
|
/**
|
|
45
45
|
* Read current EntryPoint nonce for the sender.
|
|
46
46
|
* Key 0 is the default key for CoinbaseSmartWallet.
|
|
47
|
+
*
|
|
48
|
+
* Public so that retry loops (e.g. payACTPBatched nonce collision)
|
|
49
|
+
* can re-read after a consumed UserOp.
|
|
47
50
|
*/
|
|
48
|
-
|
|
51
|
+
readEntryPointNonce(): Promise<bigint>;
|
|
49
52
|
/**
|
|
50
53
|
* Read current ACTP nonce for the requester.
|
|
51
54
|
* requesterNonces is public on ACTPKernel (added in v2).
|