@aztec/ethereum 0.69.0-devnet → 0.69.1-devnet
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/deploy_l1_contracts.js +3 -3
- package/dest/l1_tx_utils.d.ts +24 -9
- package/dest/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils.js +154 -56
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +15 -8
- package/dest/test/tx_delayer.js +4 -4
- package/dest/utils.d.ts +2 -0
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +95 -2
- package/package.json +3 -4
- package/src/deploy_l1_contracts.ts +2 -2
- package/src/l1_tx_utils.ts +187 -65
- package/src/test/start_anvil.ts +17 -8
- package/src/test/tx_delayer.ts +3 -3
- package/src/utils.ts +109 -0
package/dest/l1_tx_utils.js
CHANGED
|
@@ -3,20 +3,24 @@ import { bigintConfigHelper, getDefaultConfig, numberConfigHelper, } from '@azte
|
|
|
3
3
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
4
4
|
import { sleep } from '@aztec/foundation/sleep';
|
|
5
5
|
import { formatGwei, } from 'viem';
|
|
6
|
+
import { formatViemError } from './utils.js';
|
|
6
7
|
// 1_000_000_000 Gwei = 1 ETH
|
|
7
8
|
// 1_000_000_000 Wei = 1 Gwei
|
|
8
9
|
// 1_000_000_000_000_000_000 Wei = 1 ETH
|
|
9
10
|
const WEI_CONST = 1000000000n;
|
|
10
11
|
// setting a minimum bump percentage to 10% due to geth's implementation
|
|
11
12
|
// https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
|
|
12
|
-
const MIN_REPLACEMENT_BUMP_PERCENTAGE =
|
|
13
|
+
const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
|
|
14
|
+
// setting a minimum bump percentage to 100% due to geth's implementation
|
|
15
|
+
// https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/blobpool/config.go#L34
|
|
16
|
+
const MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE = 100;
|
|
13
17
|
// Avg ethereum block time is ~12s
|
|
14
18
|
const BLOCK_TIME_MS = 12000;
|
|
15
19
|
export const l1TxUtilsConfigMappings = {
|
|
16
20
|
gasLimitBufferPercentage: {
|
|
17
21
|
description: 'How much to increase gas price by each attempt (percentage)',
|
|
18
22
|
env: 'L1_GAS_LIMIT_BUFFER_PERCENTAGE',
|
|
19
|
-
...
|
|
23
|
+
...numberConfigHelper(10),
|
|
20
24
|
},
|
|
21
25
|
minGwei: {
|
|
22
26
|
description: 'Minimum gas price in gwei',
|
|
@@ -28,15 +32,25 @@ export const l1TxUtilsConfigMappings = {
|
|
|
28
32
|
env: 'L1_GAS_PRICE_MAX',
|
|
29
33
|
...bigintConfigHelper(100n),
|
|
30
34
|
},
|
|
35
|
+
maxBlobGwei: {
|
|
36
|
+
description: 'Maximum blob fee per gas in gwei',
|
|
37
|
+
env: 'L1_BLOB_FEE_PER_GAS_MAX',
|
|
38
|
+
...bigintConfigHelper(1500n),
|
|
39
|
+
},
|
|
31
40
|
priorityFeeBumpPercentage: {
|
|
32
41
|
description: 'How much to increase priority fee by each attempt (percentage)',
|
|
33
42
|
env: 'L1_PRIORITY_FEE_BUMP_PERCENTAGE',
|
|
34
|
-
...
|
|
43
|
+
...numberConfigHelper(20),
|
|
35
44
|
},
|
|
36
45
|
priorityFeeRetryBumpPercentage: {
|
|
37
46
|
description: 'How much to increase priority fee by each retry attempt (percentage)',
|
|
38
47
|
env: 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE',
|
|
39
|
-
...
|
|
48
|
+
...numberConfigHelper(50),
|
|
49
|
+
},
|
|
50
|
+
fixedPriorityFeePerGas: {
|
|
51
|
+
description: 'Fixed priority fee per gas in Gwei. Overrides any priority fee bump percentage',
|
|
52
|
+
env: 'L1_FIXED_PRIORITY_FEE_PER_GAS',
|
|
53
|
+
...numberConfigHelper(0),
|
|
40
54
|
},
|
|
41
55
|
maxAttempts: {
|
|
42
56
|
description: 'Maximum number of speed-up attempts',
|
|
@@ -51,7 +65,7 @@ export const l1TxUtilsConfigMappings = {
|
|
|
51
65
|
stallTimeMs: {
|
|
52
66
|
description: 'How long before considering tx stalled',
|
|
53
67
|
env: 'L1_TX_MONITOR_STALL_TIME_MS',
|
|
54
|
-
...numberConfigHelper(
|
|
68
|
+
...numberConfigHelper(45000),
|
|
55
69
|
},
|
|
56
70
|
txTimeoutMs: {
|
|
57
71
|
description: 'How long to wait for a tx to be mined before giving up. Set to 0 to disable.',
|
|
@@ -81,31 +95,53 @@ export class L1TxUtils {
|
|
|
81
95
|
* @param gasConfig - Optional gas configuration
|
|
82
96
|
* @returns The transaction hash and parameters used
|
|
83
97
|
*/
|
|
84
|
-
async sendTransaction(request, _gasConfig,
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
98
|
+
async sendTransaction(request, _gasConfig, blobInputs) {
|
|
99
|
+
try {
|
|
100
|
+
const gasConfig = { ...this.config, ..._gasConfig };
|
|
101
|
+
const account = this.walletClient.account;
|
|
102
|
+
let gasLimit;
|
|
103
|
+
if (gasConfig.fixedGas) {
|
|
104
|
+
gasLimit = gasConfig.fixedGas;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
gasLimit = await this.estimateGas(account, request);
|
|
108
|
+
}
|
|
109
|
+
const gasPrice = await this.getGasPrice(gasConfig, !!blobInputs);
|
|
110
|
+
if (gasConfig.txTimeoutAt && Date.now() > gasConfig.txTimeoutAt.getTime()) {
|
|
111
|
+
throw new Error('Transaction timed out before sending');
|
|
112
|
+
}
|
|
113
|
+
let txHash;
|
|
114
|
+
if (blobInputs) {
|
|
115
|
+
txHash = await this.walletClient.sendTransaction({
|
|
116
|
+
...request,
|
|
117
|
+
...blobInputs,
|
|
118
|
+
gas: gasLimit,
|
|
119
|
+
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
120
|
+
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
121
|
+
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
txHash = await this.walletClient.sendTransaction({
|
|
126
|
+
...request,
|
|
127
|
+
gas: gasLimit,
|
|
128
|
+
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
129
|
+
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
this.logger?.verbose(`Sent L1 transaction ${txHash}`, {
|
|
133
|
+
gasLimit,
|
|
134
|
+
maxFeePerGas: formatGwei(gasPrice.maxFeePerGas),
|
|
135
|
+
maxPriorityFeePerGas: formatGwei(gasPrice.maxPriorityFeePerGas),
|
|
136
|
+
...(gasPrice.maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(gasPrice.maxFeePerBlobGas) }),
|
|
137
|
+
});
|
|
138
|
+
return { txHash, gasLimit, gasPrice };
|
|
90
139
|
}
|
|
91
|
-
|
|
92
|
-
|
|
140
|
+
catch (err) {
|
|
141
|
+
const formattedErr = formatViemError(err);
|
|
142
|
+
this.logger?.error(`Failed to send transaction`, formattedErr);
|
|
143
|
+
throw formattedErr;
|
|
93
144
|
}
|
|
94
|
-
const gasPrice = await this.getGasPrice(gasConfig);
|
|
95
|
-
const blobInputs = _blobInputs || {};
|
|
96
|
-
const txHash = await this.walletClient.sendTransaction({
|
|
97
|
-
...request,
|
|
98
|
-
...blobInputs,
|
|
99
|
-
gas: gasLimit,
|
|
100
|
-
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
101
|
-
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
102
|
-
});
|
|
103
|
-
this.logger?.verbose(`Sent L1 transaction ${txHash}`, {
|
|
104
|
-
gasLimit,
|
|
105
|
-
maxFeePerGas: formatGwei(gasPrice.maxFeePerGas),
|
|
106
|
-
maxPriorityFeePerGas: formatGwei(gasPrice.maxPriorityFeePerGas),
|
|
107
|
-
});
|
|
108
|
-
return { txHash, gasLimit, gasPrice };
|
|
109
145
|
}
|
|
110
146
|
/**
|
|
111
147
|
* Monitors a transaction until completion, handling speed-ups if needed
|
|
@@ -131,6 +167,9 @@ export class L1TxUtils {
|
|
|
131
167
|
let lastAttemptSent = Date.now();
|
|
132
168
|
const initialTxTime = lastAttemptSent;
|
|
133
169
|
let txTimedOut = false;
|
|
170
|
+
const isTimedOut = () => (gasConfig.txTimeoutAt && Date.now() > gasConfig.txTimeoutAt.getTime()) ||
|
|
171
|
+
(gasConfig.txTimeoutMs !== undefined && Date.now() - initialTxTime > gasConfig.txTimeoutMs) ||
|
|
172
|
+
false;
|
|
134
173
|
while (!txTimedOut) {
|
|
135
174
|
try {
|
|
136
175
|
const currentNonce = await this.publicClient.getTransactionCount({ address: account.address });
|
|
@@ -159,22 +198,28 @@ export class L1TxUtils {
|
|
|
159
198
|
if (tx && timePassed < gasConfig.stallTimeMs) {
|
|
160
199
|
this.logger?.debug(`L1 transaction ${currentTxHash} pending. Time passed: ${timePassed}ms.`);
|
|
161
200
|
// Check timeout before continuing
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
break;
|
|
166
|
-
}
|
|
201
|
+
txTimedOut = isTimedOut();
|
|
202
|
+
if (txTimedOut) {
|
|
203
|
+
break;
|
|
167
204
|
}
|
|
168
205
|
await sleep(gasConfig.checkIntervalMs);
|
|
169
206
|
continue;
|
|
170
207
|
}
|
|
171
208
|
if (timePassed > gasConfig.stallTimeMs && attempts < gasConfig.maxAttempts) {
|
|
172
209
|
attempts++;
|
|
173
|
-
const newGasPrice = await this.getGasPrice(gasConfig, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas
|
|
174
|
-
? {
|
|
210
|
+
const newGasPrice = await this.getGasPrice(gasConfig, !!blobInputs, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas
|
|
211
|
+
? {
|
|
212
|
+
maxFeePerGas: tx.maxFeePerGas,
|
|
213
|
+
maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
|
|
214
|
+
maxFeePerBlobGas: tx.maxFeePerBlobGas,
|
|
215
|
+
}
|
|
175
216
|
: undefined);
|
|
176
217
|
this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` +
|
|
177
|
-
`with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei
|
|
218
|
+
`with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`, {
|
|
219
|
+
maxFeePerGas: formatGwei(newGasPrice.maxFeePerGas),
|
|
220
|
+
maxPriorityFeePerGas: formatGwei(newGasPrice.maxPriorityFeePerGas),
|
|
221
|
+
...(newGasPrice.maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(newGasPrice.maxFeePerBlobGas) }),
|
|
222
|
+
});
|
|
178
223
|
currentTxHash = await this.walletClient.sendTransaction({
|
|
179
224
|
...request,
|
|
180
225
|
...blobInputs,
|
|
@@ -189,16 +234,15 @@ export class L1TxUtils {
|
|
|
189
234
|
await sleep(gasConfig.checkIntervalMs);
|
|
190
235
|
}
|
|
191
236
|
catch (err) {
|
|
192
|
-
|
|
237
|
+
const formattedErr = formatViemError(err);
|
|
238
|
+
this.logger?.warn(`Error monitoring tx ${currentTxHash}:`, formattedErr);
|
|
193
239
|
if (err.message?.includes('reverted')) {
|
|
194
|
-
throw
|
|
240
|
+
throw formattedErr;
|
|
195
241
|
}
|
|
196
242
|
await sleep(gasConfig.checkIntervalMs);
|
|
197
243
|
}
|
|
198
244
|
// Check if tx has timed out.
|
|
199
|
-
|
|
200
|
-
txTimedOut = Date.now() - initialTxTime > gasConfig.txTimeoutMs;
|
|
201
|
-
}
|
|
245
|
+
txTimedOut = isTimedOut();
|
|
202
246
|
}
|
|
203
247
|
throw new Error(`L1 transaction ${currentTxHash} timed out`);
|
|
204
248
|
}
|
|
@@ -209,31 +253,58 @@ export class L1TxUtils {
|
|
|
209
253
|
* @returns The receipt of the successful transaction
|
|
210
254
|
*/
|
|
211
255
|
async sendAndMonitorTransaction(request, gasConfig, blobInputs) {
|
|
212
|
-
const { txHash, gasLimit } = await this.sendTransaction(request, gasConfig, blobInputs);
|
|
213
|
-
|
|
256
|
+
const { txHash, gasLimit, gasPrice } = await this.sendTransaction(request, gasConfig, blobInputs);
|
|
257
|
+
const receipt = await this.monitorTransaction(request, txHash, { gasLimit }, gasConfig, blobInputs);
|
|
258
|
+
return { receipt, gasPrice };
|
|
214
259
|
}
|
|
215
260
|
/**
|
|
216
261
|
* Gets the current gas price with bounds checking
|
|
217
262
|
*/
|
|
218
|
-
async getGasPrice(_gasConfig, attempt = 0, previousGasPrice) {
|
|
263
|
+
async getGasPrice(_gasConfig, isBlobTx = false, attempt = 0, previousGasPrice) {
|
|
219
264
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
220
265
|
const block = await this.publicClient.getBlock({ blockTag: 'latest' });
|
|
221
266
|
const baseFee = block.baseFeePerGas ?? 0n;
|
|
222
|
-
// Get
|
|
223
|
-
let
|
|
267
|
+
// Get blob base fee if available
|
|
268
|
+
let blobBaseFee = 0n;
|
|
269
|
+
try {
|
|
270
|
+
const blobBaseFeeHex = await this.publicClient.request({ method: 'eth_blobBaseFee' });
|
|
271
|
+
blobBaseFee = BigInt(blobBaseFeeHex);
|
|
272
|
+
this.logger?.debug('Blob base fee:', { blobBaseFee: formatGwei(blobBaseFee) });
|
|
273
|
+
}
|
|
274
|
+
catch {
|
|
275
|
+
this.logger?.warn('Failed to get blob base fee', attempt);
|
|
276
|
+
}
|
|
277
|
+
let priorityFee;
|
|
278
|
+
if (gasConfig.fixedPriorityFeePerGas) {
|
|
279
|
+
this.logger?.debug('Using fixed priority fee per gas', {
|
|
280
|
+
fixedPriorityFeePerGas: gasConfig.fixedPriorityFeePerGas,
|
|
281
|
+
});
|
|
282
|
+
// try to maintain precision up to 1000000 wei
|
|
283
|
+
priorityFee = BigInt(gasConfig.fixedPriorityFeePerGas * 1000000) * (WEI_CONST / 1000000n);
|
|
284
|
+
}
|
|
285
|
+
else {
|
|
286
|
+
// Get initial priority fee from the network
|
|
287
|
+
priorityFee = await this.publicClient.estimateMaxPriorityFeePerGas();
|
|
288
|
+
}
|
|
224
289
|
let maxFeePerGas = baseFee;
|
|
290
|
+
let maxFeePerBlobGas = blobBaseFee;
|
|
225
291
|
// Bump base fee so it's valid for next blocks if it stalls
|
|
226
292
|
const numBlocks = Math.ceil(gasConfig.stallTimeMs / BLOCK_TIME_MS);
|
|
227
293
|
for (let i = 0; i < numBlocks; i++) {
|
|
228
294
|
// each block can go up 12.5% from previous baseFee
|
|
229
295
|
maxFeePerGas = (maxFeePerGas * (1000n + 125n)) / 1000n;
|
|
296
|
+
// same for blob gas fee
|
|
297
|
+
maxFeePerBlobGas = (maxFeePerBlobGas * (1000n + 125n)) / 1000n;
|
|
230
298
|
}
|
|
231
299
|
if (attempt > 0) {
|
|
232
300
|
const configBump = gasConfig.priorityFeeRetryBumpPercentage ?? defaultL1TxUtilsConfig.priorityFeeRetryBumpPercentage;
|
|
233
|
-
|
|
301
|
+
// if this is a blob tx, we have to use the blob bump percentage
|
|
302
|
+
const minBumpPercentage = isBlobTx ? MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE : MIN_REPLACEMENT_BUMP_PERCENTAGE;
|
|
303
|
+
const bumpPercentage = configBump > minBumpPercentage ? configBump : minBumpPercentage;
|
|
234
304
|
// Calculate minimum required fees based on previous attempt
|
|
235
|
-
|
|
236
|
-
const
|
|
305
|
+
// multiply by 100 & divide by 100 to maintain some precision
|
|
306
|
+
const minPriorityFee = (previousGasPrice.maxPriorityFeePerGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
|
|
307
|
+
const minMaxFee = (previousGasPrice.maxFeePerGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
|
|
237
308
|
// Add priority fee to maxFeePerGas
|
|
238
309
|
maxFeePerGas += priorityFee;
|
|
239
310
|
// Use maximum between current network values and minimum required values
|
|
@@ -241,22 +312,44 @@ export class L1TxUtils {
|
|
|
241
312
|
maxFeePerGas = maxFeePerGas > minMaxFee ? maxFeePerGas : minMaxFee;
|
|
242
313
|
}
|
|
243
314
|
else {
|
|
244
|
-
// first attempt, just bump priority fee
|
|
245
|
-
|
|
315
|
+
// first attempt, just bump priority fee, unless it's a fixed config
|
|
316
|
+
// multiply by 100 & divide by 100 to maintain some precision
|
|
317
|
+
if (!gasConfig.fixedPriorityFeePerGas) {
|
|
318
|
+
priorityFee = (priorityFee * (10000n + BigInt((gasConfig.priorityFeeBumpPercentage || 0) * 100))) / 10000n;
|
|
319
|
+
}
|
|
246
320
|
maxFeePerGas += priorityFee;
|
|
247
321
|
}
|
|
248
322
|
// Ensure we don't exceed maxGwei
|
|
249
323
|
const maxGweiInWei = gasConfig.maxGwei * WEI_CONST;
|
|
250
324
|
maxFeePerGas = maxFeePerGas > maxGweiInWei ? maxGweiInWei : maxFeePerGas;
|
|
325
|
+
// Ensure we don't exceed maxBlobGwei
|
|
326
|
+
if (maxFeePerBlobGas) {
|
|
327
|
+
const maxBlobGweiInWei = gasConfig.maxBlobGwei * WEI_CONST;
|
|
328
|
+
maxFeePerBlobGas = maxFeePerBlobGas > maxBlobGweiInWei ? maxBlobGweiInWei : maxFeePerBlobGas;
|
|
329
|
+
}
|
|
251
330
|
// Ensure priority fee doesn't exceed max fee
|
|
252
331
|
const maxPriorityFeePerGas = priorityFee > maxFeePerGas ? maxFeePerGas : priorityFee;
|
|
332
|
+
if (attempt > 0 && previousGasPrice?.maxFeePerBlobGas) {
|
|
333
|
+
const bumpPercentage = gasConfig.priorityFeeRetryBumpPercentage > MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE
|
|
334
|
+
? gasConfig.priorityFeeRetryBumpPercentage
|
|
335
|
+
: MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE;
|
|
336
|
+
// calculate min blob fee based on previous attempt
|
|
337
|
+
const minBlobFee = (previousGasPrice.maxFeePerBlobGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
|
|
338
|
+
// use max between current network values and min required values
|
|
339
|
+
maxFeePerBlobGas = maxFeePerBlobGas > minBlobFee ? maxFeePerBlobGas : minBlobFee;
|
|
340
|
+
}
|
|
253
341
|
this.logger?.debug(`Computed gas price`, {
|
|
254
342
|
attempt,
|
|
255
343
|
baseFee: formatGwei(baseFee),
|
|
256
344
|
maxFeePerGas: formatGwei(maxFeePerGas),
|
|
257
345
|
maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
|
|
346
|
+
...(maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(maxFeePerBlobGas) }),
|
|
258
347
|
});
|
|
259
|
-
return {
|
|
348
|
+
return {
|
|
349
|
+
maxFeePerGas,
|
|
350
|
+
maxPriorityFeePerGas,
|
|
351
|
+
...(maxFeePerBlobGas && { maxFeePerBlobGas: maxFeePerBlobGas }),
|
|
352
|
+
};
|
|
260
353
|
}
|
|
261
354
|
/**
|
|
262
355
|
* Estimates gas and adds buffer
|
|
@@ -268,15 +361,20 @@ export class L1TxUtils {
|
|
|
268
361
|
// Strangely, the only way to get gas and send blobs is prepareTransactionRequest().
|
|
269
362
|
// See: https://github.com/wevm/viem/issues/2075
|
|
270
363
|
if (_blobInputs) {
|
|
271
|
-
|
|
272
|
-
|
|
364
|
+
const gasPrice = await this.getGasPrice(gasConfig, true, 0);
|
|
365
|
+
initialEstimate = (await this.walletClient.prepareTransactionRequest({
|
|
366
|
+
account,
|
|
367
|
+
...request,
|
|
368
|
+
..._blobInputs,
|
|
369
|
+
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
|
|
370
|
+
}))?.gas;
|
|
273
371
|
}
|
|
274
372
|
else {
|
|
275
373
|
initialEstimate = await this.publicClient.estimateGas({ account, ...request });
|
|
276
374
|
}
|
|
277
375
|
// Add buffer based on either fixed amount or percentage
|
|
278
|
-
const withBuffer = initialEstimate + (initialEstimate * (gasConfig.gasLimitBufferPercentage
|
|
376
|
+
const withBuffer = initialEstimate + (initialEstimate * BigInt((gasConfig.gasLimitBufferPercentage || 0) * 100)) / 10000n;
|
|
279
377
|
return withBuffer;
|
|
280
378
|
}
|
|
281
379
|
}
|
|
282
|
-
//# 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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"}
|
|
380
|
+
//# 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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"start_anvil.d.ts","sourceRoot":"","sources":["../../src/test/start_anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAe,MAAM,aAAa,CAAC;AAGtD;;GAEG;AACH,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAsChG"}
|
package/dest/test/start_anvil.js
CHANGED
|
@@ -1,30 +1,37 @@
|
|
|
1
1
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
2
2
|
import { fileURLToPath } from '@aztec/foundation/url';
|
|
3
3
|
import { createAnvil } from '@viem/anvil';
|
|
4
|
-
import getPort from 'get-port';
|
|
5
4
|
import { dirname, resolve } from 'path';
|
|
6
5
|
/**
|
|
7
6
|
* Ensures there's a running Anvil instance and returns the RPC URL.
|
|
8
7
|
*/
|
|
9
8
|
export async function startAnvil(l1BlockTime) {
|
|
10
|
-
let ethereumHostPort;
|
|
11
9
|
const anvilBinary = resolve(dirname(fileURLToPath(import.meta.url)), '../../', 'scripts/anvil_kill_wrapper.sh');
|
|
10
|
+
let port;
|
|
12
11
|
// Start anvil.
|
|
13
12
|
// We go via a wrapper script to ensure if the parent dies, anvil dies.
|
|
14
13
|
const anvil = await retry(async () => {
|
|
15
|
-
ethereumHostPort = await getPort();
|
|
16
14
|
const anvil = createAnvil({
|
|
17
15
|
anvilBinary,
|
|
18
|
-
port:
|
|
16
|
+
port: 0,
|
|
19
17
|
blockTime: l1BlockTime,
|
|
18
|
+
stopTimeout: 1000,
|
|
19
|
+
});
|
|
20
|
+
// Listen to the anvil output to get the port.
|
|
21
|
+
const removeHandler = anvil.on('message', (message) => {
|
|
22
|
+
if (port === undefined && message.includes('Listening on')) {
|
|
23
|
+
port = parseInt(message.match(/Listening on ([^:]+):(\d+)/)[2]);
|
|
24
|
+
}
|
|
20
25
|
});
|
|
21
26
|
await anvil.start();
|
|
27
|
+
removeHandler();
|
|
22
28
|
return anvil;
|
|
23
29
|
}, 'Start anvil', makeBackoff([5, 5, 5]));
|
|
24
|
-
if (!
|
|
30
|
+
if (!port) {
|
|
25
31
|
throw new Error('Failed to start anvil');
|
|
26
32
|
}
|
|
27
|
-
|
|
28
|
-
|
|
33
|
+
// Monkeypatch the anvil instance to include the actually assigned port
|
|
34
|
+
Object.defineProperty(anvil, 'port', { value: port, writable: false });
|
|
35
|
+
return { anvil, rpcUrl: `http://127.0.0.1:${port}` };
|
|
29
36
|
}
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYW52aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdC9zdGFydF9hbnZpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzdELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV0RCxPQUFPLEVBQWMsV0FBVyxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3RELE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBRXhDOztHQUVHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxVQUFVLENBQUMsV0FBb0I7SUFDbkQsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLFFBQVEsRUFBRSwrQkFBK0IsQ0FBQyxDQUFDO0lBRWhILElBQUksSUFBd0IsQ0FBQztJQUU3QixlQUFlO0lBQ2YsdUVBQXVFO0lBQ3ZFLE1BQU0sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUN2QixLQUFLLElBQUksRUFBRTtRQUNULE1BQU0sS0FBSyxHQUFHLFdBQVcsQ0FBQztZQUN4QixXQUFXO1lBQ1gsSUFBSSxFQUFFLENBQUM7WUFDUCxTQUFTLEVBQUUsV0FBVztZQUN0QixXQUFXLEVBQUUsSUFBSTtTQUNsQixDQUFDLENBQUM7UUFFSCw4Q0FBOEM7UUFDOUMsTUFBTSxhQUFhLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxPQUFlLEVBQUUsRUFBRTtZQUM1RCxJQUFJLElBQUksS0FBSyxTQUFTLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO2dCQUMzRCxJQUFJLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLENBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ25FLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztRQUNILE1BQU0sS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3BCLGFBQWEsRUFBRSxDQUFDO1FBRWhCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQyxFQUNELGFBQWEsRUFDYixXQUFXLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3ZCLENBQUM7SUFFRixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDVixNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELHVFQUF1RTtJQUN2RSxNQUFNLENBQUMsY0FBYyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLG9CQUFvQixJQUFJLEVBQUUsRUFBRSxDQUFDO0FBQ3ZELENBQUMifQ==
|
package/dest/test/tx_delayer.js
CHANGED
|
@@ -11,7 +11,7 @@ export function waitUntilBlock(client, blockNumber, logger) {
|
|
|
11
11
|
const currentBlockNumber = await publicClient.getBlockNumber({ cacheTime: 0 });
|
|
12
12
|
logger?.debug(`Block number is ${currentBlockNumber} (waiting until ${blockNumber})`);
|
|
13
13
|
return currentBlockNumber >= BigInt(blockNumber);
|
|
14
|
-
}, `Wait until L1 block ${blockNumber}`,
|
|
14
|
+
}, `Wait until L1 block ${blockNumber}`, 120, 0.1);
|
|
15
15
|
}
|
|
16
16
|
export function waitUntilL1Timestamp(client, timestamp, logger) {
|
|
17
17
|
const publicClient = 'getBlockNumber' in client && typeof client.getBlockNumber === 'function'
|
|
@@ -28,7 +28,7 @@ export function waitUntilL1Timestamp(client, timestamp, logger) {
|
|
|
28
28
|
const currentTs = currentBlock.timestamp;
|
|
29
29
|
logger?.debug(`Block timstamp is ${currentTs} (waiting until ${timestamp})`);
|
|
30
30
|
return currentTs >= BigInt(timestamp);
|
|
31
|
-
}, `Wait until L1 timestamp ${timestamp}`,
|
|
31
|
+
}, `Wait until L1 timestamp ${timestamp}`, 120, 0.1);
|
|
32
32
|
}
|
|
33
33
|
class DelayerImpl {
|
|
34
34
|
constructor(opts) {
|
|
@@ -95,7 +95,7 @@ export function withDelayer(client, opts) {
|
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
97
|
const txHash = await client.sendRawTransaction(...args);
|
|
98
|
-
logger.
|
|
98
|
+
logger.verbose(`Sent tx immediately ${txHash}`);
|
|
99
99
|
delayer.txs.push(txHash);
|
|
100
100
|
return txHash;
|
|
101
101
|
}
|
|
@@ -110,4 +110,4 @@ export function withDelayer(client, opts) {
|
|
|
110
110
|
}));
|
|
111
111
|
return { client: extended, delayer };
|
|
112
112
|
}
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfZGVsYXllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0L3R4X2RlbGF5ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3BELE9BQU8sRUFBZSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNsRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFckQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUMvQixPQUFPLEVBS0wsU0FBUyxFQUNULGdCQUFnQixFQUNoQixhQUFhLEVBQ2IsYUFBYSxHQUNkLE1BQU0sTUFBTSxDQUFDO0FBRWQsTUFBTSxVQUFVLGNBQWMsQ0FBbUIsTUFBUyxFQUFFLFdBQTRCLEVBQUUsTUFBZTtJQUN2RyxNQUFNLFlBQVksR0FDaEIsZ0JBQWdCLElBQUksTUFBTSxJQUFJLE9BQU8sTUFBTSxDQUFDLGNBQWMsS0FBSyxVQUFVO1FBQ3ZFLENBQUMsQ0FBRSxNQUFrQztRQUNyQyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUVuQyxPQUFPLFVBQVUsQ0FDZixLQUFLLElBQUksRUFBRTtRQUNULE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxZQUFZLENBQUMsY0FBYyxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDL0UsTUFBTSxFQUFFLEtBQUssQ0FBQyxtQkFBbUIsa0JBQWtCLG1CQUFtQixXQUFXLEdBQUcsQ0FBQyxDQUFDO1FBQ3RGLE9BQU8sa0JBQWtCLElBQUksTUFBTSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ25ELENBQUMsRUFDRCx1QkFBdUIsV0FBVyxFQUFFLEVBQ3BDLEdBQUcsRUFDSCxHQUFHLENBQ0osQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsb0JBQW9CLENBQW1CLE1BQVMs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
|
package/dest/utils.d.ts
CHANGED
|
@@ -8,4 +8,6 @@ export interface L2Claim {
|
|
|
8
8
|
messageLeafIndex: bigint;
|
|
9
9
|
}
|
|
10
10
|
export declare function extractEvent<const TAbi extends Abi | readonly unknown[], TEventName extends ContractEventName<TAbi>, TEventType = DecodeEventLogReturnType<TAbi, TEventName, Hex[], undefined, true>>(logs: Log[], address: Hex, abi: TAbi, eventName: TEventName, filter?: (log: TEventType) => boolean, logger?: Logger): TEventType;
|
|
11
|
+
export declare function prettyLogViemErrorMsg(err: any): any;
|
|
12
|
+
export declare function formatViemError(error: any): string;
|
|
11
13
|
//# sourceMappingURL=utils.d.ts.map
|
package/dest/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,KAAK,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,KAAK,GAAG,EAER,KAAK,iBAAiB,EAEtB,KAAK,wBAAwB,EAC7B,KAAK,GAAG,EACR,KAAK,GAAG,EAET,MAAM,MAAM,CAAC;AAEd,MAAM,WAAW,OAAO;IACtB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,EAAE,CAAC;IAChB,WAAW,EAAE,GAAG,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,YAAY,CAC1B,KAAK,CAAC,IAAI,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,EAC3C,UAAU,SAAS,iBAAiB,CAAC,IAAI,CAAC,EAC1C,UAAU,GAAG,wBAAwB,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,EAE/E,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,IAAI,EACT,SAAS,EAAE,UAAU,EACrB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,OAAO,EACrC,MAAM,CAAC,EAAE,MAAM,GACd,UAAU,CAMZ;AA+BD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CA4FlD"}
|