@aztec/ethereum 0.72.1 → 0.73.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/dest/{ethereum_chain.d.ts → chain.d.ts} +1 -1
- package/dest/chain.d.ts.map +1 -0
- package/dest/{ethereum_chain.js → chain.js} +1 -1
- package/dest/client.d.ts +16 -0
- package/dest/client.d.ts.map +1 -0
- package/dest/client.js +35 -0
- package/dest/contracts/forwarder.d.ts +23 -0
- package/dest/contracts/forwarder.d.ts.map +1 -0
- package/dest/contracts/forwarder.js +66 -0
- package/dest/contracts/governance.d.ts +14 -0
- package/dest/contracts/governance.d.ts.map +1 -0
- package/dest/contracts/governance.js +31 -0
- package/dest/contracts/governance_proposer.d.ts +13 -0
- package/dest/contracts/governance_proposer.d.ts.map +1 -0
- package/dest/contracts/governance_proposer.js +40 -0
- package/dest/contracts/index.d.ts +4 -0
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +5 -1
- package/dest/contracts/rollup.d.ts +94 -5
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +177 -16
- package/dest/contracts/slashing_proposer.d.ts +11 -0
- package/dest/contracts/slashing_proposer.d.ts.map +1 -0
- package/dest/contracts/slashing_proposer.js +19 -0
- package/dest/deploy_l1_contracts.d.ts +985 -974
- package/dest/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_l1_contracts.js +44 -22
- package/dest/index.d.ts +4 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +5 -2
- package/dest/l1_reader.d.ts.map +1 -1
- package/dest/l1_reader.js +2 -3
- package/dest/l1_tx_utils.d.ts +78 -17
- package/dest/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils.js +182 -20
- package/dest/l1_tx_utils_with_blobs.d.ts +12 -0
- package/dest/l1_tx_utils_with_blobs.d.ts.map +1 -0
- package/dest/l1_tx_utils_with_blobs.js +61 -0
- package/dest/queries.d.ts +15 -0
- package/dest/queries.d.ts.map +1 -0
- package/dest/queries.js +48 -0
- package/dest/test/delayed_tx_utils.d.ts +8 -0
- package/dest/test/delayed_tx_utils.d.ts.map +1 -0
- package/dest/test/delayed_tx_utils.js +21 -0
- package/dest/test/index.d.ts +2 -1
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +3 -2
- package/dest/types.d.ts +3 -1
- package/dest/types.d.ts.map +1 -1
- package/dest/utils.d.ts +1 -0
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +16 -1
- package/package.json +7 -4
- package/src/client.ts +56 -0
- package/src/contracts/forwarder.ts +113 -0
- package/src/contracts/governance.ts +50 -0
- package/src/contracts/governance_proposer.ts +41 -0
- package/src/contracts/index.ts +4 -0
- package/src/contracts/rollup.ts +264 -16
- package/src/contracts/slashing_proposer.ts +31 -0
- package/src/deploy_l1_contracts.ts +68 -26
- package/src/index.ts +4 -1
- package/src/l1_reader.ts +1 -2
- package/src/l1_tx_utils.ts +254 -34
- package/src/l1_tx_utils_with_blobs.ts +86 -0
- package/src/queries.ts +77 -0
- package/src/test/delayed_tx_utils.ts +24 -0
- package/src/test/index.ts +2 -1
- package/src/types.ts +4 -0
- package/src/utils.ts +15 -0
- package/dest/ethereum_chain.d.ts.map +0 -1
- /package/src/{ethereum_chain.ts → chain.ts} +0 -0
package/dest/l1_tx_utils.js
CHANGED
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { toHex } from '@aztec/foundation/bigint-buffer';
|
|
2
|
+
import { compactArray, times } from '@aztec/foundation/collection';
|
|
2
3
|
import { bigintConfigHelper, getDefaultConfig, numberConfigHelper, } from '@aztec/foundation/config';
|
|
3
4
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
4
5
|
import { sleep } from '@aztec/foundation/sleep';
|
|
5
|
-
import { MethodNotFoundRpcError, MethodNotSupportedRpcError, formatGwei, } from 'viem';
|
|
6
|
+
import { MethodNotFoundRpcError, MethodNotSupportedRpcError, formatGwei, getContractError, hexToBytes, } from 'viem';
|
|
6
7
|
import { formatViemError } from './utils.js';
|
|
7
8
|
// 1_000_000_000 Gwei = 1 ETH
|
|
8
9
|
// 1_000_000_000 Wei = 1 Gwei
|
|
9
10
|
// 1_000_000_000_000_000_000 Wei = 1 ETH
|
|
10
11
|
const WEI_CONST = 1000000000n;
|
|
12
|
+
// @note using this large gas limit to avoid the issue of `gas limit too low` when estimating gas in reth
|
|
13
|
+
const LARGE_GAS_LIMIT = 10000000n;
|
|
11
14
|
// setting a minimum bump percentage to 10% due to geth's implementation
|
|
12
15
|
// https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
|
|
13
16
|
const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
|
|
@@ -84,11 +87,27 @@ export class L1TxUtils {
|
|
|
84
87
|
this.publicClient = publicClient;
|
|
85
88
|
this.walletClient = walletClient;
|
|
86
89
|
this.logger = logger;
|
|
90
|
+
this.interrupted = false;
|
|
87
91
|
this.config = {
|
|
88
92
|
...defaultL1TxUtilsConfig,
|
|
89
93
|
...(config || {}),
|
|
90
94
|
};
|
|
91
95
|
}
|
|
96
|
+
interrupt() {
|
|
97
|
+
this.interrupted = true;
|
|
98
|
+
}
|
|
99
|
+
restart() {
|
|
100
|
+
this.interrupted = false;
|
|
101
|
+
}
|
|
102
|
+
getSenderAddress() {
|
|
103
|
+
return this.walletClient.account.address;
|
|
104
|
+
}
|
|
105
|
+
getBlock() {
|
|
106
|
+
return this.publicClient.getBlock();
|
|
107
|
+
}
|
|
108
|
+
getBlockNumber() {
|
|
109
|
+
return this.publicClient.getBlockNumber();
|
|
110
|
+
}
|
|
92
111
|
/**
|
|
93
112
|
* Sends a transaction with gas estimation and pricing
|
|
94
113
|
* @param request - The transaction request (to, data, value)
|
|
@@ -150,13 +169,17 @@ export class L1TxUtils {
|
|
|
150
169
|
* @param params - Parameters used in the initial transaction
|
|
151
170
|
* @param gasConfig - Optional gas configuration
|
|
152
171
|
*/
|
|
153
|
-
async monitorTransaction(request, initialTxHash, params, _gasConfig, _blobInputs) {
|
|
172
|
+
async monitorTransaction(request, initialTxHash, params, _gasConfig, _blobInputs, isCancelTx = false) {
|
|
173
|
+
const isBlobTx = !!_blobInputs;
|
|
154
174
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
155
175
|
const account = this.walletClient.account;
|
|
156
176
|
const blobInputs = _blobInputs || {};
|
|
157
177
|
const makeGetTransactionBackoff = () => makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, i => i + 1));
|
|
158
178
|
// Retry a few times, in case the tx is not yet propagated.
|
|
159
179
|
const tx = await retry(() => this.publicClient.getTransaction({ hash: initialTxHash }), `Getting L1 transaction ${initialTxHash}`, makeGetTransactionBackoff(), this.logger, true);
|
|
180
|
+
if (!tx) {
|
|
181
|
+
throw new Error(`Failed to get L1 transaction ${initialTxHash} to monitor`);
|
|
182
|
+
}
|
|
160
183
|
if (tx?.nonce === undefined || tx?.nonce === null) {
|
|
161
184
|
throw new Error(`Failed to get L1 transaction ${initialTxHash} nonce`);
|
|
162
185
|
}
|
|
@@ -165,10 +188,16 @@ export class L1TxUtils {
|
|
|
165
188
|
let currentTxHash = initialTxHash;
|
|
166
189
|
let attempts = 0;
|
|
167
190
|
let lastAttemptSent = Date.now();
|
|
191
|
+
let lastGasPrice = {
|
|
192
|
+
maxFeePerGas: tx.maxFeePerGas,
|
|
193
|
+
maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
|
|
194
|
+
maxFeePerBlobGas: tx.maxFeePerBlobGas,
|
|
195
|
+
};
|
|
168
196
|
const initialTxTime = lastAttemptSent;
|
|
169
197
|
let txTimedOut = false;
|
|
170
198
|
const isTimedOut = () => (gasConfig.txTimeoutAt && Date.now() > gasConfig.txTimeoutAt.getTime()) ||
|
|
171
199
|
(gasConfig.txTimeoutMs !== undefined && Date.now() - initialTxTime > gasConfig.txTimeoutMs) ||
|
|
200
|
+
this.interrupted ||
|
|
172
201
|
false;
|
|
173
202
|
while (!txTimedOut) {
|
|
174
203
|
try {
|
|
@@ -209,13 +238,14 @@ export class L1TxUtils {
|
|
|
209
238
|
}
|
|
210
239
|
if (timePassed > gasConfig.stallTimeMs && attempts < gasConfig.maxAttempts) {
|
|
211
240
|
attempts++;
|
|
212
|
-
const newGasPrice = await this.getGasPrice(gasConfig,
|
|
241
|
+
const newGasPrice = await this.getGasPrice(gasConfig, isBlobTx, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas
|
|
213
242
|
? {
|
|
214
243
|
maxFeePerGas: tx.maxFeePerGas,
|
|
215
244
|
maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
|
|
216
245
|
maxFeePerBlobGas: tx.maxFeePerBlobGas,
|
|
217
246
|
}
|
|
218
247
|
: undefined);
|
|
248
|
+
lastGasPrice = newGasPrice;
|
|
219
249
|
this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` +
|
|
220
250
|
`with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`, {
|
|
221
251
|
maxFeePerGas: formatGwei(newGasPrice.maxFeePerGas),
|
|
@@ -246,10 +276,23 @@ export class L1TxUtils {
|
|
|
246
276
|
// Check if tx has timed out.
|
|
247
277
|
txTimedOut = isTimedOut();
|
|
248
278
|
}
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
279
|
+
if (!isCancelTx) {
|
|
280
|
+
// Fire cancellation without awaiting to avoid blocking the main thread
|
|
281
|
+
this.attemptTxCancellation(nonce, isBlobTx, lastGasPrice, attempts)
|
|
282
|
+
.then(cancelTxHash => {
|
|
283
|
+
this.logger?.debug(`Sent cancellation tx ${cancelTxHash} for timed out tx ${currentTxHash}`);
|
|
284
|
+
})
|
|
285
|
+
.catch(err => {
|
|
286
|
+
const viemError = formatViemError(err);
|
|
287
|
+
this.logger?.error(`Failed to send cancellation for timed out tx ${currentTxHash}:`, viemError.message, {
|
|
288
|
+
metaMessages: viemError.metaMessages,
|
|
289
|
+
});
|
|
290
|
+
});
|
|
291
|
+
this.logger?.error(`L1 transaction ${currentTxHash} timed out`, {
|
|
292
|
+
txHash: currentTxHash,
|
|
293
|
+
...tx,
|
|
294
|
+
});
|
|
295
|
+
}
|
|
253
296
|
throw new Error(`L1 transaction ${currentTxHash} timed out`);
|
|
254
297
|
}
|
|
255
298
|
/**
|
|
@@ -363,27 +406,98 @@ export class L1TxUtils {
|
|
|
363
406
|
async estimateGas(account, request, _gasConfig, _blobInputs) {
|
|
364
407
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
365
408
|
let initialEstimate = 0n;
|
|
366
|
-
// Viem does not allow blobs to be sent via public client's estimate gas, so any estimation will fail.
|
|
367
|
-
// Strangely, the only way to get gas and send blobs is prepareTransactionRequest().
|
|
368
|
-
// See: https://github.com/wevm/viem/issues/2075
|
|
369
409
|
if (_blobInputs) {
|
|
410
|
+
// @note requests with blobs also require maxFeePerBlobGas to be set
|
|
370
411
|
const gasPrice = await this.getGasPrice(gasConfig, true, 0);
|
|
371
|
-
initialEstimate =
|
|
412
|
+
initialEstimate = await this.publicClient.estimateGas({
|
|
372
413
|
account,
|
|
373
414
|
...request,
|
|
374
415
|
..._blobInputs,
|
|
375
416
|
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
|
|
376
|
-
|
|
377
|
-
|
|
417
|
+
gas: LARGE_GAS_LIMIT,
|
|
418
|
+
});
|
|
419
|
+
this.logger?.debug(`L1 gas used in estimateGas by blob tx: ${initialEstimate}`);
|
|
378
420
|
}
|
|
379
421
|
else {
|
|
380
|
-
initialEstimate = await this.publicClient.estimateGas({ account, ...request });
|
|
381
|
-
this.logger?.debug(
|
|
422
|
+
initialEstimate = await this.publicClient.estimateGas({ account, ...request, gas: LARGE_GAS_LIMIT });
|
|
423
|
+
this.logger?.debug(`L1 gas used in estimateGas by non-blob tx: ${initialEstimate}`);
|
|
382
424
|
}
|
|
383
425
|
// Add buffer based on either fixed amount or percentage
|
|
384
426
|
const withBuffer = this.bumpGasLimit(initialEstimate, gasConfig);
|
|
385
427
|
return withBuffer;
|
|
386
428
|
}
|
|
429
|
+
async getTransactionStats(txHash) {
|
|
430
|
+
const tx = await this.publicClient.getTransaction({ hash: txHash });
|
|
431
|
+
if (!tx) {
|
|
432
|
+
return undefined;
|
|
433
|
+
}
|
|
434
|
+
const calldata = hexToBytes(tx.input);
|
|
435
|
+
return {
|
|
436
|
+
sender: tx.from.toString(),
|
|
437
|
+
transactionHash: tx.hash,
|
|
438
|
+
calldataSize: calldata.length,
|
|
439
|
+
calldataGas: getCalldataGasUsage(calldata),
|
|
440
|
+
};
|
|
441
|
+
}
|
|
442
|
+
async tryGetErrorFromRevertedTx(data, args, blobInputs) {
|
|
443
|
+
try {
|
|
444
|
+
// NB: If this fn starts unexpectedly giving incorrect blob hash errors, it may be because the checkBlob
|
|
445
|
+
// bool is no longer at the slot below. To find the slot, run: forge inspect src/core/Rollup.sol:Rollup storage
|
|
446
|
+
const checkBlobSlot = 9n;
|
|
447
|
+
await this.publicClient.simulateContract({
|
|
448
|
+
...args,
|
|
449
|
+
account: this.walletClient.account,
|
|
450
|
+
stateOverride: [
|
|
451
|
+
{
|
|
452
|
+
address: args.address,
|
|
453
|
+
stateDiff: [
|
|
454
|
+
{
|
|
455
|
+
slot: toHex(checkBlobSlot, true),
|
|
456
|
+
value: toHex(0n, true),
|
|
457
|
+
},
|
|
458
|
+
],
|
|
459
|
+
},
|
|
460
|
+
],
|
|
461
|
+
});
|
|
462
|
+
// If the above passes, we have a blob error. We cannot simulate blob txs, and failed txs no longer throw errors.
|
|
463
|
+
// Strangely, the only way to throw the revert reason as an error and provide blobs is prepareTransactionRequest.
|
|
464
|
+
// See: https://github.com/wevm/viem/issues/2075
|
|
465
|
+
// This throws a EstimateGasExecutionError with the custom error information:
|
|
466
|
+
const request = blobInputs
|
|
467
|
+
? {
|
|
468
|
+
account: this.walletClient.account,
|
|
469
|
+
to: args.address,
|
|
470
|
+
data,
|
|
471
|
+
blobs: blobInputs.blobs,
|
|
472
|
+
kzg: blobInputs.kzg,
|
|
473
|
+
maxFeePerBlobGas: blobInputs.maxFeePerBlobGas,
|
|
474
|
+
}
|
|
475
|
+
: {
|
|
476
|
+
account: this.walletClient.account,
|
|
477
|
+
to: args.address,
|
|
478
|
+
data,
|
|
479
|
+
};
|
|
480
|
+
await this.walletClient.prepareTransactionRequest(request);
|
|
481
|
+
return undefined;
|
|
482
|
+
}
|
|
483
|
+
catch (simulationErr) {
|
|
484
|
+
// If we don't have a ContractFunctionExecutionError, we have a blob related error => use getContractError to get the error msg.
|
|
485
|
+
const contractErr = simulationErr.name === 'ContractFunctionExecutionError'
|
|
486
|
+
? simulationErr
|
|
487
|
+
: getContractError(simulationErr, {
|
|
488
|
+
args: [],
|
|
489
|
+
abi: args.abi,
|
|
490
|
+
functionName: args.functionName,
|
|
491
|
+
address: args.address,
|
|
492
|
+
sender: this.walletClient.account.address,
|
|
493
|
+
});
|
|
494
|
+
if (contractErr.name === 'ContractFunctionExecutionError') {
|
|
495
|
+
const execErr = contractErr;
|
|
496
|
+
return tryGetCustomErrorNameContractFunction(execErr);
|
|
497
|
+
}
|
|
498
|
+
this.logger?.error(`Error getting error from simulation`, simulationErr);
|
|
499
|
+
}
|
|
500
|
+
}
|
|
387
501
|
async simulateGasUsed(request, blockOverrides = {}, stateOverrides = [], _gasConfig) {
|
|
388
502
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
389
503
|
const gasPrice = await this.getGasPrice(gasConfig, false);
|
|
@@ -402,7 +516,7 @@ export class L1TxUtils {
|
|
|
402
516
|
data: request.data,
|
|
403
517
|
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
404
518
|
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
405
|
-
gas: request.gas ??
|
|
519
|
+
gas: request.gas ?? LARGE_GAS_LIMIT,
|
|
406
520
|
nonce,
|
|
407
521
|
},
|
|
408
522
|
],
|
|
@@ -422,11 +536,11 @@ export class L1TxUtils {
|
|
|
422
536
|
}
|
|
423
537
|
catch (err) {
|
|
424
538
|
if (err instanceof MethodNotFoundRpcError || err instanceof MethodNotSupportedRpcError) {
|
|
425
|
-
this.logger?.error('Node does not support eth_simulateV1 API');
|
|
426
539
|
if (gasConfig.fallbackGasEstimate) {
|
|
427
|
-
this.logger?.
|
|
540
|
+
this.logger?.warn(`Node does not support eth_simulateV1 API. Using fallback gas estimate: ${gasConfig.fallbackGasEstimate}`);
|
|
428
541
|
return gasConfig.fallbackGasEstimate;
|
|
429
542
|
}
|
|
543
|
+
this.logger?.error('Node does not support eth_simulateV1 API');
|
|
430
544
|
}
|
|
431
545
|
throw err;
|
|
432
546
|
}
|
|
@@ -435,5 +549,53 @@ export class L1TxUtils {
|
|
|
435
549
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
436
550
|
return gasLimit + (gasLimit * BigInt((gasConfig?.gasLimitBufferPercentage || 0) * 100)) / 10000n;
|
|
437
551
|
}
|
|
552
|
+
/**
|
|
553
|
+
* Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
|
|
554
|
+
* @param nonce - The nonce of the transaction to cancel
|
|
555
|
+
* @param previousGasPrice - The gas price of the previous transaction
|
|
556
|
+
* @param attempts - The number of attempts to cancel the transaction
|
|
557
|
+
* @returns The hash of the cancellation transaction
|
|
558
|
+
*/
|
|
559
|
+
async attemptTxCancellation(nonce, isBlobTx = false, previousGasPrice, attempts = 0) {
|
|
560
|
+
if (isBlobTx) {
|
|
561
|
+
throw new Error('Cannot cancel blob transactions, please use L1TxUtilsWithBlobsClass');
|
|
562
|
+
}
|
|
563
|
+
const account = this.walletClient.account;
|
|
564
|
+
// Get gas price with higher priority fee for cancellation
|
|
565
|
+
const cancelGasPrice = await this.getGasPrice({
|
|
566
|
+
...this.config,
|
|
567
|
+
// Use high bump for cancellation to ensure it replaces the original tx
|
|
568
|
+
priorityFeeRetryBumpPercentage: 150, // 150% bump should be enough to replace any tx
|
|
569
|
+
}, isBlobTx, attempts + 1, previousGasPrice);
|
|
570
|
+
this.logger?.debug(`Attempting to cancel transaction with nonce ${nonce}`, {
|
|
571
|
+
maxFeePerGas: formatGwei(cancelGasPrice.maxFeePerGas),
|
|
572
|
+
maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas),
|
|
573
|
+
});
|
|
574
|
+
const request = {
|
|
575
|
+
to: account.address,
|
|
576
|
+
value: 0n,
|
|
577
|
+
};
|
|
578
|
+
// Send 0-value tx to self with higher gas price
|
|
579
|
+
const cancelTxHash = await this.walletClient.sendTransaction({
|
|
580
|
+
...request,
|
|
581
|
+
nonce,
|
|
582
|
+
gas: 21000n, // Standard ETH transfer gas
|
|
583
|
+
maxFeePerGas: cancelGasPrice.maxFeePerGas,
|
|
584
|
+
maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
|
|
585
|
+
});
|
|
586
|
+
const receipt = await this.monitorTransaction(request, cancelTxHash, { gasLimit: 21000n }, undefined, undefined, true);
|
|
587
|
+
return receipt.transactionHash;
|
|
588
|
+
}
|
|
589
|
+
}
|
|
590
|
+
export function tryGetCustomErrorNameContractFunction(err) {
|
|
591
|
+
return compactArray([err.shortMessage, ...(err.metaMessages ?? []).slice(0, 2).map(s => s.trim())]).join(' ');
|
|
592
|
+
}
|
|
593
|
+
/*
|
|
594
|
+
* Returns cost of calldata usage in Ethereum.
|
|
595
|
+
* @param data - Calldata.
|
|
596
|
+
* @returns 4 for each zero byte, 16 for each nonzero.
|
|
597
|
+
*/
|
|
598
|
+
export function getCalldataGasUsage(data) {
|
|
599
|
+
return data.filter(byte => byte === 0).length * 4 + data.filter(byte => byte !== 0).length * 16;
|
|
438
600
|
}
|
|
439
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1_tx_utils.js","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
601
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1_tx_utils.js","sourceRoot":"","sources":["../src/l1_tx_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { type GasPrice, L1TxUtils } from './l1_tx_utils.js';
|
|
2
|
+
export declare class L1TxUtilsWithBlobs extends L1TxUtils {
|
|
3
|
+
/**
|
|
4
|
+
* Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
|
|
5
|
+
* @param nonce - The nonce of the transaction to cancel
|
|
6
|
+
* @param previousGasPrice - The gas price of the previous transaction
|
|
7
|
+
* @param attempts - The number of attempts to cancel the transaction
|
|
8
|
+
* @returns The hash of the cancellation transaction
|
|
9
|
+
*/
|
|
10
|
+
attemptTxCancellation(nonce: number, isBlobTx?: boolean, previousGasPrice?: GasPrice, attempts?: number): Promise<`0x${string}`>;
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=l1_tx_utils_with_blobs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"l1_tx_utils_with_blobs.d.ts","sourceRoot":"","sources":["../src/l1_tx_utils_with_blobs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE5D,qBAAa,kBAAmB,SAAQ,SAAS;IAC/C;;;;;;OAMG;IACY,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,UAAQ,EAAE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,QAAQ,SAAI;CAuEhH"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Blob } from '@aztec/foundation/blob';
|
|
2
|
+
import { formatGwei } from 'viem';
|
|
3
|
+
import { L1TxUtils } from './l1_tx_utils.js';
|
|
4
|
+
export class L1TxUtilsWithBlobs extends L1TxUtils {
|
|
5
|
+
/**
|
|
6
|
+
* Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
|
|
7
|
+
* @param nonce - The nonce of the transaction to cancel
|
|
8
|
+
* @param previousGasPrice - The gas price of the previous transaction
|
|
9
|
+
* @param attempts - The number of attempts to cancel the transaction
|
|
10
|
+
* @returns The hash of the cancellation transaction
|
|
11
|
+
*/
|
|
12
|
+
async attemptTxCancellation(nonce, isBlobTx = false, previousGasPrice, attempts = 0) {
|
|
13
|
+
const account = this.walletClient.account;
|
|
14
|
+
// Get gas price with higher priority fee for cancellation
|
|
15
|
+
const cancelGasPrice = await this.getGasPrice({
|
|
16
|
+
...this.config,
|
|
17
|
+
// Use high bump for cancellation to ensure it replaces the original tx
|
|
18
|
+
priorityFeeRetryBumpPercentage: 150, // 150% bump should be enough to replace any tx
|
|
19
|
+
}, isBlobTx, attempts + 1, previousGasPrice);
|
|
20
|
+
this.logger?.debug(`Attempting to cancel transaction with nonce ${nonce}`, {
|
|
21
|
+
maxFeePerGas: formatGwei(cancelGasPrice.maxFeePerGas),
|
|
22
|
+
maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas),
|
|
23
|
+
});
|
|
24
|
+
const request = {
|
|
25
|
+
to: account.address,
|
|
26
|
+
value: 0n,
|
|
27
|
+
};
|
|
28
|
+
// Send 0-value tx to self with higher gas price
|
|
29
|
+
if (!isBlobTx) {
|
|
30
|
+
const cancelTxHash = await this.walletClient.sendTransaction({
|
|
31
|
+
...request,
|
|
32
|
+
nonce,
|
|
33
|
+
gas: 21000n, // Standard ETH transfer gas
|
|
34
|
+
maxFeePerGas: cancelGasPrice.maxFeePerGas,
|
|
35
|
+
maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
|
|
36
|
+
});
|
|
37
|
+
const receipt = await this.monitorTransaction(request, cancelTxHash, { gasLimit: 21000n }, undefined, undefined, true);
|
|
38
|
+
return receipt.transactionHash;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
const blobData = new Uint8Array(131072).fill(0);
|
|
42
|
+
const kzg = Blob.getViemKzgInstance();
|
|
43
|
+
const blobInputs = {
|
|
44
|
+
blobs: [blobData],
|
|
45
|
+
kzg,
|
|
46
|
+
maxFeePerBlobGas: cancelGasPrice.maxFeePerBlobGas,
|
|
47
|
+
};
|
|
48
|
+
const cancelTxHash = await this.walletClient.sendTransaction({
|
|
49
|
+
...request,
|
|
50
|
+
...blobInputs,
|
|
51
|
+
nonce,
|
|
52
|
+
gas: 21000n,
|
|
53
|
+
maxFeePerGas: cancelGasPrice.maxFeePerGas,
|
|
54
|
+
maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
|
|
55
|
+
});
|
|
56
|
+
const receipt = await this.monitorTransaction(request, cancelTxHash, { gasLimit: 21000n }, undefined, blobInputs, true);
|
|
57
|
+
return receipt.transactionHash;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdHhfdXRpbHNfd2l0aF9ibG9icy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9sMV90eF91dGlsc193aXRoX2Jsb2JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU5QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRWxDLE9BQU8sRUFBaUIsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFNUQsTUFBTSxPQUFPLGtCQUFtQixTQUFRLFNBQVM7SUFDL0M7Ozs7OztPQU1HO0lBQ00sS0FBSyxDQUFDLHFCQUFxQixDQUFDLEtBQWEsRUFBRSxRQUFRLEdBQUcsS0FBSyxFQUFFLGdCQUEyQixFQUFFLFFBQVEsR0FBRyxDQUFDO1FBQzdHLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDO1FBRTFDLDBEQUEwRDtRQUMxRCxNQUFNLGNBQWMsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQzNDO1lBQ0UsR0FBRyxJQUFJLENBQUMsTUFBTTtZQUNkLHVFQUF1RTtZQUN2RSw4QkFBOEIsRUFBRSxHQUFHLEVBQUUsK0NBQStDO1NBQ3JGLEVBQ0QsUUFBUSxFQUNSLFFBQVEsR0FBRyxDQUFDLEVBQ1osZ0JBQWdCLENBQ2pCLENBQUM7UUFFRixJQUFJLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQywrQ0FBK0MsS0FBSyxFQUFFLEVBQUU7WUFDekUsWUFBWSxFQUFFLFVBQVUsQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDO1lBQ3JELG9CQUFvQixFQUFFLFVBQVUsQ0FBQyxjQUFjLENBQUMsb0JBQW9CLENBQUM7U0FDdEUsQ0FBQyxDQUFDO1FBQ0gsTUFBTSxPQUFPLEdBQUc7WUFDZCxFQUFFLEVBQUUsT0FBTyxDQUFDLE9BQU87WUFDbkIsS0FBSyxFQUFFLEVBQUU7U0FDVixDQUFDO1FBRUYsZ0RBQWdEO1FBQ2hELElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE1BQU0sWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxlQUFlLENBQUM7Z0JBQzNELEdBQUcsT0FBTztnQkFDVixLQUFLO2dCQUNMLEdBQUcsRUFBRSxNQUFPLEVBQUUsNEJBQTRCO2dCQUMxQyxZQUFZLEVBQUUsY0FBYyxDQUFDLFlBQVk7Z0JBQ3pDLG9CQUFvQixFQUFFLGNBQWMsQ0FBQyxvQkFBb0I7YUFDMUQsQ0FBQyxDQUFDO1lBQ0gsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQzNDLE9BQU8sRUFDUCxZQUFZLEVBQ1osRUFBRSxRQUFRLEVBQUUsTUFBTyxFQUFFLEVBQ3JCLFNBQVMsRUFDVCxTQUFTLEVBQ1QsSUFBSSxDQUNMLENBQUM7WUFFRixPQUFPLE9BQU8sQ0FBQyxlQUFlLENBQUM7UUFDakMsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLFFBQVEsR0FBRyxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDaEQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7WUFDdEMsTUFBTSxVQUFVLEdBQUc7Z0JBQ2pCLEtBQUssRUFBRSxDQUFDLFFBQVEsQ0FBQztnQkFDakIsR0FBRztnQkFDSCxnQkFBZ0IsRUFBRSxjQUFjLENBQUMsZ0JBQWlCO2FBQ25ELENBQUM7WUFDRixNQUFNLFlBQVksR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsZUFBZSxDQUFDO2dCQUMzRCxHQUFHLE9BQU87Z0JBQ1YsR0FBRyxVQUFVO2dCQUNiLEtBQUs7Z0JBQ0wsR0FBRyxFQUFFLE1BQU87Z0JBQ1osWUFBWSxFQUFFLGNBQWMsQ0FBQyxZQUFZO2dCQUN6QyxvQkFBb0IsRUFBRSxjQUFjLENBQUMsb0JBQW9CO2FBQzFELENBQUMsQ0FBQztZQUNILE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLGtCQUFrQixDQUMzQyxPQUFPLEVBQ1AsWUFBWSxFQUNaLEVBQUUsUUFBUSxFQUFFLE1BQU8sRUFBRSxFQUNyQixTQUFTLEVBQ1QsVUFBVSxFQUNWLElBQUksQ0FDTCxDQUFDO1lBRUYsT0FBTyxPQUFPLENBQUMsZUFBZSxDQUFDO1FBQ2pDLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
2
|
+
import { type Chain, type HttpTransport, type PublicClient } from 'viem';
|
|
3
|
+
import { type L1ContractsConfig } from './config.js';
|
|
4
|
+
import { type L1ContractAddresses } from './l1_contract_addresses.js';
|
|
5
|
+
/** Given the Governance contract address, reads the addresses from all other contracts from L1. */
|
|
6
|
+
export declare function getL1ContractsAddresses(publicClient: PublicClient<HttpTransport, Chain>, governanceAddress: EthAddress): Promise<Omit<L1ContractAddresses, 'slashFactoryAddress' | 'coinIssuerAddress'>>;
|
|
7
|
+
/** Reads the L1ContractsConfig from L1 contracts. */
|
|
8
|
+
export declare function getL1ContractsConfig(publicClient: PublicClient<HttpTransport, Chain>, addresses: {
|
|
9
|
+
governanceAddress: EthAddress;
|
|
10
|
+
rollupAddress?: EthAddress;
|
|
11
|
+
}): Promise<Omit<L1ContractsConfig, 'ethereumSlotDuration'> & {
|
|
12
|
+
l1StartBlock: bigint;
|
|
13
|
+
l1GenesisTime: bigint;
|
|
14
|
+
}>;
|
|
15
|
+
//# sourceMappingURL=queries.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,mGAAmG;AACnG,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,iBAAiB,EAAE,UAAU,GAC5B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,qBAAqB,GAAG,mBAAmB,CAAC,CAAC,CAWjF;AAED,qDAAqD;AACrD,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,SAAS,EAAE;IAAE,iBAAiB,EAAE,UAAU,CAAC;IAAC,aAAa,CAAC,EAAE,UAAU,CAAA;CAAE,GACvE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAAG;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CA8C5G"}
|
package/dest/queries.js
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { GovernanceContract } from './contracts/governance.js';
|
|
2
|
+
import { RollupContract } from './contracts/rollup.js';
|
|
3
|
+
/** Given the Governance contract address, reads the addresses from all other contracts from L1. */
|
|
4
|
+
export async function getL1ContractsAddresses(publicClient, governanceAddress) {
|
|
5
|
+
const governance = new GovernanceContract(publicClient, governanceAddress.toString());
|
|
6
|
+
const governanceAddresses = await governance.getGovernanceAddresses();
|
|
7
|
+
const rollup = new RollupContract(publicClient, governanceAddresses.rollupAddress.toString());
|
|
8
|
+
const rollupAddresses = await rollup.getRollupAddresses();
|
|
9
|
+
return {
|
|
10
|
+
...governanceAddresses,
|
|
11
|
+
...rollupAddresses,
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
/** Reads the L1ContractsConfig from L1 contracts. */
|
|
15
|
+
export async function getL1ContractsConfig(publicClient, addresses) {
|
|
16
|
+
const governance = new GovernanceContract(publicClient, addresses.governanceAddress.toString());
|
|
17
|
+
const governanceProposer = await governance.getProposer();
|
|
18
|
+
const rollupAddress = addresses.rollupAddress ?? (await governance.getGovernanceAddresses()).rollupAddress;
|
|
19
|
+
const rollup = new RollupContract(publicClient, rollupAddress.toString());
|
|
20
|
+
const slasherProposer = await rollup.getSlashingProposer();
|
|
21
|
+
const [l1StartBlock, l1GenesisTime, aztecEpochDuration, aztecEpochProofClaimWindowInL2Slots, aztecSlotDuration, aztecTargetCommitteeSize, minimumStake, governanceProposerQuorum, governanceProposerRoundSize, slashingQuorum, slashingRoundSize,] = await Promise.all([
|
|
22
|
+
rollup.getL1StartBlock(),
|
|
23
|
+
rollup.getL1GenesisTime(),
|
|
24
|
+
rollup.getEpochDuration(),
|
|
25
|
+
rollup.getClaimDurationInL2Slots(),
|
|
26
|
+
rollup.getSlotDuration(),
|
|
27
|
+
rollup.getTargetCommitteeSize(),
|
|
28
|
+
rollup.getMinimumStake(),
|
|
29
|
+
governanceProposer.getQuorumSize(),
|
|
30
|
+
governanceProposer.getRoundSize(),
|
|
31
|
+
slasherProposer.getQuorumSize(),
|
|
32
|
+
slasherProposer.getRoundSize(),
|
|
33
|
+
]);
|
|
34
|
+
return {
|
|
35
|
+
l1StartBlock,
|
|
36
|
+
l1GenesisTime,
|
|
37
|
+
aztecEpochDuration: Number(aztecEpochDuration),
|
|
38
|
+
aztecEpochProofClaimWindowInL2Slots: Number(aztecEpochProofClaimWindowInL2Slots),
|
|
39
|
+
aztecSlotDuration: Number(aztecSlotDuration),
|
|
40
|
+
aztecTargetCommitteeSize: Number(aztecTargetCommitteeSize),
|
|
41
|
+
governanceProposerQuorum: Number(governanceProposerQuorum),
|
|
42
|
+
governanceProposerRoundSize: Number(governanceProposerRoundSize),
|
|
43
|
+
minimumStake,
|
|
44
|
+
slashingQuorum: Number(slashingQuorum),
|
|
45
|
+
slashingRoundSize: Number(slashingRoundSize),
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcmllcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9xdWVyaWVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQy9ELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUd2RCxtR0FBbUc7QUFDbkcsTUFBTSxDQUFDLEtBQUssVUFBVSx1QkFBdUIsQ0FDM0MsWUFBZ0QsRUFDaEQsaUJBQTZCO0lBRTdCLE1BQU0sVUFBVSxHQUFHLElBQUksa0JBQWtCLENBQUMsWUFBWSxFQUFFLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDdEYsTUFBTSxtQkFBbUIsR0FBRyxNQUFNLFVBQVUsQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBRXRFLE1BQU0sTUFBTSxHQUFHLElBQUksY0FBYyxDQUFDLFlBQVksRUFBRSxtQkFBbUIsQ0FBQyxhQUFhLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUM5RixNQUFNLGVBQWUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO0lBRTFELE9BQU87UUFDTCxHQUFHLG1CQUFtQjtRQUN0QixHQUFHLGVBQWU7S0FDbkIsQ0FBQztBQUNKLENBQUM7QUFFRCxxREFBcUQ7QUFDckQsTUFBTSxDQUFDLEtBQUssVUFBVSxvQkFBb0IsQ0FDeEMsWUFBZ0QsRUFDaEQsU0FBd0U7SUFFeEUsTUFBTSxVQUFVLEdBQUcsSUFBSSxrQkFBa0IsQ0FBQyxZQUFZLEVBQUUsU0FBUyxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDaEcsTUFBTSxrQkFBa0IsR0FBRyxNQUFNLFVBQVUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUMxRCxNQUFNLGFBQWEsR0FBRyxTQUFTLENBQUMsYUFBYSxJQUFJLENBQUMsTUFBTSxVQUFVLENBQUMsc0JBQXNCLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQztJQUMzRyxNQUFNLE1BQU0sR0FBRyxJQUFJLGNBQWMsQ0FBQyxZQUFZLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFDMUUsTUFBTSxlQUFlLEdBQUcsTUFBTSxNQUFNLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztJQUUzRCxNQUFNLENBQ0osWUFBWSxFQUNaLGFBQWEsRUFDYixrQkFBa0IsRUFDbEIsbUNBQW1DLEVBQ25DLGlCQUFpQixFQUNqQix3QkFBd0IsRUFDeEIsWUFBWSxFQUNaLHdCQUF3QixFQUN4QiwyQkFBMkIsRUFDM0IsY0FBYyxFQUNkLGlCQUFpQixFQUNsQixHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FBQztRQUNwQixNQUFNLENBQUMsZUFBZSxFQUFFO1FBQ3hCLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRTtRQUN6QixNQUFNLENBQUMsZ0JBQWdCLEVBQUU7UUFDekIsTUFBTSxDQUFDLHlCQUF5QixFQUFFO1FBQ2xDLE1BQU0sQ0FBQyxlQUFlLEVBQUU7UUFDeEIsTUFBTSxDQUFDLHNCQUFzQixFQUFFO1FBQy9CLE1BQU0sQ0FBQyxlQUFlLEVBQUU7UUFDeEIsa0JBQWtCLENBQUMsYUFBYSxFQUFFO1FBQ2xDLGtCQUFrQixDQUFDLFlBQVksRUFBRTtRQUNqQyxlQUFlLENBQUMsYUFBYSxFQUFFO1FBQy9CLGVBQWUsQ0FBQyxZQUFZLEVBQUU7S0FDdEIsQ0FBQyxDQUFDO0lBRVosT0FBTztRQUNMLFlBQVk7UUFDWixhQUFhO1FBQ2Isa0JBQWtCLEVBQUUsTUFBTSxDQUFDLGtCQUFrQixDQUFDO1FBQzlDLG1DQUFtQyxFQUFFLE1BQU0sQ0FBQyxtQ0FBbUMsQ0FBQztRQUNoRixpQkFBaUIsRUFBRSxNQUFNLENBQUMsaUJBQWlCLENBQUM7UUFDNUMsd0JBQXdCLEVBQUUsTUFBTSxDQUFDLHdCQUF3QixDQUFDO1FBQzFELHdCQUF3QixFQUFFLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQztRQUMxRCwyQkFBMkIsRUFBRSxNQUFNLENBQUMsMkJBQTJCLENBQUM7UUFDaEUsWUFBWTtRQUNaLGNBQWMsRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDO1FBQ3RDLGlCQUFpQixFQUFFLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztLQUM3QyxDQUFDO0FBQ0osQ0FBQyJ9
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
|
|
2
|
+
import { type Delayer } from './tx_delayer.js';
|
|
3
|
+
export declare class DelayedTxUtils extends L1TxUtilsWithBlobs {
|
|
4
|
+
delayer: Delayer | undefined;
|
|
5
|
+
static fromL1TxUtils(l1TxUtils: L1TxUtilsWithBlobs, ethereumSlotDuration: number): DelayedTxUtils;
|
|
6
|
+
enableDelayer(ethereumSlotDuration: number): void;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=delayed_tx_utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"delayed_tx_utils.d.ts","sourceRoot":"","sources":["../../src/test/delayed_tx_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,KAAK,OAAO,EAAe,MAAM,iBAAiB,CAAC;AAE5D,qBAAa,cAAe,SAAQ,kBAAkB;IAC7C,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;WAEtB,aAAa,CAAC,SAAS,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM;IAUhF,aAAa,CAAC,oBAAoB,EAAE,MAAM;CAOlD"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { L1TxUtilsWithBlobs } from '../l1_tx_utils_with_blobs.js';
|
|
2
|
+
import { withDelayer } from './tx_delayer.js';
|
|
3
|
+
export class DelayedTxUtils extends L1TxUtilsWithBlobs {
|
|
4
|
+
static fromL1TxUtils(l1TxUtils, ethereumSlotDuration) {
|
|
5
|
+
const { client, delayer } = withDelayer(l1TxUtils.walletClient, {
|
|
6
|
+
ethereumSlotDuration,
|
|
7
|
+
});
|
|
8
|
+
const casted = l1TxUtils;
|
|
9
|
+
casted.delayer = delayer;
|
|
10
|
+
casted.walletClient = client;
|
|
11
|
+
return casted;
|
|
12
|
+
}
|
|
13
|
+
enableDelayer(ethereumSlotDuration) {
|
|
14
|
+
const { client, delayer } = withDelayer(this.walletClient, {
|
|
15
|
+
ethereumSlotDuration,
|
|
16
|
+
});
|
|
17
|
+
this.delayer = delayer;
|
|
18
|
+
this.walletClient = client;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVsYXllZF90eF91dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L2RlbGF5ZWRfdHhfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDbEUsT0FBTyxFQUFnQixXQUFXLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUU1RCxNQUFNLE9BQU8sY0FBZSxTQUFRLGtCQUFrQjtJQUc3QyxNQUFNLENBQUMsYUFBYSxDQUFDLFNBQTZCLEVBQUUsb0JBQTRCO1FBQ3JGLE1BQU0sRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsV0FBVyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQUU7WUFDOUQsb0JBQW9CO1NBQ3JCLENBQUMsQ0FBQztRQUNILE1BQU0sTUFBTSxHQUFHLFNBQXNDLENBQUM7UUFDdEQsTUFBTSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDekIsTUFBTSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7UUFDN0IsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVNLGFBQWEsQ0FBQyxvQkFBNEI7UUFDL0MsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUN6RCxvQkFBb0I7U0FDckIsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7SUFDN0IsQ0FBQztDQUNGIn0=
|
package/dest/test/index.d.ts
CHANGED
package/dest/test/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC"}
|
package/dest/test/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
export * from './delayed_tx_utils.js';
|
|
2
|
+
export * from './eth_cheat_codes_with_state.js';
|
|
1
3
|
export * from './start_anvil.js';
|
|
2
4
|
export * from './tx_delayer.js';
|
|
3
|
-
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyxpQ0FBaUMsQ0FBQyJ9
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGlCQUFpQixDQUFDIn0=
|