@agirails/sdk 2.3.1 → 2.3.3
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/dist/cli/commands/init.d.ts +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +156 -28
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/utils/config.d.ts +14 -0
- package/dist/cli/utils/config.d.ts.map +1 -1
- package/dist/cli/utils/config.js.map +1 -1
- package/dist/wallet/aa/BundlerClient.d.ts.map +1 -1
- package/dist/wallet/aa/BundlerClient.js +2 -1
- package/dist/wallet/aa/BundlerClient.js.map +1 -1
- package/dist/wallet/aa/DualNonceManager.d.ts +2 -1
- package/dist/wallet/aa/DualNonceManager.d.ts.map +1 -1
- package/dist/wallet/aa/DualNonceManager.js +16 -5
- package/dist/wallet/aa/DualNonceManager.js.map +1 -1
- package/dist/wallet/aa/PaymasterClient.d.ts.map +1 -1
- package/dist/wallet/aa/PaymasterClient.js +2 -1
- package/dist/wallet/aa/PaymasterClient.js.map +1 -1
- package/package.json +1 -1
- package/src/cli/commands/init.ts +170 -29
- package/src/cli/utils/config.ts +21 -0
- package/src/wallet/aa/BundlerClient.ts +2 -1
- package/src/wallet/aa/DualNonceManager.ts +19 -9
- package/src/wallet/aa/PaymasterClient.ts +2 -1
|
@@ -19,6 +19,6 @@ interface InitOptions {
|
|
|
19
19
|
service?: string;
|
|
20
20
|
price?: string;
|
|
21
21
|
}
|
|
22
|
-
declare function runInit(options: InitOptions, output: Output): Promise<void>;
|
|
22
|
+
declare function runInit(options: InitOptions, output: Output, cmd?: Command): Promise<void>;
|
|
23
23
|
export { runInit };
|
|
24
24
|
//# sourceMappingURL=init.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAOnD,wBAAgB,iBAAiB,IAAI,OAAO,CA8B3C;AAQD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,iBAAe,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC,OAAO,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AAOnD,wBAAgB,iBAAiB,IAAI,OAAO,CA8B3C;AAQD,UAAU,WAAW;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,iBAAe,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAoNzF;AAyfD,OAAO,EAAE,OAAO,EAAE,CAAC"}
|
|
@@ -56,10 +56,10 @@ function createInitCommand() {
|
|
|
56
56
|
.option('--price <usdc>', 'Base price in USDC (default: 1)')
|
|
57
57
|
.option('--json', 'Output as JSON')
|
|
58
58
|
.option('-q, --quiet', 'Minimal output')
|
|
59
|
-
.action(async (options) => {
|
|
59
|
+
.action(async (options, command) => {
|
|
60
60
|
const output = new output_1.Output(options.json ? 'json' : options.quiet ? 'quiet' : 'human');
|
|
61
61
|
try {
|
|
62
|
-
await runInit(options, output);
|
|
62
|
+
await runInit(options, output, command);
|
|
63
63
|
}
|
|
64
64
|
catch (error) {
|
|
65
65
|
output.errorResult({
|
|
@@ -72,13 +72,71 @@ function createInitCommand() {
|
|
|
72
72
|
return cmd;
|
|
73
73
|
}
|
|
74
74
|
exports.createInitCommand = createInitCommand;
|
|
75
|
-
async function runInit(options, output) {
|
|
75
|
+
async function runInit(options, output, cmd) {
|
|
76
76
|
const projectRoot = process.cwd();
|
|
77
77
|
// Check if already initialized
|
|
78
78
|
if ((0, config_1.isInitialized)(projectRoot) && !options.force) {
|
|
79
79
|
throw new Error('ACTP already initialized in this directory.\n' +
|
|
80
80
|
'Use --force to reinitialize.');
|
|
81
81
|
}
|
|
82
|
+
// ── AGIRAILS.md pre-fill ──────────────────────────────────────────────
|
|
83
|
+
const agirailsMdPath = path.join(projectRoot, 'AGIRAILS.md');
|
|
84
|
+
let mdConfig = null;
|
|
85
|
+
if (fs.existsSync(agirailsMdPath)) {
|
|
86
|
+
try {
|
|
87
|
+
const { parseAgirailsMd } = await Promise.resolve().then(() => __importStar(require('../../config/agirailsmd')));
|
|
88
|
+
const parsed = parseAgirailsMd(fs.readFileSync(agirailsMdPath, 'utf-8'));
|
|
89
|
+
mdConfig = parsed.frontmatter;
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
output.warning('Found AGIRAILS.md but could not parse it — ignoring');
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
// Helper: true when the user explicitly passed a flag on the CLI
|
|
96
|
+
const isExplicit = (flag) => cmd?.getOptionValueSource(flag) === 'cli';
|
|
97
|
+
// Apply AGIRAILS.md values where the user didn't set an explicit flag
|
|
98
|
+
if (mdConfig) {
|
|
99
|
+
// network → mode mapping
|
|
100
|
+
if (!isExplicit('mode') && mdConfig.network) {
|
|
101
|
+
const net = String(mdConfig.network);
|
|
102
|
+
if (net === 'base-sepolia' || net === 'testnet')
|
|
103
|
+
options.mode = 'testnet';
|
|
104
|
+
else if (net === 'base-mainnet' || net === 'mainnet')
|
|
105
|
+
options.mode = 'mainnet';
|
|
106
|
+
else if (net === 'mock')
|
|
107
|
+
options.mode = 'mock';
|
|
108
|
+
}
|
|
109
|
+
// intent
|
|
110
|
+
if (!isExplicit('intent') && mdConfig.intent) {
|
|
111
|
+
options.intent = String(mdConfig.intent);
|
|
112
|
+
}
|
|
113
|
+
// capabilities → service (first capability)
|
|
114
|
+
if (!isExplicit('service') && Array.isArray(mdConfig.capabilities) && mdConfig.capabilities.length > 0) {
|
|
115
|
+
options.service = String(mdConfig.capabilities[0]);
|
|
116
|
+
}
|
|
117
|
+
// price
|
|
118
|
+
if (!isExplicit('price') && mdConfig.price != null) {
|
|
119
|
+
options.price = String(mdConfig.price);
|
|
120
|
+
}
|
|
121
|
+
// Log what we pre-filled
|
|
122
|
+
const lines = [];
|
|
123
|
+
if (mdConfig.network)
|
|
124
|
+
lines.push(` Mode: ${options.mode}`);
|
|
125
|
+
if (mdConfig.name)
|
|
126
|
+
lines.push(` Agent: ${String(mdConfig.name)}`);
|
|
127
|
+
if (mdConfig.intent)
|
|
128
|
+
lines.push(` Intent: ${options.intent || mdConfig.intent}`);
|
|
129
|
+
if (Array.isArray(mdConfig.capabilities))
|
|
130
|
+
lines.push(` Capabilities: ${mdConfig.capabilities.join(', ')}`);
|
|
131
|
+
if (mdConfig.price != null)
|
|
132
|
+
lines.push(` Price: $${mdConfig.price} USDC`);
|
|
133
|
+
output.info('Found AGIRAILS.md \u2014 using config from file');
|
|
134
|
+
for (const line of lines) {
|
|
135
|
+
output.print(line);
|
|
136
|
+
}
|
|
137
|
+
output.blank();
|
|
138
|
+
}
|
|
139
|
+
// ── End AGIRAILS.md pre-fill ──────────────────────────────────────────
|
|
82
140
|
// Validate mode
|
|
83
141
|
const validModes = ['mock', 'testnet', 'mainnet'];
|
|
84
142
|
if (!validModes.includes(options.mode)) {
|
|
@@ -135,6 +193,14 @@ async function runInit(options, output) {
|
|
|
135
193
|
...(walletType !== 'mock' && { wallet: walletType }),
|
|
136
194
|
...(smartWalletAddress && { smartWallet: smartWalletAddress.toLowerCase() }),
|
|
137
195
|
...(didRegister && { registered: true }),
|
|
196
|
+
// AGIRAILS.md-derived values (stored for downstream use)
|
|
197
|
+
...(mdConfig && mdConfig.name ? { agentName: String(mdConfig.name) } : {}),
|
|
198
|
+
...(mdConfig && mdConfig.intent ? { intent: String(mdConfig.intent) } : {}),
|
|
199
|
+
...(mdConfig && Array.isArray(mdConfig.capabilities) ? { capabilities: mdConfig.capabilities.map(String) } : {}),
|
|
200
|
+
...(mdConfig && mdConfig.price != null ? { price: Number(mdConfig.price) } : {}),
|
|
201
|
+
...(mdConfig && mdConfig.concurrency != null ? { concurrency: Number(mdConfig.concurrency) } : {}),
|
|
202
|
+
...(mdConfig && mdConfig.payment_mode ? { paymentMode: String(mdConfig.payment_mode) } : {}),
|
|
203
|
+
...(mdConfig && mdConfig.budget != null ? { budget: Number(mdConfig.budget) } : {}),
|
|
138
204
|
};
|
|
139
205
|
// Save configuration
|
|
140
206
|
(0, config_1.saveConfig)(config, projectRoot);
|
|
@@ -171,7 +237,7 @@ async function runInit(options, output) {
|
|
|
171
237
|
}, { quietKey: 'address' });
|
|
172
238
|
// Generate scaffold if requested
|
|
173
239
|
if (options.scaffold) {
|
|
174
|
-
await runScaffold(options, mode, output);
|
|
240
|
+
await runScaffold(options, mode, output, mdConfig);
|
|
175
241
|
}
|
|
176
242
|
else {
|
|
177
243
|
output.blank();
|
|
@@ -293,7 +359,8 @@ async function runInlineRegistration(projectRoot, mode, output) {
|
|
|
293
359
|
const { ethers } = await Promise.resolve().then(() => __importStar(require('ethers')));
|
|
294
360
|
const { getNetwork } = await Promise.resolve().then(() => __importStar(require('../../config/networks')));
|
|
295
361
|
const { AutoWalletProvider } = await Promise.resolve().then(() => __importStar(require('../../wallet/AutoWalletProvider')));
|
|
296
|
-
const { buildRegisterAgentBatch, buildTestnetInitBatch } = await Promise.resolve().then(() => __importStar(require('../../wallet/aa/TransactionBatcher')));
|
|
362
|
+
const { buildRegisterAgentBatch, buildTestnetInitBatch, buildTestnetMintBatch } = await Promise.resolve().then(() => __importStar(require('../../wallet/aa/TransactionBatcher')));
|
|
363
|
+
const { sdkLogger } = await Promise.resolve().then(() => __importStar(require('../../utils/Logger')));
|
|
297
364
|
// Parse AGIRAILS.md if present
|
|
298
365
|
const agirailsMdPath = path.join(projectRoot, 'AGIRAILS.md');
|
|
299
366
|
let endpoint = '';
|
|
@@ -308,6 +375,7 @@ async function runInlineRegistration(projectRoot, mode, output) {
|
|
|
308
375
|
}
|
|
309
376
|
else {
|
|
310
377
|
const serviceType = 'general';
|
|
378
|
+
endpoint = 'https://agirails.io/agent/pending';
|
|
311
379
|
serviceDescriptors = [{
|
|
312
380
|
serviceTypeHash: ethers.keccak256(ethers.toUtf8Bytes(serviceType)),
|
|
313
381
|
serviceType,
|
|
@@ -350,11 +418,12 @@ async function runInlineRegistration(projectRoot, mode, output) {
|
|
|
350
418
|
},
|
|
351
419
|
});
|
|
352
420
|
const smartWalletAddress = autoWallet.getAddress();
|
|
353
|
-
// Build batch
|
|
354
|
-
let calls;
|
|
421
|
+
// Build and submit registration batch
|
|
355
422
|
if (mode === 'testnet') {
|
|
356
|
-
|
|
357
|
-
|
|
423
|
+
// Testnet: try combined batch first, fall back to separate UserOps
|
|
424
|
+
// Some paymaster configurations reject multi-target batches in simulation
|
|
425
|
+
output.info('Testnet: registering + minting 1000 test USDC...');
|
|
426
|
+
const combinedCalls = buildTestnetInitBatch({
|
|
358
427
|
agentRegistryAddress: networkConfig.contracts.agentRegistry,
|
|
359
428
|
endpoint,
|
|
360
429
|
serviceDescriptors,
|
|
@@ -362,26 +431,85 @@ async function runInlineRegistration(projectRoot, mode, output) {
|
|
|
362
431
|
recipient: smartWalletAddress,
|
|
363
432
|
mintAmount: '1000000000',
|
|
364
433
|
});
|
|
434
|
+
let receipt;
|
|
435
|
+
try {
|
|
436
|
+
const txRequests = combinedCalls.map((c) => ({
|
|
437
|
+
to: c.target,
|
|
438
|
+
data: c.data,
|
|
439
|
+
value: c.value.toString(),
|
|
440
|
+
}));
|
|
441
|
+
receipt = await autoWallet.sendBatchTransaction(txRequests);
|
|
442
|
+
}
|
|
443
|
+
catch (combinedError) {
|
|
444
|
+
// Combined batch failed — split into two separate UserOps
|
|
445
|
+
output.info('Combined batch failed, trying separate transactions...');
|
|
446
|
+
sdkLogger.warn('Combined testnet batch failed, splitting', {
|
|
447
|
+
error: combinedError instanceof Error ? combinedError.message : String(combinedError),
|
|
448
|
+
});
|
|
449
|
+
// Step 1: Register agent only
|
|
450
|
+
const registerCalls = buildRegisterAgentBatch(networkConfig.contracts.agentRegistry, endpoint, serviceDescriptors);
|
|
451
|
+
const registerTxs = registerCalls.map((c) => ({
|
|
452
|
+
to: c.target,
|
|
453
|
+
data: c.data,
|
|
454
|
+
value: c.value.toString(),
|
|
455
|
+
}));
|
|
456
|
+
const registerReceipt = await autoWallet.sendBatchTransaction(registerTxs);
|
|
457
|
+
if (!registerReceipt.success) {
|
|
458
|
+
output.warning(`Registration failed (tx: ${registerReceipt.hash}). Run "actp register" later.`);
|
|
459
|
+
return false;
|
|
460
|
+
}
|
|
461
|
+
output.success('Agent registered on AgentRegistry');
|
|
462
|
+
output.print(` Tx: ${registerReceipt.hash}`);
|
|
463
|
+
// Step 2: Mint test USDC
|
|
464
|
+
try {
|
|
465
|
+
const mintCalls = buildTestnetMintBatch(networkConfig.contracts.usdc, smartWalletAddress, '1000000000');
|
|
466
|
+
const mintTxs = mintCalls.map((c) => ({
|
|
467
|
+
to: c.target,
|
|
468
|
+
data: c.data,
|
|
469
|
+
value: c.value.toString(),
|
|
470
|
+
}));
|
|
471
|
+
const mintReceipt = await autoWallet.sendBatchTransaction(mintTxs);
|
|
472
|
+
if (mintReceipt.success) {
|
|
473
|
+
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
474
|
+
output.print(` Tx: ${mintReceipt.hash}`);
|
|
475
|
+
}
|
|
476
|
+
else {
|
|
477
|
+
output.warning('USDC mint failed. Mint manually: actp faucet');
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
catch (mintError) {
|
|
481
|
+
output.warning('USDC mint failed. Mint manually: actp faucet');
|
|
482
|
+
sdkLogger.warn('Testnet mint failed', {
|
|
483
|
+
error: mintError instanceof Error ? mintError.message : String(mintError),
|
|
484
|
+
});
|
|
485
|
+
}
|
|
486
|
+
return true;
|
|
487
|
+
}
|
|
488
|
+
if (!receipt.success) {
|
|
489
|
+
output.warning(`Registration failed (tx: ${receipt.hash}). Run "actp register" later.`);
|
|
490
|
+
return false;
|
|
491
|
+
}
|
|
492
|
+
output.success('Agent registered on AgentRegistry');
|
|
493
|
+
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
494
|
+
output.print(` Tx: ${receipt.hash}`);
|
|
365
495
|
}
|
|
366
496
|
else {
|
|
497
|
+
// Mainnet: register only (no minting)
|
|
367
498
|
output.info('Registering on AgentRegistry (gasless)...');
|
|
368
|
-
calls = buildRegisterAgentBatch(networkConfig.contracts.agentRegistry, endpoint, serviceDescriptors);
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
if (mode === 'testnet') {
|
|
382
|
-
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
499
|
+
const calls = buildRegisterAgentBatch(networkConfig.contracts.agentRegistry, endpoint, serviceDescriptors);
|
|
500
|
+
const txRequests = calls.map((c) => ({
|
|
501
|
+
to: c.target,
|
|
502
|
+
data: c.data,
|
|
503
|
+
value: c.value.toString(),
|
|
504
|
+
}));
|
|
505
|
+
const receipt = await autoWallet.sendBatchTransaction(txRequests);
|
|
506
|
+
if (!receipt.success) {
|
|
507
|
+
output.warning(`Registration failed (tx: ${receipt.hash}). Run "actp register" later.`);
|
|
508
|
+
return false;
|
|
509
|
+
}
|
|
510
|
+
output.success('Agent registered on AgentRegistry');
|
|
511
|
+
output.print(` Tx: ${receipt.hash}`);
|
|
383
512
|
}
|
|
384
|
-
output.print(` Tx: ${receipt.hash}`);
|
|
385
513
|
return true;
|
|
386
514
|
}
|
|
387
515
|
catch (error) {
|
|
@@ -409,7 +537,7 @@ async function promptPassword() {
|
|
|
409
537
|
// ============================================================================
|
|
410
538
|
// Scaffold
|
|
411
539
|
// ============================================================================
|
|
412
|
-
async function runScaffold(options, mode, output) {
|
|
540
|
+
async function runScaffold(options, mode, output, mdConfig) {
|
|
413
541
|
const validIntents = ['earn', 'pay', 'both'];
|
|
414
542
|
const intent = options.intent || 'earn';
|
|
415
543
|
if (!validIntents.includes(intent)) {
|
|
@@ -423,8 +551,8 @@ async function runScaffold(options, mode, output) {
|
|
|
423
551
|
output.warning('agent.ts already exists. Use --force to overwrite.');
|
|
424
552
|
return;
|
|
425
553
|
}
|
|
426
|
-
// Derive agent name
|
|
427
|
-
const agentName = path.basename(process.cwd());
|
|
554
|
+
// Derive agent name: prefer AGIRAILS.md name, fallback to directory name
|
|
555
|
+
const agentName = (mdConfig?.name ? String(mdConfig.name) : null) || path.basename(process.cwd());
|
|
428
556
|
// Get template and substitute variables
|
|
429
557
|
const template = getTemplate(intent);
|
|
430
558
|
const content = template
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/cli/commands/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,20 @@ export interface CLIConfig {
|
|
|
30
30
|
registered?: boolean;
|
|
31
31
|
/** Configuration version for migrations */
|
|
32
32
|
version: string;
|
|
33
|
+
/** Agent name from AGIRAILS.md */
|
|
34
|
+
agentName?: string;
|
|
35
|
+
/** Agent intent: earn, pay, or both */
|
|
36
|
+
intent?: 'earn' | 'pay' | 'both';
|
|
37
|
+
/** Service capabilities from AGIRAILS.md */
|
|
38
|
+
capabilities?: string[];
|
|
39
|
+
/** Base price in USDC */
|
|
40
|
+
price?: number;
|
|
41
|
+
/** Max concurrent jobs */
|
|
42
|
+
concurrency?: number;
|
|
43
|
+
/** Payment mode: actp, x402, or both */
|
|
44
|
+
paymentMode?: 'actp' | 'x402' | 'both';
|
|
45
|
+
/** Budget cap in USDC */
|
|
46
|
+
budget?: number;
|
|
33
47
|
}
|
|
34
48
|
/**
|
|
35
49
|
* Default configuration values
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,qBAAqB;IACrB,IAAI,EAAE,OAAO,CAAC;IAEd,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAEhB,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,iCAAiC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAExB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,SAI7B,CAAC;AAMF;;GAEG;AACH,wBAAgB,UAAU,CAAC,WAAW,GAAE,MAAsB,GAAG,MAAM,CAEtE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,WAAW,GAAE,MAAsB,GAAG,MAAM,CAEzE;AAMD;;GAEG;AACH,wBAAgB,aAAa,CAAC,WAAW,GAAE,MAAsB,GAAG,OAAO,CAE1E;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,WAAW,GAAE,MAAsB,GAAG,SAAS,CAuCzE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,SAAS,EACjB,WAAW,GAAE,MAAsB,GAClC,IAAI,CA0BN;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,EAC3B,WAAW,GAAE,MAAsB,GAClC,SAAS,CAKX;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EACtD,GAAG,EAAE,CAAC,EACN,WAAW,GAAE,MAAsB,GAClC,SAAS,CAAC,CAAC,CAAC,CAGd;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EACtD,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,WAAW,GAAE,MAAsB,GAClC,IAAI,CAEN;AAMD;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAyB7D;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,GAAE,MAAsB,GAAG,IAAI,CAqBxE"}
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,qBAAqB;IACrB,IAAI,EAAE,OAAO,CAAC;IAEd,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAEhB,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,iCAAiC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,kFAAkF;IAClF,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAExB,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAEhB,kCAAkC;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;IAEjC,4CAA4C;IAC5C,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAExB,yBAAyB;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,wCAAwC;IACxC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAEvC,yBAAyB;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,SAI7B,CAAC;AAMF;;GAEG;AACH,wBAAgB,UAAU,CAAC,WAAW,GAAE,MAAsB,GAAG,MAAM,CAEtE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,WAAW,GAAE,MAAsB,GAAG,MAAM,CAEzE;AAMD;;GAEG;AACH,wBAAgB,aAAa,CAAC,WAAW,GAAE,MAAsB,GAAG,OAAO,CAE1E;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,WAAW,GAAE,MAAsB,GAAG,SAAS,CAuCzE;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,MAAM,EAAE,SAAS,EACjB,WAAW,GAAE,MAAsB,GAClC,IAAI,CA0BN;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,EAC3B,WAAW,GAAE,MAAsB,GAClC,SAAS,CAKX;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EACtD,GAAG,EAAE,CAAC,EACN,WAAW,GAAE,MAAsB,GAClC,SAAS,CAAC,CAAC,CAAC,CAGd;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,SAAS,EACtD,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,EACnB,WAAW,GAAE,MAAsB,GAClC,IAAI,CAEN;AAMD;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAExD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAyB7D;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,WAAW,GAAE,MAAsB,GAAG,IAAI,CAqBxE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/cli/utils/config.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AA6D7B;;GAEG;AACU,QAAA,eAAe,GAAc;IACxC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,+EAA+E;AAC/E,QAAQ;AACR,+EAA+E;AAE/E;;GAEG;AACH,SAAgB,UAAU,CAAC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAC5D,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAFD,gCAEC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAFD,sCAEC;AAED,+EAA+E;AAC/E,oBAAoB;AACpB,+EAA+E;AAE/E;;GAEG;AACH,SAAgB,aAAa,CAAC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAC/D,OAAO,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;AACnD,CAAC;AAFD,sCAEC;AAED;;;;;;GAMG;AACH,SAAgB,UAAU,CAAC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAC5D,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAE9C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,2CAA2C;YACzC,gCAAgC,CACnC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAc,CAAC;QAE5C,2BAA2B;QAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC5D,CAAC;QAED,oEAAoE;QACpE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,6CAA6C,CAAC,CAAC;YACjF,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,wEAAwE,CAAC,CAAC;YAC5G,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,kDAAkD,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,0BAA0B,UAAU,IAAI;gBACtC,+CAA+C,CAClD,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAvCD,gCAuCC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CACxB,MAAiB,EACjB,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,GAAG,UAAU,MAAM,CAAC;IAErC,gCAAgC;IAChC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,CAAC;QACH,2CAA2C;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC7C,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB;QAC3F,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,8BAA8B;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,wBAAwB;YAC1B,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AA7BD,gCA6BC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAC1B,OAA2B,EAC3B,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IAC1C,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACjC,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,oCAQC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,GAAM,EACN,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAND,wCAMC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,GAAM,EACN,KAAmB,EACnB,cAAsB,OAAO,CAAC,GAAG,EAAE;IAEnC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAwB,EAAE,WAAW,CAAC,CAAC;AACpE,CAAC;AAND,wCAMC;AAED,+EAA+E;AAC/E,aAAa;AACb,+EAA+E;AAE/E;;GAEG;AACH,SAAgB,eAAe,CAAC,OAAe;IAC7C,OAAO,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAFD,0CAEC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,8BAA8B;IAC9B,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7D,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC9C,CAAC;AAJD,gDAIC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,MAAiB;IACrD,oCAAoC;IACpC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,qBAAqB,MAAM,CAAC,OAAO,KAAK;YACtC,+CAA+C,CAClD,CAAC;IACJ,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,4BAA4B,MAAM,CAAC,IAAI,UAAU;gBAC/C,oDAAoD,CACvD,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CACb,+BAA+B;gBAC7B,+DAA+D,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAzBD,sDAyBC;AAED,+EAA+E;AAC/E,uBAAuB;AACvB,+EAA+E;AAE/E;;GAEG;AACH,SAAgB,cAAc,CAAC,cAAsB,OAAO,CAAC,GAAG,EAAE;IAChE,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAE3D,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,yCAAyC;IACzC,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,yBAAyB;IACzB,MAAM,UAAU,GACd,OAAO;QACP,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,uDAAuD;QACvD,UAAU,CAAC;IAEb,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC;AArBD,wCAqBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BundlerClient.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/BundlerClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAS/C,MAAM,WAAW,aAAa;IAC5B,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,OAAO,EAAE,OAAO,CAAC;CAClB;AAaD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,SAAS,CAAK;gBAEV,MAAM,EAAE,aAAa;IAQjC;;OAEG;IACG,wBAAwB,CAC5B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,MAAM,CAAA;KAAE,CAAC;IAiB9F;;;OAGG;IACG,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAOlE;;;OAGG;IACG,uBAAuB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAqBhC;;OAEG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,MAAe,EAC1B,cAAc,GAAE,MAAc,GAC7B,OAAO,CAAC,aAAa,CAAC;IAiBzB;;OAEG;YACW,gBAAgB;YAqBhB,aAAa;YA2Bb,OAAO;
|
|
1
|
+
{"version":3,"file":"BundlerClient.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/BundlerClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAS/C,MAAM,WAAW,aAAa;IAC5B,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,kBAAkB;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,6CAA6C;IAC7C,OAAO,EAAE,OAAO,CAAC;CAClB;AAaD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,SAAS,CAAK;gBAEV,MAAM,EAAE,aAAa;IAQjC;;OAEG;IACG,wBAAwB,CAC5B,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,kBAAkB,EAAE,MAAM,CAAA;KAAE,CAAC;IAiB9F;;;OAGG;IACG,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAOlE;;;OAGG;IACG,uBAAuB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAqBhC;;OAEG;IACG,cAAc,CAClB,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,MAAe,EAC1B,cAAc,GAAE,MAAc,GAC7B,OAAO,CAAC,aAAa,CAAC;IAiBzB;;OAEG;YACW,gBAAgB;YAqBhB,aAAa;YA2Bb,OAAO;CA4CtB"}
|
|
@@ -146,7 +146,8 @@ class BundlerClient {
|
|
|
146
146
|
}
|
|
147
147
|
const json = (await response.json());
|
|
148
148
|
if (json.error) {
|
|
149
|
-
const
|
|
149
|
+
const dataStr = json.error.data ? ` | data: ${JSON.stringify(json.error.data)}` : '';
|
|
150
|
+
const err = new Error(`Bundler RPC error ${json.error.code}: ${json.error.message}${dataStr}`);
|
|
150
151
|
err.code = json.error.code;
|
|
151
152
|
err.data = json.error.data;
|
|
152
153
|
throw err;
|
|
@@ -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":";AAAA;;;;;;;;GAQG;;;AAGH,mDAAkD;AAClD,2CAA6C;AAC7C,+CAA+C;AAqC/C,+EAA+E;AAC/E,gBAAgB;AAChB,+EAA+E;AAE/E,MAAa,aAAa;IAQxB,YAAY,MAAqB;QAFzB,cAAS,GAAG,CAAC,CAAC;QAGpB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC;QAC9C,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAM,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,wBAAwB,CAC5B,MAAwB;QAExB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAIvC,8BAA8B,EAAE;YACjC,IAAA,+BAAe,EAAC,MAAM,CAAC;YACvB,0BAAc;SACf,CAAC,CAAC;QAEH,OAAO;YACL,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;YACzC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;YACzD,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC;SACtD,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAwB;QAC9C,OAAO,IAAI,CAAC,gBAAgB,CAAS,uBAAuB,EAAE;YAC5D,IAAA,+BAAe,EAAC,MAAM,CAAC;YACvB,0BAAc;SACf,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,uBAAuB,CAC3B,UAAkB;QAElB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAQhC,6BAA6B,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;QAEvD,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,eAAe,EAAE,MAAM,CAAC,OAAO,CAAC,eAAe;YAC/C,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YACrD,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,UAAkB,EAClB,YAAoB,KAAM,EAC1B,iBAAyB,IAAK;QAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC;YAC/D,IAAI,OAAO;gBAAE,OAAO,OAAO,CAAC;YAC5B,MAAM,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9B,CAAC;QACD,MAAM,IAAI,KAAK,CACb,UAAU,UAAU,oBAAoB,SAAS,MAAM;YACrD,6EAA6E,CAChF,CAAC;IACJ,CAAC;IAED,6EAA6E;IAC7E,WAAW;IACX,6EAA6E;IAE7E;;OAEG;IACK,KAAK,CAAC,gBAAgB,CAC5B,MAAc,EACd,MAAiB;QAEjB,cAAc;QACd,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,aAAa,CAAI,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,MAAM,YAAY,CAAC;YACrB,CAAC;YACD,kBAAS,CAAC,IAAI,CAAC,uCAAuC,EAAE;gBACtD,MAAM;gBACN,KAAK,EAAE,YAAY,YAAY,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;aACnF,CAAC,CAAC;QACL,CAAC;QAED,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAI,IAAI,CAAC,SAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,GAAW,EACX,MAAc,EACd,MAAiB;QAEjB,IAAI,SAA4B,CAAC;QACjC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,OAAO,CAAI,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,SAAS,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtE,mCAAmC;gBACnC,IAAI,cAAc,CAAC,SAAS,CAAC;oBAAE,MAAM,SAAS,CAAC;gBAC/C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;oBACtD,kBAAS,CAAC,IAAI,CAAC,kCAAkC,EAAE;wBACjD,OAAO,EAAE,OAAO,GAAG,CAAC;wBACpB,MAAM;wBACN,OAAO,EAAE,KAAK;qBACf,CAAC,CAAC;oBACH,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,CAAC;YACH,CAAC;QACH,CAAC;QACD,MAAM,SAAU,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,OAAO,CACnB,GAAW,EACX,MAAc,EACd,MAAiB;QAEjB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1B,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE;YACpB,MAAM;YACN,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI;gBACJ,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YACrE,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAuB,CAAC;YAE3D,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrF,MAAM,GAAG,GAAG,IAAI,KAAK,CACnB,qBAAqB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,EAAE,CACxE,CAAC;gBACD,GAAW,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACnC,GAAW,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;gBACpC,MAAM,GAAG,CAAC;YACZ,CAAC;YAED,OAAO,IAAI,CAAC,MAAW,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;CACF;AAnMD,sCAmMC;AAED,+EAA+E;AAC/E,UAAU;AACV,+EAA+E;AAE/E,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CAAC,KAAY;IAClC,MAAM,IAAI,GAAI,KAAa,CAAC,IAAI,CAAC;IACjC,uEAAuE;IACvE,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,CAAC,wCAAwC;IACvD,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,IAAI,CAAC,CAAC,uBAAuB;IACtC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -44,7 +44,8 @@ export declare class DualNonceManager {
|
|
|
44
44
|
private readEntryPointNonce;
|
|
45
45
|
/**
|
|
46
46
|
* Read current ACTP nonce for the requester.
|
|
47
|
-
* requesterNonces is public on ACTPKernel.
|
|
47
|
+
* requesterNonces is public on ACTPKernel (added in v2).
|
|
48
|
+
* Older deployments may not expose this — fall back to 0n.
|
|
48
49
|
*/
|
|
49
50
|
private readActpNonce;
|
|
50
51
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DualNonceManager.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/DualNonceManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgDhC,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,uEAAuE;IACvE,OAAO,CAAC,eAAe,CAAqB;gBAG1C,QAAQ,EAAE,MAAM,CAAC,eAAe,EAChC,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM;IAO3B;;;;;;;;OAQG;IACG,OAAO,CAAC,CAAC,EACb,EAAE,EAAE,CAAC,MAAM,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;QACtE,MAAM,EAAE,CAAC,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC,EACF,mBAAmB,GAAE,OAAc,GAClC,OAAO,CAAC,CAAC,CAAC;IA+Bb;;;OAGG;YACW,mBAAmB;IASjC
|
|
1
|
+
{"version":3,"file":"DualNonceManager.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/DualNonceManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAgDhC,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;IAErC,uEAAuE;IACvE,OAAO,CAAC,eAAe,CAAqB;gBAG1C,QAAQ,EAAE,MAAM,CAAC,eAAe,EAChC,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM;IAO3B;;;;;;;;OAQG;IACG,OAAO,CAAC,CAAC,EACb,EAAE,EAAE,CAAC,MAAM,EAAE;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;QACtE,MAAM,EAAE,CAAC,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC,EACF,mBAAmB,GAAE,OAAc,GAClC,OAAO,CAAC,CAAC,CAAC;IA+Bb;;;OAGG;YACW,mBAAmB;IASjC;;;;OAIG;YACW,aAAa;IAoB3B;;OAEG;IACH,eAAe,IAAI,IAAI;CAGxB"}
|
|
@@ -112,13 +112,24 @@ class DualNonceManager {
|
|
|
112
112
|
}
|
|
113
113
|
/**
|
|
114
114
|
* Read current ACTP nonce for the requester.
|
|
115
|
-
* requesterNonces is public on ACTPKernel.
|
|
115
|
+
* requesterNonces is public on ACTPKernel (added in v2).
|
|
116
|
+
* Older deployments may not expose this — fall back to 0n.
|
|
116
117
|
*/
|
|
117
118
|
async readActpNonce() {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
119
|
+
try {
|
|
120
|
+
const kernel = new ethers_1.ethers.Contract(this.actpKernelAddress, ACTP_KERNEL_NONCE_ABI, this.provider);
|
|
121
|
+
const nonce = await kernel.requesterNonces(this.senderAddress);
|
|
122
|
+
this.cachedActpNonce = nonce;
|
|
123
|
+
return nonce;
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
// Older ACTPKernel deployments don't expose requesterNonces.
|
|
127
|
+
// Return 0n — registration doesn't need it, and payment batches
|
|
128
|
+
// will fail at the contract level anyway if nonces are wrong.
|
|
129
|
+
Logger_1.sdkLogger.warn('requesterNonces not available on ACTPKernel — using 0 (older deployment?)');
|
|
130
|
+
this.cachedActpNonce = 0n;
|
|
131
|
+
return 0n;
|
|
132
|
+
}
|
|
122
133
|
}
|
|
123
134
|
/**
|
|
124
135
|
* Invalidate cached ACTP nonce (forces re-read on next operation).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DualNonceManager.js","sourceRoot":"","sources":["../../../src/wallet/aa/DualNonceManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DualNonceManager.js","sourceRoot":"","sources":["../../../src/wallet/aa/DualNonceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymasterClient.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/PaymasterClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAS/C,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAaD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,SAAS,CAAK;gBAEV,MAAM,EAAE,eAAe;IAOnC;;;;;OAKG;IACG,oBAAoB,CACxB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;IAYxC;;;;;OAKG;IACG,gBAAgB,CACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;YAgB1B,gBAAgB;YA8BhB,OAAO;
|
|
1
|
+
{"version":3,"file":"PaymasterClient.d.ts","sourceRoot":"","sources":["../../../src/wallet/aa/PaymasterClient.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAS/C,MAAM,WAAW,eAAe;IAC9B,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAaD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,SAAS,CAAK;gBAEV,MAAM,EAAE,eAAe;IAOnC;;;;;OAKG;IACG,oBAAoB,CACxB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;IAYxC;;;;;OAKG;IACG,gBAAgB,CACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC;YAgB1B,gBAAgB;YA8BhB,OAAO;CAyCtB"}
|
|
@@ -102,7 +102,8 @@ class PaymasterClient {
|
|
|
102
102
|
}
|
|
103
103
|
const json = (await response.json());
|
|
104
104
|
if (json.error) {
|
|
105
|
-
|
|
105
|
+
const dataStr = json.error.data ? ` | data: ${JSON.stringify(json.error.data)}` : '';
|
|
106
|
+
throw new Error(`Paymaster RPC error ${json.error.code}: ${json.error.message}${dataStr}`);
|
|
106
107
|
}
|
|
107
108
|
return json.result;
|
|
108
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaymasterClient.js","sourceRoot":"","sources":["../../../src/wallet/aa/PaymasterClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PaymasterClient.js","sourceRoot":"","sources":["../../../src/wallet/aa/PaymasterClient.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/cli/commands/init.ts
CHANGED
|
@@ -40,13 +40,13 @@ export function createInitCommand(): Command {
|
|
|
40
40
|
.option('--price <usdc>', 'Base price in USDC (default: 1)')
|
|
41
41
|
.option('--json', 'Output as JSON')
|
|
42
42
|
.option('-q, --quiet', 'Minimal output')
|
|
43
|
-
.action(async (options) => {
|
|
43
|
+
.action(async (options, command) => {
|
|
44
44
|
const output = new Output(
|
|
45
45
|
options.json ? 'json' : options.quiet ? 'quiet' : 'human'
|
|
46
46
|
);
|
|
47
47
|
|
|
48
48
|
try {
|
|
49
|
-
await runInit(options, output);
|
|
49
|
+
await runInit(options, output, command);
|
|
50
50
|
} catch (error) {
|
|
51
51
|
output.errorResult({
|
|
52
52
|
code: 'INIT_FAILED',
|
|
@@ -76,7 +76,7 @@ interface InitOptions {
|
|
|
76
76
|
price?: string;
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
async function runInit(options: InitOptions, output: Output): Promise<void> {
|
|
79
|
+
async function runInit(options: InitOptions, output: Output, cmd?: Command): Promise<void> {
|
|
80
80
|
const projectRoot = process.cwd();
|
|
81
81
|
|
|
82
82
|
// Check if already initialized
|
|
@@ -87,6 +87,65 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
|
|
|
87
87
|
);
|
|
88
88
|
}
|
|
89
89
|
|
|
90
|
+
// ── AGIRAILS.md pre-fill ──────────────────────────────────────────────
|
|
91
|
+
const agirailsMdPath = path.join(projectRoot, 'AGIRAILS.md');
|
|
92
|
+
let mdConfig: Record<string, unknown> | null = null;
|
|
93
|
+
|
|
94
|
+
if (fs.existsSync(agirailsMdPath)) {
|
|
95
|
+
try {
|
|
96
|
+
const { parseAgirailsMd } = await import('../../config/agirailsmd');
|
|
97
|
+
const parsed = parseAgirailsMd(fs.readFileSync(agirailsMdPath, 'utf-8'));
|
|
98
|
+
mdConfig = parsed.frontmatter;
|
|
99
|
+
} catch {
|
|
100
|
+
output.warning('Found AGIRAILS.md but could not parse it — ignoring');
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// Helper: true when the user explicitly passed a flag on the CLI
|
|
105
|
+
const isExplicit = (flag: string): boolean =>
|
|
106
|
+
cmd?.getOptionValueSource(flag) === 'cli';
|
|
107
|
+
|
|
108
|
+
// Apply AGIRAILS.md values where the user didn't set an explicit flag
|
|
109
|
+
if (mdConfig) {
|
|
110
|
+
// network → mode mapping
|
|
111
|
+
if (!isExplicit('mode') && mdConfig.network) {
|
|
112
|
+
const net = String(mdConfig.network);
|
|
113
|
+
if (net === 'base-sepolia' || net === 'testnet') options.mode = 'testnet';
|
|
114
|
+
else if (net === 'base-mainnet' || net === 'mainnet') options.mode = 'mainnet';
|
|
115
|
+
else if (net === 'mock') options.mode = 'mock';
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
// intent
|
|
119
|
+
if (!isExplicit('intent') && mdConfig.intent) {
|
|
120
|
+
options.intent = String(mdConfig.intent);
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
// capabilities → service (first capability)
|
|
124
|
+
if (!isExplicit('service') && Array.isArray(mdConfig.capabilities) && mdConfig.capabilities.length > 0) {
|
|
125
|
+
options.service = String(mdConfig.capabilities[0]);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
// price
|
|
129
|
+
if (!isExplicit('price') && mdConfig.price != null) {
|
|
130
|
+
options.price = String(mdConfig.price);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
// Log what we pre-filled
|
|
134
|
+
const lines: string[] = [];
|
|
135
|
+
if (mdConfig.network) lines.push(` Mode: ${options.mode}`);
|
|
136
|
+
if (mdConfig.name) lines.push(` Agent: ${String(mdConfig.name)}`);
|
|
137
|
+
if (mdConfig.intent) lines.push(` Intent: ${options.intent || mdConfig.intent}`);
|
|
138
|
+
if (Array.isArray(mdConfig.capabilities)) lines.push(` Capabilities: ${mdConfig.capabilities.join(', ')}`);
|
|
139
|
+
if (mdConfig.price != null) lines.push(` Price: $${mdConfig.price} USDC`);
|
|
140
|
+
|
|
141
|
+
output.info('Found AGIRAILS.md \u2014 using config from file');
|
|
142
|
+
for (const line of lines) {
|
|
143
|
+
output.print(line);
|
|
144
|
+
}
|
|
145
|
+
output.blank();
|
|
146
|
+
}
|
|
147
|
+
// ── End AGIRAILS.md pre-fill ──────────────────────────────────────────
|
|
148
|
+
|
|
90
149
|
// Validate mode
|
|
91
150
|
const validModes: CLIMode[] = ['mock', 'testnet', 'mainnet'];
|
|
92
151
|
if (!validModes.includes(options.mode as CLIMode)) {
|
|
@@ -155,6 +214,14 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
|
|
|
155
214
|
...(walletType !== 'mock' && { wallet: walletType as 'auto' | 'eoa' }),
|
|
156
215
|
...(smartWalletAddress && { smartWallet: smartWalletAddress.toLowerCase() }),
|
|
157
216
|
...(didRegister && { registered: true }),
|
|
217
|
+
// AGIRAILS.md-derived values (stored for downstream use)
|
|
218
|
+
...(mdConfig && mdConfig.name ? { agentName: String(mdConfig.name) } : {}),
|
|
219
|
+
...(mdConfig && mdConfig.intent ? { intent: String(mdConfig.intent) as 'earn' | 'pay' | 'both' } : {}),
|
|
220
|
+
...(mdConfig && Array.isArray(mdConfig.capabilities) ? { capabilities: mdConfig.capabilities.map(String) } : {}),
|
|
221
|
+
...(mdConfig && mdConfig.price != null ? { price: Number(mdConfig.price) } : {}),
|
|
222
|
+
...(mdConfig && mdConfig.concurrency != null ? { concurrency: Number(mdConfig.concurrency) } : {}),
|
|
223
|
+
...(mdConfig && mdConfig.payment_mode ? { paymentMode: String(mdConfig.payment_mode) as 'actp' | 'x402' | 'both' } : {}),
|
|
224
|
+
...(mdConfig && mdConfig.budget != null ? { budget: Number(mdConfig.budget) } : {}),
|
|
158
225
|
};
|
|
159
226
|
|
|
160
227
|
// Save configuration
|
|
@@ -199,7 +266,7 @@ async function runInit(options: InitOptions, output: Output): Promise<void> {
|
|
|
199
266
|
|
|
200
267
|
// Generate scaffold if requested
|
|
201
268
|
if (options.scaffold) {
|
|
202
|
-
await runScaffold(options, mode, output);
|
|
269
|
+
await runScaffold(options, mode, output, mdConfig);
|
|
203
270
|
} else {
|
|
204
271
|
output.blank();
|
|
205
272
|
output.print('Next steps:');
|
|
@@ -347,7 +414,8 @@ async function runInlineRegistration(
|
|
|
347
414
|
const { ethers } = await import('ethers');
|
|
348
415
|
const { getNetwork } = await import('../../config/networks');
|
|
349
416
|
const { AutoWalletProvider } = await import('../../wallet/AutoWalletProvider');
|
|
350
|
-
const { buildRegisterAgentBatch, buildTestnetInitBatch } = await import('../../wallet/aa/TransactionBatcher');
|
|
417
|
+
const { buildRegisterAgentBatch, buildTestnetInitBatch, buildTestnetMintBatch } = await import('../../wallet/aa/TransactionBatcher');
|
|
418
|
+
const { sdkLogger } = await import('../../utils/Logger');
|
|
351
419
|
|
|
352
420
|
// Parse AGIRAILS.md if present
|
|
353
421
|
const agirailsMdPath = path.join(projectRoot, 'AGIRAILS.md');
|
|
@@ -363,6 +431,7 @@ async function runInlineRegistration(
|
|
|
363
431
|
output.info(`Parsed ${serviceDescriptors.length} service(s) from AGIRAILS.md`);
|
|
364
432
|
} else {
|
|
365
433
|
const serviceType = 'general';
|
|
434
|
+
endpoint = 'https://agirails.io/agent/pending';
|
|
366
435
|
serviceDescriptors = [{
|
|
367
436
|
serviceTypeHash: ethers.keccak256(ethers.toUtf8Bytes(serviceType)),
|
|
368
437
|
serviceType,
|
|
@@ -412,11 +481,13 @@ async function runInlineRegistration(
|
|
|
412
481
|
|
|
413
482
|
const smartWalletAddress = autoWallet.getAddress();
|
|
414
483
|
|
|
415
|
-
// Build batch
|
|
416
|
-
let calls;
|
|
484
|
+
// Build and submit registration batch
|
|
417
485
|
if (mode === 'testnet') {
|
|
418
|
-
|
|
419
|
-
|
|
486
|
+
// Testnet: try combined batch first, fall back to separate UserOps
|
|
487
|
+
// Some paymaster configurations reject multi-target batches in simulation
|
|
488
|
+
output.info('Testnet: registering + minting 1000 test USDC...');
|
|
489
|
+
|
|
490
|
+
const combinedCalls = buildTestnetInitBatch({
|
|
420
491
|
agentRegistryAddress: networkConfig.contracts.agentRegistry,
|
|
421
492
|
endpoint,
|
|
422
493
|
serviceDescriptors,
|
|
@@ -424,33 +495,102 @@ async function runInlineRegistration(
|
|
|
424
495
|
recipient: smartWalletAddress,
|
|
425
496
|
mintAmount: '1000000000',
|
|
426
497
|
});
|
|
498
|
+
|
|
499
|
+
let receipt;
|
|
500
|
+
try {
|
|
501
|
+
const txRequests = combinedCalls.map((c) => ({
|
|
502
|
+
to: c.target,
|
|
503
|
+
data: c.data,
|
|
504
|
+
value: c.value.toString(),
|
|
505
|
+
}));
|
|
506
|
+
receipt = await autoWallet.sendBatchTransaction(txRequests);
|
|
507
|
+
} catch (combinedError) {
|
|
508
|
+
// Combined batch failed — split into two separate UserOps
|
|
509
|
+
output.info('Combined batch failed, trying separate transactions...');
|
|
510
|
+
sdkLogger.warn('Combined testnet batch failed, splitting', {
|
|
511
|
+
error: combinedError instanceof Error ? combinedError.message : String(combinedError),
|
|
512
|
+
});
|
|
513
|
+
|
|
514
|
+
// Step 1: Register agent only
|
|
515
|
+
const registerCalls = buildRegisterAgentBatch(
|
|
516
|
+
networkConfig.contracts.agentRegistry,
|
|
517
|
+
endpoint,
|
|
518
|
+
serviceDescriptors
|
|
519
|
+
);
|
|
520
|
+
const registerTxs = registerCalls.map((c) => ({
|
|
521
|
+
to: c.target,
|
|
522
|
+
data: c.data,
|
|
523
|
+
value: c.value.toString(),
|
|
524
|
+
}));
|
|
525
|
+
|
|
526
|
+
const registerReceipt = await autoWallet.sendBatchTransaction(registerTxs);
|
|
527
|
+
if (!registerReceipt.success) {
|
|
528
|
+
output.warning(`Registration failed (tx: ${registerReceipt.hash}). Run "actp register" later.`);
|
|
529
|
+
return false;
|
|
530
|
+
}
|
|
531
|
+
output.success('Agent registered on AgentRegistry');
|
|
532
|
+
output.print(` Tx: ${registerReceipt.hash}`);
|
|
533
|
+
|
|
534
|
+
// Step 2: Mint test USDC
|
|
535
|
+
try {
|
|
536
|
+
const mintCalls = buildTestnetMintBatch(
|
|
537
|
+
networkConfig.contracts.usdc,
|
|
538
|
+
smartWalletAddress,
|
|
539
|
+
'1000000000'
|
|
540
|
+
);
|
|
541
|
+
const mintTxs = mintCalls.map((c) => ({
|
|
542
|
+
to: c.target,
|
|
543
|
+
data: c.data,
|
|
544
|
+
value: c.value.toString(),
|
|
545
|
+
}));
|
|
546
|
+
const mintReceipt = await autoWallet.sendBatchTransaction(mintTxs);
|
|
547
|
+
if (mintReceipt.success) {
|
|
548
|
+
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
549
|
+
output.print(` Tx: ${mintReceipt.hash}`);
|
|
550
|
+
} else {
|
|
551
|
+
output.warning('USDC mint failed. Mint manually: actp faucet');
|
|
552
|
+
}
|
|
553
|
+
} catch (mintError) {
|
|
554
|
+
output.warning('USDC mint failed. Mint manually: actp faucet');
|
|
555
|
+
sdkLogger.warn('Testnet mint failed', {
|
|
556
|
+
error: mintError instanceof Error ? mintError.message : String(mintError),
|
|
557
|
+
});
|
|
558
|
+
}
|
|
559
|
+
return true;
|
|
560
|
+
}
|
|
561
|
+
|
|
562
|
+
if (!receipt.success) {
|
|
563
|
+
output.warning(`Registration failed (tx: ${receipt.hash}). Run "actp register" later.`);
|
|
564
|
+
return false;
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
output.success('Agent registered on AgentRegistry');
|
|
568
|
+
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
569
|
+
output.print(` Tx: ${receipt.hash}`);
|
|
427
570
|
} else {
|
|
571
|
+
// Mainnet: register only (no minting)
|
|
428
572
|
output.info('Registering on AgentRegistry (gasless)...');
|
|
429
|
-
calls = buildRegisterAgentBatch(
|
|
573
|
+
const calls = buildRegisterAgentBatch(
|
|
430
574
|
networkConfig.contracts.agentRegistry,
|
|
431
575
|
endpoint,
|
|
432
576
|
serviceDescriptors
|
|
433
577
|
);
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
578
|
+
const txRequests = calls.map((c) => ({
|
|
579
|
+
to: c.target,
|
|
580
|
+
data: c.data,
|
|
581
|
+
value: c.value.toString(),
|
|
582
|
+
}));
|
|
583
|
+
|
|
584
|
+
const receipt = await autoWallet.sendBatchTransaction(txRequests);
|
|
585
|
+
if (!receipt.success) {
|
|
586
|
+
output.warning(`Registration failed (tx: ${receipt.hash}). Run "actp register" later.`);
|
|
587
|
+
return false;
|
|
588
|
+
}
|
|
443
589
|
|
|
444
|
-
|
|
445
|
-
output.
|
|
446
|
-
return false;
|
|
590
|
+
output.success('Agent registered on AgentRegistry');
|
|
591
|
+
output.print(` Tx: ${receipt.hash}`);
|
|
447
592
|
}
|
|
448
593
|
|
|
449
|
-
output.success('Agent registered on AgentRegistry');
|
|
450
|
-
if (mode === 'testnet') {
|
|
451
|
-
output.success('Minted 1,000 test USDC to Smart Wallet');
|
|
452
|
-
}
|
|
453
|
-
output.print(` Tx: ${receipt.hash}`);
|
|
454
594
|
return true;
|
|
455
595
|
} catch (error) {
|
|
456
596
|
output.warning(`Registration failed: ${(error as Error).message}`);
|
|
@@ -486,6 +626,7 @@ async function runScaffold(
|
|
|
486
626
|
options: InitOptions,
|
|
487
627
|
mode: CLIMode,
|
|
488
628
|
output: Output,
|
|
629
|
+
mdConfig?: Record<string, unknown> | null,
|
|
489
630
|
): Promise<void> {
|
|
490
631
|
const validIntents: ScaffoldIntent[] = ['earn', 'pay', 'both'];
|
|
491
632
|
const intent: ScaffoldIntent = (options.intent as ScaffoldIntent) || 'earn';
|
|
@@ -506,8 +647,8 @@ async function runScaffold(
|
|
|
506
647
|
return;
|
|
507
648
|
}
|
|
508
649
|
|
|
509
|
-
// Derive agent name
|
|
510
|
-
const agentName = path.basename(process.cwd());
|
|
650
|
+
// Derive agent name: prefer AGIRAILS.md name, fallback to directory name
|
|
651
|
+
const agentName = (mdConfig?.name ? String(mdConfig.name) : null) || path.basename(process.cwd());
|
|
511
652
|
|
|
512
653
|
// Get template and substitute variables
|
|
513
654
|
const template = getTemplate(intent);
|
package/src/cli/utils/config.ts
CHANGED
|
@@ -46,6 +46,27 @@ export interface CLIConfig {
|
|
|
46
46
|
|
|
47
47
|
/** Configuration version for migrations */
|
|
48
48
|
version: string;
|
|
49
|
+
|
|
50
|
+
/** Agent name from AGIRAILS.md */
|
|
51
|
+
agentName?: string;
|
|
52
|
+
|
|
53
|
+
/** Agent intent: earn, pay, or both */
|
|
54
|
+
intent?: 'earn' | 'pay' | 'both';
|
|
55
|
+
|
|
56
|
+
/** Service capabilities from AGIRAILS.md */
|
|
57
|
+
capabilities?: string[];
|
|
58
|
+
|
|
59
|
+
/** Base price in USDC */
|
|
60
|
+
price?: number;
|
|
61
|
+
|
|
62
|
+
/** Max concurrent jobs */
|
|
63
|
+
concurrency?: number;
|
|
64
|
+
|
|
65
|
+
/** Payment mode: actp, x402, or both */
|
|
66
|
+
paymentMode?: 'actp' | 'x402' | 'both';
|
|
67
|
+
|
|
68
|
+
/** Budget cap in USDC */
|
|
69
|
+
budget?: number;
|
|
49
70
|
}
|
|
50
71
|
|
|
51
72
|
/**
|
|
@@ -233,8 +233,9 @@ export class BundlerClient {
|
|
|
233
233
|
const json = (await response.json()) as JsonRpcResponse<T>;
|
|
234
234
|
|
|
235
235
|
if (json.error) {
|
|
236
|
+
const dataStr = json.error.data ? ` | data: ${JSON.stringify(json.error.data)}` : '';
|
|
236
237
|
const err = new Error(
|
|
237
|
-
`Bundler RPC error ${json.error.code}: ${json.error.message}`
|
|
238
|
+
`Bundler RPC error ${json.error.code}: ${json.error.message}${dataStr}`
|
|
238
239
|
);
|
|
239
240
|
(err as any).code = json.error.code;
|
|
240
241
|
(err as any).data = json.error.data;
|
|
@@ -141,17 +141,27 @@ export class DualNonceManager {
|
|
|
141
141
|
|
|
142
142
|
/**
|
|
143
143
|
* Read current ACTP nonce for the requester.
|
|
144
|
-
* requesterNonces is public on ACTPKernel.
|
|
144
|
+
* requesterNonces is public on ACTPKernel (added in v2).
|
|
145
|
+
* Older deployments may not expose this — fall back to 0n.
|
|
145
146
|
*/
|
|
146
147
|
private async readActpNonce(): Promise<bigint> {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
148
|
+
try {
|
|
149
|
+
const kernel = new ethers.Contract(
|
|
150
|
+
this.actpKernelAddress,
|
|
151
|
+
ACTP_KERNEL_NONCE_ABI,
|
|
152
|
+
this.provider
|
|
153
|
+
);
|
|
154
|
+
const nonce = await kernel.requesterNonces(this.senderAddress);
|
|
155
|
+
this.cachedActpNonce = nonce;
|
|
156
|
+
return nonce;
|
|
157
|
+
} catch {
|
|
158
|
+
// Older ACTPKernel deployments don't expose requesterNonces.
|
|
159
|
+
// Return 0n — registration doesn't need it, and payment batches
|
|
160
|
+
// will fail at the contract level anyway if nonces are wrong.
|
|
161
|
+
sdkLogger.warn('requesterNonces not available on ACTPKernel — using 0 (older deployment?)');
|
|
162
|
+
this.cachedActpNonce = 0n;
|
|
163
|
+
return 0n;
|
|
164
|
+
}
|
|
155
165
|
}
|
|
156
166
|
|
|
157
167
|
/**
|
|
@@ -160,8 +160,9 @@ export class PaymasterClient {
|
|
|
160
160
|
const json = (await response.json()) as JsonRpcResponse<T>;
|
|
161
161
|
|
|
162
162
|
if (json.error) {
|
|
163
|
+
const dataStr = json.error.data ? ` | data: ${JSON.stringify(json.error.data)}` : '';
|
|
163
164
|
throw new Error(
|
|
164
|
-
`Paymaster RPC error ${json.error.code}: ${json.error.message}`
|
|
165
|
+
`Paymaster RPC error ${json.error.code}: ${json.error.message}${dataStr}`
|
|
165
166
|
);
|
|
166
167
|
}
|
|
167
168
|
|