@aztec/ethereum 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

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.
Files changed (81) hide show
  1. package/dest/chain.js +17 -18
  2. package/dest/client.js +5 -9
  3. package/dest/config.js +13 -14
  4. package/dest/constants.js +0 -1
  5. package/dest/contracts/empire_base.js +3 -2
  6. package/dest/contracts/forwarder.js +46 -26
  7. package/dest/contracts/governance.js +11 -6
  8. package/dest/contracts/governance_proposer.js +78 -67
  9. package/dest/contracts/index.js +0 -1
  10. package/dest/contracts/rollup.js +270 -243
  11. package/dest/contracts/slashing_proposer.js +18 -8
  12. package/dest/deploy_l1_contracts.js +201 -126
  13. package/dest/eth_cheat_codes.js +144 -127
  14. package/dest/index.js +0 -1
  15. package/dest/l1_contract_addresses.js +17 -19
  16. package/dest/l1_reader.js +6 -7
  17. package/dest/l1_tx_utils.js +227 -186
  18. package/dest/l1_tx_utils_with_blobs.js +25 -22
  19. package/dest/queries.js +6 -9
  20. package/dest/test/delayed_tx_utils.js +3 -3
  21. package/dest/test/eth_cheat_codes_with_state.js +10 -12
  22. package/dest/test/index.js +0 -1
  23. package/dest/test/start_anvil.js +17 -9
  24. package/dest/test/tx_delayer.js +77 -74
  25. package/dest/types.js +1 -2
  26. package/dest/utils.js +35 -36
  27. package/package.json +5 -4
  28. package/src/contracts/rollup.ts +1 -1
  29. package/src/l1_tx_utils_with_blobs.ts +1 -1
  30. package/dest/chain.d.ts +0 -25
  31. package/dest/chain.d.ts.map +0 -1
  32. package/dest/client.d.ts +0 -16
  33. package/dest/client.d.ts.map +0 -1
  34. package/dest/config.d.ts +0 -38
  35. package/dest/config.d.ts.map +0 -1
  36. package/dest/constants.d.ts +0 -4
  37. package/dest/constants.d.ts.map +0 -1
  38. package/dest/contracts/empire_base.d.ts +0 -13
  39. package/dest/contracts/empire_base.d.ts.map +0 -1
  40. package/dest/contracts/forwarder.d.ts +0 -24
  41. package/dest/contracts/forwarder.d.ts.map +0 -1
  42. package/dest/contracts/governance.d.ts +0 -14
  43. package/dest/contracts/governance.d.ts.map +0 -1
  44. package/dest/contracts/governance_proposer.d.ts +0 -28
  45. package/dest/contracts/governance_proposer.d.ts.map +0 -1
  46. package/dest/contracts/index.d.ts +0 -7
  47. package/dest/contracts/index.d.ts.map +0 -1
  48. package/dest/contracts/rollup.d.ts +0 -115
  49. package/dest/contracts/rollup.d.ts.map +0 -1
  50. package/dest/contracts/slashing_proposer.d.ts +0 -21
  51. package/dest/contracts/slashing_proposer.d.ts.map +0 -1
  52. package/dest/deploy_l1_contracts.d.ts +0 -21118
  53. package/dest/deploy_l1_contracts.d.ts.map +0 -1
  54. package/dest/eth_cheat_codes.d.ts +0 -146
  55. package/dest/eth_cheat_codes.d.ts.map +0 -1
  56. package/dest/index.d.ts +0 -15
  57. package/dest/index.d.ts.map +0 -1
  58. package/dest/l1_contract_addresses.d.ts +0 -55
  59. package/dest/l1_contract_addresses.d.ts.map +0 -1
  60. package/dest/l1_reader.d.ts +0 -16
  61. package/dest/l1_reader.d.ts.map +0 -1
  62. package/dest/l1_tx_utils.d.ts +0 -194
  63. package/dest/l1_tx_utils.d.ts.map +0 -1
  64. package/dest/l1_tx_utils_with_blobs.d.ts +0 -12
  65. package/dest/l1_tx_utils_with_blobs.d.ts.map +0 -1
  66. package/dest/queries.d.ts +0 -15
  67. package/dest/queries.d.ts.map +0 -1
  68. package/dest/test/delayed_tx_utils.d.ts +0 -8
  69. package/dest/test/delayed_tx_utils.d.ts.map +0 -1
  70. package/dest/test/eth_cheat_codes_with_state.d.ts +0 -18
  71. package/dest/test/eth_cheat_codes_with_state.d.ts.map +0 -1
  72. package/dest/test/index.d.ts +0 -5
  73. package/dest/test/index.d.ts.map +0 -1
  74. package/dest/test/start_anvil.d.ts +0 -9
  75. package/dest/test/start_anvil.d.ts.map +0 -1
  76. package/dest/test/tx_delayer.d.ts +0 -24
  77. package/dest/test/tx_delayer.d.ts.map +0 -1
  78. package/dest/types.d.ts +0 -12
  79. package/dest/types.d.ts.map +0 -1
  80. package/dest/utils.d.ts +0 -24
  81. package/dest/utils.d.ts.map +0 -1
@@ -1,15 +1,15 @@
1
1
  import { compactArray, times } from '@aztec/foundation/collection';
2
- import { bigintConfigHelper, getDefaultConfig, numberConfigHelper, } from '@aztec/foundation/config';
2
+ import { bigintConfigHelper, getDefaultConfig, numberConfigHelper } from '@aztec/foundation/config';
3
3
  import { makeBackoff, retry } from '@aztec/foundation/retry';
4
4
  import { sleep } from '@aztec/foundation/sleep';
5
- import { MethodNotFoundRpcError, MethodNotSupportedRpcError, formatGwei, getContractError, hexToBytes, } from 'viem';
5
+ import { MethodNotFoundRpcError, MethodNotSupportedRpcError, formatGwei, getContractError, hexToBytes } from 'viem';
6
6
  import { formatViemError } from './utils.js';
7
7
  // 1_000_000_000 Gwei = 1 ETH
8
8
  // 1_000_000_000 Wei = 1 Gwei
9
9
  // 1_000_000_000_000_000_000 Wei = 1 ETH
10
- const WEI_CONST = 1000000000n;
10
+ const WEI_CONST = 1_000_000_000n;
11
11
  // @note using this large gas limit to avoid the issue of `gas limit too low` when estimating gas in reth
12
- const LARGE_GAS_LIMIT = 10000000n;
12
+ const LARGE_GAS_LIMIT = 10_000_000n;
13
13
  // setting a minimum bump percentage to 10% due to geth's implementation
14
14
  // https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
15
15
  const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
@@ -17,79 +17,84 @@ const MIN_REPLACEMENT_BUMP_PERCENTAGE = 10;
17
17
  // https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/blobpool/config.go#L34
18
18
  const MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE = 100;
19
19
  // Avg ethereum block time is ~12s
20
- const BLOCK_TIME_MS = 12000;
20
+ const BLOCK_TIME_MS = 12_000;
21
21
  export const l1TxUtilsConfigMappings = {
22
22
  gasLimitBufferPercentage: {
23
23
  description: 'How much to increase calculated gas limit by (percentage)',
24
24
  env: 'L1_GAS_LIMIT_BUFFER_PERCENTAGE',
25
- ...numberConfigHelper(20),
25
+ ...numberConfigHelper(20)
26
26
  },
27
27
  minGwei: {
28
28
  description: 'Minimum gas price in gwei',
29
29
  env: 'L1_GAS_PRICE_MIN',
30
- ...bigintConfigHelper(1n),
30
+ ...bigintConfigHelper(1n)
31
31
  },
32
32
  maxGwei: {
33
33
  description: 'Maximum gas price in gwei',
34
34
  env: 'L1_GAS_PRICE_MAX',
35
- ...bigintConfigHelper(100n),
35
+ ...bigintConfigHelper(100n)
36
36
  },
37
37
  maxBlobGwei: {
38
38
  description: 'Maximum blob fee per gas in gwei',
39
39
  env: 'L1_BLOB_FEE_PER_GAS_MAX',
40
- ...bigintConfigHelper(1500n),
40
+ ...bigintConfigHelper(1_500n)
41
41
  },
42
42
  priorityFeeBumpPercentage: {
43
43
  description: 'How much to increase priority fee by each attempt (percentage)',
44
44
  env: 'L1_PRIORITY_FEE_BUMP_PERCENTAGE',
45
- ...numberConfigHelper(20),
45
+ ...numberConfigHelper(20)
46
46
  },
47
47
  priorityFeeRetryBumpPercentage: {
48
48
  description: 'How much to increase priority fee by each retry attempt (percentage)',
49
49
  env: 'L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE',
50
- ...numberConfigHelper(50),
50
+ ...numberConfigHelper(50)
51
51
  },
52
52
  fixedPriorityFeePerGas: {
53
53
  description: 'Fixed priority fee per gas in Gwei. Overrides any priority fee bump percentage',
54
54
  env: 'L1_FIXED_PRIORITY_FEE_PER_GAS',
55
- ...numberConfigHelper(0),
55
+ ...numberConfigHelper(0)
56
56
  },
57
57
  maxAttempts: {
58
58
  description: 'Maximum number of speed-up attempts',
59
59
  env: 'L1_TX_MONITOR_MAX_ATTEMPTS',
60
- ...numberConfigHelper(3),
60
+ ...numberConfigHelper(3)
61
61
  },
62
62
  checkIntervalMs: {
63
63
  description: 'How often to check tx status',
64
64
  env: 'L1_TX_MONITOR_CHECK_INTERVAL_MS',
65
- ...numberConfigHelper(10000),
65
+ ...numberConfigHelper(10_000)
66
66
  },
67
67
  stallTimeMs: {
68
68
  description: 'How long before considering tx stalled',
69
69
  env: 'L1_TX_MONITOR_STALL_TIME_MS',
70
- ...numberConfigHelper(45000),
70
+ ...numberConfigHelper(45_000)
71
71
  },
72
72
  txTimeoutMs: {
73
73
  description: 'How long to wait for a tx to be mined before giving up. Set to 0 to disable.',
74
74
  env: 'L1_TX_MONITOR_TX_TIMEOUT_MS',
75
- ...numberConfigHelper(300000), // 5 mins
75
+ ...numberConfigHelper(300_000)
76
76
  },
77
77
  txPropagationMaxQueryAttempts: {
78
78
  description: 'How many attempts will be done to get a tx after it was sent',
79
79
  env: 'L1_TX_PROPAGATION_MAX_QUERY_ATTEMPTS',
80
- ...numberConfigHelper(3),
81
- },
80
+ ...numberConfigHelper(3)
81
+ }
82
82
  };
83
83
  export const defaultL1TxUtilsConfig = getDefaultConfig(l1TxUtilsConfigMappings);
84
84
  export class L1TxUtils {
85
- constructor(publicClient, walletClient, logger, config) {
85
+ publicClient;
86
+ walletClient;
87
+ logger;
88
+ config;
89
+ interrupted;
90
+ constructor(publicClient, walletClient, logger, config){
86
91
  this.publicClient = publicClient;
87
92
  this.walletClient = walletClient;
88
93
  this.logger = logger;
89
94
  this.interrupted = false;
90
95
  this.config = {
91
96
  ...defaultL1TxUtilsConfig,
92
- ...(config || {}),
97
+ ...config || {}
93
98
  };
94
99
  }
95
100
  interrupt() {
@@ -108,20 +113,21 @@ export class L1TxUtils {
108
113
  return this.publicClient.getBlockNumber();
109
114
  }
110
115
  /**
111
- * Sends a transaction with gas estimation and pricing
112
- * @param request - The transaction request (to, data, value)
113
- * @param gasConfig - Optional gas configuration
114
- * @returns The transaction hash and parameters used
115
- */
116
- async sendTransaction(request, _gasConfig, blobInputs) {
116
+ * Sends a transaction with gas estimation and pricing
117
+ * @param request - The transaction request (to, data, value)
118
+ * @param gasConfig - Optional gas configuration
119
+ * @returns The transaction hash and parameters used
120
+ */ async sendTransaction(request, _gasConfig, blobInputs) {
117
121
  try {
118
- const gasConfig = { ...this.config, ..._gasConfig };
122
+ const gasConfig = {
123
+ ...this.config,
124
+ ..._gasConfig
125
+ };
119
126
  const account = this.walletClient.account;
120
127
  let gasLimit;
121
128
  if (gasConfig.gasLimit) {
122
129
  gasLimit = gasConfig.gasLimit;
123
- }
124
- else {
130
+ } else {
125
131
  gasLimit = await this.estimateGas(account, request);
126
132
  }
127
133
  const gasPrice = await this.getGasPrice(gasConfig, !!blobInputs);
@@ -136,46 +142,56 @@ export class L1TxUtils {
136
142
  gas: gasLimit,
137
143
  maxFeePerGas: gasPrice.maxFeePerGas,
138
144
  maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
139
- maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
145
+ maxFeePerBlobGas: gasPrice.maxFeePerBlobGas
140
146
  });
141
- }
142
- else {
147
+ } else {
143
148
  txHash = await this.walletClient.sendTransaction({
144
149
  ...request,
145
150
  gas: gasLimit,
146
151
  maxFeePerGas: gasPrice.maxFeePerGas,
147
- maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
152
+ maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas
148
153
  });
149
154
  }
150
155
  this.logger?.verbose(`Sent L1 transaction ${txHash}`, {
151
156
  gasLimit,
152
157
  maxFeePerGas: formatGwei(gasPrice.maxFeePerGas),
153
158
  maxPriorityFeePerGas: formatGwei(gasPrice.maxPriorityFeePerGas),
154
- ...(gasPrice.maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(gasPrice.maxFeePerBlobGas) }),
159
+ ...gasPrice.maxFeePerBlobGas && {
160
+ maxFeePerBlobGas: formatGwei(gasPrice.maxFeePerBlobGas)
161
+ }
155
162
  });
156
- return { txHash, gasLimit, gasPrice };
157
- }
158
- catch (err) {
163
+ return {
164
+ txHash,
165
+ gasLimit,
166
+ gasPrice
167
+ };
168
+ } catch (err) {
159
169
  const viemError = formatViemError(err);
160
- this.logger?.error(`Failed to send L1 transaction`, viemError.message, { metaMessages: viemError.metaMessages });
170
+ this.logger?.error(`Failed to send L1 transaction`, viemError.message, {
171
+ metaMessages: viemError.metaMessages
172
+ });
161
173
  throw viemError;
162
174
  }
163
175
  }
164
176
  /**
165
- * Monitors a transaction until completion, handling speed-ups if needed
166
- * @param request - Original transaction request (needed for speed-ups)
167
- * @param initialTxHash - Hash of the initial transaction
168
- * @param params - Parameters used in the initial transaction
169
- * @param gasConfig - Optional gas configuration
170
- */
171
- async monitorTransaction(request, initialTxHash, params, _gasConfig, _blobInputs, isCancelTx = false) {
177
+ * Monitors a transaction until completion, handling speed-ups if needed
178
+ * @param request - Original transaction request (needed for speed-ups)
179
+ * @param initialTxHash - Hash of the initial transaction
180
+ * @param params - Parameters used in the initial transaction
181
+ * @param gasConfig - Optional gas configuration
182
+ */ async monitorTransaction(request, initialTxHash, params, _gasConfig, _blobInputs, isCancelTx = false) {
172
183
  const isBlobTx = !!_blobInputs;
173
- const gasConfig = { ...this.config, ..._gasConfig };
184
+ const gasConfig = {
185
+ ...this.config,
186
+ ..._gasConfig
187
+ };
174
188
  const account = this.walletClient.account;
175
189
  const blobInputs = _blobInputs || {};
176
- const makeGetTransactionBackoff = () => makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, i => i + 1));
190
+ const makeGetTransactionBackoff = ()=>makeBackoff(times(gasConfig.txPropagationMaxQueryAttempts ?? 3, (i)=>i + 1));
177
191
  // Retry a few times, in case the tx is not yet propagated.
178
- const tx = await retry(() => this.publicClient.getTransaction({ hash: initialTxHash }), `Getting L1 transaction ${initialTxHash}`, makeGetTransactionBackoff(), this.logger, true);
192
+ const tx = await retry(()=>this.publicClient.getTransaction({
193
+ hash: initialTxHash
194
+ }), `Getting L1 transaction ${initialTxHash}`, makeGetTransactionBackoff(), this.logger, true);
179
195
  if (!tx) {
180
196
  throw new Error(`Failed to get L1 transaction ${initialTxHash} to monitor`);
181
197
  }
@@ -183,39 +199,40 @@ export class L1TxUtils {
183
199
  throw new Error(`Failed to get L1 transaction ${initialTxHash} nonce`);
184
200
  }
185
201
  const nonce = tx.nonce;
186
- const txHashes = new Set([initialTxHash]);
202
+ const txHashes = new Set([
203
+ initialTxHash
204
+ ]);
187
205
  let currentTxHash = initialTxHash;
188
206
  let attempts = 0;
189
207
  let lastAttemptSent = Date.now();
190
208
  let lastGasPrice = {
191
209
  maxFeePerGas: tx.maxFeePerGas,
192
210
  maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
193
- maxFeePerBlobGas: tx.maxFeePerBlobGas,
211
+ maxFeePerBlobGas: tx.maxFeePerBlobGas
194
212
  };
195
213
  const initialTxTime = lastAttemptSent;
196
214
  let txTimedOut = false;
197
- const isTimedOut = () => (gasConfig.txTimeoutAt && Date.now() > gasConfig.txTimeoutAt.getTime()) ||
198
- (gasConfig.txTimeoutMs !== undefined && Date.now() - initialTxTime > gasConfig.txTimeoutMs) ||
199
- this.interrupted ||
200
- false;
201
- while (!txTimedOut) {
215
+ const isTimedOut = ()=>gasConfig.txTimeoutAt && Date.now() > gasConfig.txTimeoutAt.getTime() || gasConfig.txTimeoutMs !== undefined && Date.now() - initialTxTime > gasConfig.txTimeoutMs || this.interrupted || false;
216
+ while(!txTimedOut){
202
217
  try {
203
- const currentNonce = await this.publicClient.getTransactionCount({ address: account.address });
218
+ const currentNonce = await this.publicClient.getTransactionCount({
219
+ address: account.address
220
+ });
204
221
  if (currentNonce > nonce) {
205
- for (const hash of txHashes) {
222
+ for (const hash of txHashes){
206
223
  try {
207
- const receipt = await this.publicClient.getTransactionReceipt({ hash });
224
+ const receipt = await this.publicClient.getTransactionReceipt({
225
+ hash
226
+ });
208
227
  if (receipt) {
209
228
  if (receipt.status === 'reverted') {
210
229
  this.logger?.error(`L1 transaction ${hash} reverted`, receipt);
211
- }
212
- else {
230
+ } else {
213
231
  this.logger?.debug(`L1 transaction ${hash} mined`);
214
232
  }
215
233
  return receipt;
216
234
  }
217
- }
218
- catch (err) {
235
+ } catch (err) {
219
236
  if (err instanceof Error && err.message.includes('reverted')) {
220
237
  throw formatViemError(err);
221
238
  }
@@ -223,7 +240,9 @@ export class L1TxUtils {
223
240
  }
224
241
  }
225
242
  // Retry a few times, in case the tx is not yet propagated.
226
- const tx = await retry(() => this.publicClient.getTransaction({ hash: currentTxHash }), `Getting L1 transaction ${currentTxHash}`, makeGetTransactionBackoff(), this.logger, true);
243
+ const tx = await retry(()=>this.publicClient.getTransaction({
244
+ hash: currentTxHash
245
+ }), `Getting L1 transaction ${currentTxHash}`, makeGetTransactionBackoff(), this.logger, true);
227
246
  const timePassed = Date.now() - lastAttemptSent;
228
247
  if (tx && timePassed < gasConfig.stallTimeMs) {
229
248
  this.logger?.debug(`L1 transaction ${currentTxHash} pending. Time passed: ${timePassed}ms.`);
@@ -237,19 +256,18 @@ export class L1TxUtils {
237
256
  }
238
257
  if (timePassed > gasConfig.stallTimeMs && attempts < gasConfig.maxAttempts) {
239
258
  attempts++;
240
- const newGasPrice = await this.getGasPrice(gasConfig, isBlobTx, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas
241
- ? {
242
- maxFeePerGas: tx.maxFeePerGas,
243
- maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
244
- maxFeePerBlobGas: tx.maxFeePerBlobGas,
245
- }
246
- : undefined);
259
+ const newGasPrice = await this.getGasPrice(gasConfig, isBlobTx, attempts, tx.maxFeePerGas && tx.maxPriorityFeePerGas ? {
260
+ maxFeePerGas: tx.maxFeePerGas,
261
+ maxPriorityFeePerGas: tx.maxPriorityFeePerGas,
262
+ maxFeePerBlobGas: tx.maxFeePerBlobGas
263
+ } : undefined);
247
264
  lastGasPrice = newGasPrice;
248
- this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` +
249
- `with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`, {
265
+ this.logger?.debug(`L1 transaction ${currentTxHash} appears stuck. Attempting speed-up ${attempts}/${gasConfig.maxAttempts} ` + `with new priority fee ${formatGwei(newGasPrice.maxPriorityFeePerGas)} gwei`, {
250
266
  maxFeePerGas: formatGwei(newGasPrice.maxFeePerGas),
251
267
  maxPriorityFeePerGas: formatGwei(newGasPrice.maxPriorityFeePerGas),
252
- ...(newGasPrice.maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(newGasPrice.maxFeePerBlobGas) }),
268
+ ...newGasPrice.maxFeePerBlobGas && {
269
+ maxFeePerBlobGas: formatGwei(newGasPrice.maxFeePerBlobGas)
270
+ }
253
271
  });
254
272
  currentTxHash = await this.walletClient.sendTransaction({
255
273
  ...request,
@@ -257,14 +275,13 @@ export class L1TxUtils {
257
275
  nonce,
258
276
  gas: params.gasLimit,
259
277
  maxFeePerGas: newGasPrice.maxFeePerGas,
260
- maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas,
278
+ maxPriorityFeePerGas: newGasPrice.maxPriorityFeePerGas
261
279
  });
262
280
  txHashes.add(currentTxHash);
263
281
  lastAttemptSent = Date.now();
264
282
  }
265
283
  await sleep(gasConfig.checkIntervalMs);
266
- }
267
- catch (err) {
284
+ } catch (err) {
268
285
  const viemError = formatViemError(err);
269
286
  this.logger?.warn(`Error monitoring L1 transaction ${currentTxHash}:`, viemError.message);
270
287
  if (viemError.message?.includes('reverted')) {
@@ -277,60 +294,68 @@ export class L1TxUtils {
277
294
  }
278
295
  if (!isCancelTx) {
279
296
  // Fire cancellation without awaiting to avoid blocking the main thread
280
- this.attemptTxCancellation(nonce, isBlobTx, lastGasPrice, attempts)
281
- .then(cancelTxHash => {
297
+ this.attemptTxCancellation(nonce, isBlobTx, lastGasPrice, attempts).then((cancelTxHash)=>{
282
298
  this.logger?.debug(`Sent cancellation tx ${cancelTxHash} for timed out tx ${currentTxHash}`);
283
- })
284
- .catch(err => {
299
+ }).catch((err)=>{
285
300
  const viemError = formatViemError(err);
286
301
  this.logger?.error(`Failed to send cancellation for timed out tx ${currentTxHash}:`, viemError.message, {
287
- metaMessages: viemError.metaMessages,
302
+ metaMessages: viemError.metaMessages
288
303
  });
289
304
  });
290
305
  this.logger?.error(`L1 transaction ${currentTxHash} timed out`, {
291
306
  txHash: currentTxHash,
292
- ...tx,
307
+ ...tx
293
308
  });
294
309
  }
295
310
  throw new Error(`L1 transaction ${currentTxHash} timed out`);
296
311
  }
297
312
  /**
298
- * Sends a transaction and monitors it until completion
299
- * @param request - The transaction request (to, data, value)
300
- * @param gasConfig - Optional gas configuration
301
- * @returns The receipt of the successful transaction
302
- */
303
- async sendAndMonitorTransaction(request, gasConfig, blobInputs) {
313
+ * Sends a transaction and monitors it until completion
314
+ * @param request - The transaction request (to, data, value)
315
+ * @param gasConfig - Optional gas configuration
316
+ * @returns The receipt of the successful transaction
317
+ */ async sendAndMonitorTransaction(request, gasConfig, blobInputs) {
304
318
  const { txHash, gasLimit, gasPrice } = await this.sendTransaction(request, gasConfig, blobInputs);
305
- const receipt = await this.monitorTransaction(request, txHash, { gasLimit }, gasConfig, blobInputs);
306
- return { receipt, gasPrice };
319
+ const receipt = await this.monitorTransaction(request, txHash, {
320
+ gasLimit
321
+ }, gasConfig, blobInputs);
322
+ return {
323
+ receipt,
324
+ gasPrice
325
+ };
307
326
  }
308
327
  /**
309
- * Gets the current gas price with bounds checking
310
- */
311
- async getGasPrice(_gasConfig, isBlobTx = false, attempt = 0, previousGasPrice) {
312
- const gasConfig = { ...this.config, ..._gasConfig };
313
- const block = await this.publicClient.getBlock({ blockTag: 'latest' });
328
+ * Gets the current gas price with bounds checking
329
+ */ async getGasPrice(_gasConfig, isBlobTx = false, attempt = 0, previousGasPrice) {
330
+ const gasConfig = {
331
+ ...this.config,
332
+ ..._gasConfig
333
+ };
334
+ const block = await this.publicClient.getBlock({
335
+ blockTag: 'latest'
336
+ });
314
337
  const baseFee = block.baseFeePerGas ?? 0n;
315
338
  // Get blob base fee if available
316
339
  let blobBaseFee = 0n;
317
340
  try {
318
- const blobBaseFeeHex = await this.publicClient.request({ method: 'eth_blobBaseFee' });
341
+ const blobBaseFeeHex = await this.publicClient.request({
342
+ method: 'eth_blobBaseFee'
343
+ });
319
344
  blobBaseFee = BigInt(blobBaseFeeHex);
320
- this.logger?.debug('L1 Blob base fee:', { blobBaseFee: formatGwei(blobBaseFee) });
321
- }
322
- catch {
345
+ this.logger?.debug('L1 Blob base fee:', {
346
+ blobBaseFee: formatGwei(blobBaseFee)
347
+ });
348
+ } catch {
323
349
  this.logger?.warn('Failed to get L1 blob base fee', attempt);
324
350
  }
325
351
  let priorityFee;
326
352
  if (gasConfig.fixedPriorityFeePerGas) {
327
353
  this.logger?.debug('Using fixed priority fee per L1 gas', {
328
- fixedPriorityFeePerGas: gasConfig.fixedPriorityFeePerGas,
354
+ fixedPriorityFeePerGas: gasConfig.fixedPriorityFeePerGas
329
355
  });
330
356
  // try to maintain precision up to 1000000 wei
331
- priorityFee = BigInt(gasConfig.fixedPriorityFeePerGas * 1000000) * (WEI_CONST / 1000000n);
332
- }
333
- else {
357
+ priorityFee = BigInt(gasConfig.fixedPriorityFeePerGas * 1_000_000) * (WEI_CONST / 1_000_000n);
358
+ } else {
334
359
  // Get initial priority fee from the network
335
360
  priorityFee = await this.publicClient.estimateMaxPriorityFeePerGas();
336
361
  }
@@ -338,11 +363,11 @@ export class L1TxUtils {
338
363
  let maxFeePerBlobGas = blobBaseFee;
339
364
  // Bump base fee so it's valid for next blocks if it stalls
340
365
  const numBlocks = Math.ceil(gasConfig.stallTimeMs / BLOCK_TIME_MS);
341
- for (let i = 0; i < numBlocks; i++) {
366
+ for(let i = 0; i < numBlocks; i++){
342
367
  // each block can go up 12.5% from previous baseFee
343
- maxFeePerGas = (maxFeePerGas * (1000n + 125n)) / 1000n;
368
+ maxFeePerGas = maxFeePerGas * (1_000n + 125n) / 1_000n;
344
369
  // same for blob gas fee
345
- maxFeePerBlobGas = (maxFeePerBlobGas * (1000n + 125n)) / 1000n;
370
+ maxFeePerBlobGas = maxFeePerBlobGas * (1_000n + 125n) / 1_000n;
346
371
  }
347
372
  if (attempt > 0) {
348
373
  const configBump = gasConfig.priorityFeeRetryBumpPercentage ?? defaultL1TxUtilsConfig.priorityFeeRetryBumpPercentage;
@@ -351,19 +376,18 @@ export class L1TxUtils {
351
376
  const bumpPercentage = configBump > minBumpPercentage ? configBump : minBumpPercentage;
352
377
  // Calculate minimum required fees based on previous attempt
353
378
  // multiply by 100 & divide by 100 to maintain some precision
354
- const minPriorityFee = (previousGasPrice.maxPriorityFeePerGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
355
- const minMaxFee = (previousGasPrice.maxFeePerGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
379
+ const minPriorityFee = previousGasPrice.maxPriorityFeePerGas * (100_00n + BigInt(bumpPercentage * 1_00)) / 100_00n;
380
+ const minMaxFee = previousGasPrice.maxFeePerGas * (100_00n + BigInt(bumpPercentage * 1_00)) / 100_00n;
356
381
  // Add priority fee to maxFeePerGas
357
382
  maxFeePerGas += priorityFee;
358
383
  // Use maximum between current network values and minimum required values
359
384
  priorityFee = priorityFee > minPriorityFee ? priorityFee : minPriorityFee;
360
385
  maxFeePerGas = maxFeePerGas > minMaxFee ? maxFeePerGas : minMaxFee;
361
- }
362
- else {
386
+ } else {
363
387
  // first attempt, just bump priority fee, unless it's a fixed config
364
388
  // multiply by 100 & divide by 100 to maintain some precision
365
389
  if (!gasConfig.fixedPriorityFeePerGas) {
366
- priorityFee = (priorityFee * (10000n + BigInt((gasConfig.priorityFeeBumpPercentage || 0) * 100))) / 10000n;
390
+ priorityFee = priorityFee * (100_00n + BigInt((gasConfig.priorityFeeBumpPercentage || 0) * 1_00)) / 100_00n;
367
391
  }
368
392
  maxFeePerGas += priorityFee;
369
393
  }
@@ -378,11 +402,9 @@ export class L1TxUtils {
378
402
  // Ensure priority fee doesn't exceed max fee
379
403
  const maxPriorityFeePerGas = priorityFee > maxFeePerGas ? maxFeePerGas : priorityFee;
380
404
  if (attempt > 0 && previousGasPrice?.maxFeePerBlobGas) {
381
- const bumpPercentage = gasConfig.priorityFeeRetryBumpPercentage > MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE
382
- ? gasConfig.priorityFeeRetryBumpPercentage
383
- : MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE;
405
+ const bumpPercentage = gasConfig.priorityFeeRetryBumpPercentage > MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE ? gasConfig.priorityFeeRetryBumpPercentage : MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE;
384
406
  // calculate min blob fee based on previous attempt
385
- const minBlobFee = (previousGasPrice.maxFeePerBlobGas * (10000n + BigInt(bumpPercentage * 100))) / 10000n;
407
+ const minBlobFee = previousGasPrice.maxFeePerBlobGas * (100_00n + BigInt(bumpPercentage * 1_00)) / 100_00n;
386
408
  // use max between current network values and min required values
387
409
  maxFeePerBlobGas = maxFeePerBlobGas > minBlobFee ? maxFeePerBlobGas : minBlobFee;
388
410
  }
@@ -391,19 +413,25 @@ export class L1TxUtils {
391
413
  baseFee: formatGwei(baseFee),
392
414
  maxFeePerGas: formatGwei(maxFeePerGas),
393
415
  maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
394
- ...(maxFeePerBlobGas && { maxFeePerBlobGas: formatGwei(maxFeePerBlobGas) }),
416
+ ...maxFeePerBlobGas && {
417
+ maxFeePerBlobGas: formatGwei(maxFeePerBlobGas)
418
+ }
395
419
  });
396
420
  return {
397
421
  maxFeePerGas,
398
422
  maxPriorityFeePerGas,
399
- ...(maxFeePerBlobGas && { maxFeePerBlobGas: maxFeePerBlobGas }),
423
+ ...maxFeePerBlobGas && {
424
+ maxFeePerBlobGas: maxFeePerBlobGas
425
+ }
400
426
  };
401
427
  }
402
428
  /**
403
- * Estimates gas and adds buffer
404
- */
405
- async estimateGas(account, request, _gasConfig, _blobInputs) {
406
- const gasConfig = { ...this.config, ..._gasConfig };
429
+ * Estimates gas and adds buffer
430
+ */ async estimateGas(account, request, _gasConfig, _blobInputs) {
431
+ const gasConfig = {
432
+ ...this.config,
433
+ ..._gasConfig
434
+ };
407
435
  let initialEstimate = 0n;
408
436
  if (_blobInputs) {
409
437
  // @note requests with blobs also require maxFeePerBlobGas to be set
@@ -413,12 +441,15 @@ export class L1TxUtils {
413
441
  ...request,
414
442
  ..._blobInputs,
415
443
  maxFeePerBlobGas: gasPrice.maxFeePerBlobGas,
416
- gas: LARGE_GAS_LIMIT,
444
+ gas: LARGE_GAS_LIMIT
417
445
  });
418
446
  this.logger?.debug(`L1 gas used in estimateGas by blob tx: ${initialEstimate}`);
419
- }
420
- else {
421
- initialEstimate = await this.publicClient.estimateGas({ account, ...request, gas: LARGE_GAS_LIMIT });
447
+ } else {
448
+ initialEstimate = await this.publicClient.estimateGas({
449
+ account,
450
+ ...request,
451
+ gas: LARGE_GAS_LIMIT
452
+ });
422
453
  this.logger?.debug(`L1 gas used in estimateGas by non-blob tx: ${initialEstimate}`);
423
454
  }
424
455
  // Add buffer based on either fixed amount or percentage
@@ -426,7 +457,9 @@ export class L1TxUtils {
426
457
  return withBuffer;
427
458
  }
428
459
  async getTransactionStats(txHash) {
429
- const tx = await this.publicClient.getTransaction({ hash: txHash });
460
+ const tx = await this.publicClient.getTransaction({
461
+ hash: txHash
462
+ });
430
463
  if (!tx) {
431
464
  return undefined;
432
465
  }
@@ -435,7 +468,7 @@ export class L1TxUtils {
435
468
  sender: tx.from.toString(),
436
469
  transactionHash: tx.hash,
437
470
  calldataSize: calldata.length,
438
- calldataGas: getCalldataGasUsage(calldata),
471
+ calldataGas: getCalldataGasUsage(calldata)
439
472
  };
440
473
  }
441
474
  async tryGetErrorFromRevertedTx(data, args, blobInputs, stateOverride = []) {
@@ -443,43 +476,42 @@ export class L1TxUtils {
443
476
  await this.publicClient.simulateContract({
444
477
  ...args,
445
478
  account: this.walletClient.account,
446
- stateOverride,
479
+ stateOverride
480
+ });
481
+ this.logger?.trace('Simulated blob tx', {
482
+ blobInputs
447
483
  });
448
- this.logger?.trace('Simulated blob tx', { blobInputs });
449
484
  // If the above passes, we have a blob error. We cannot simulate blob txs, and failed txs no longer throw errors.
450
485
  // Strangely, the only way to throw the revert reason as an error and provide blobs is prepareTransactionRequest.
451
486
  // See: https://github.com/wevm/viem/issues/2075
452
487
  // This throws a EstimateGasExecutionError with the custom error information:
453
- const request = blobInputs
454
- ? {
455
- account: this.walletClient.account,
456
- to: args.address,
457
- data,
458
- blobs: blobInputs.blobs,
459
- kzg: blobInputs.kzg,
460
- maxFeePerBlobGas: blobInputs.maxFeePerBlobGas,
461
- }
462
- : {
463
- account: this.walletClient.account,
464
- to: args.address,
465
- data,
466
- };
467
- this.logger?.trace('Preparing tx', { request });
488
+ const request = blobInputs ? {
489
+ account: this.walletClient.account,
490
+ to: args.address,
491
+ data,
492
+ blobs: blobInputs.blobs,
493
+ kzg: blobInputs.kzg,
494
+ maxFeePerBlobGas: blobInputs.maxFeePerBlobGas
495
+ } : {
496
+ account: this.walletClient.account,
497
+ to: args.address,
498
+ data
499
+ };
500
+ this.logger?.trace('Preparing tx', {
501
+ request
502
+ });
468
503
  await this.walletClient.prepareTransactionRequest(request);
469
504
  this.logger?.trace('Prepared tx');
470
505
  return undefined;
471
- }
472
- catch (simulationErr) {
506
+ } catch (simulationErr) {
473
507
  // If we don't have a ContractFunctionExecutionError, we have a blob related error => use getContractError to get the error msg.
474
- const contractErr = simulationErr.name === 'ContractFunctionExecutionError'
475
- ? simulationErr
476
- : getContractError(simulationErr, {
477
- args: [],
478
- abi: args.abi,
479
- functionName: args.functionName,
480
- address: args.address,
481
- sender: this.walletClient.account.address,
482
- });
508
+ const contractErr = simulationErr.name === 'ContractFunctionExecutionError' ? simulationErr : getContractError(simulationErr, {
509
+ args: [],
510
+ abi: args.abi,
511
+ functionName: args.functionName,
512
+ address: args.address,
513
+ sender: this.walletClient.account.address
514
+ });
483
515
  if (contractErr.name === 'ContractFunctionExecutionError') {
484
516
  const execErr = contractErr;
485
517
  return tryGetCustomErrorNameContractFunction(execErr);
@@ -488,9 +520,14 @@ export class L1TxUtils {
488
520
  }
489
521
  }
490
522
  async simulateGasUsed(request, blockOverrides = {}, stateOverrides = [], _gasConfig) {
491
- const gasConfig = { ...this.config, ..._gasConfig };
523
+ const gasConfig = {
524
+ ...this.config,
525
+ ..._gasConfig
526
+ };
492
527
  const gasPrice = await this.getGasPrice(gasConfig, false);
493
- const nonce = await this.publicClient.getTransactionCount({ address: this.walletClient.account.address });
528
+ const nonce = await this.publicClient.getTransactionCount({
529
+ address: this.walletClient.account.address
530
+ });
494
531
  try {
495
532
  const result = await this.publicClient.simulate({
496
533
  validation: true,
@@ -506,24 +543,23 @@ export class L1TxUtils {
506
543
  maxFeePerGas: gasPrice.maxFeePerGas,
507
544
  maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
508
545
  gas: request.gas ?? LARGE_GAS_LIMIT,
509
- nonce,
510
- },
511
- ],
512
- },
513
- ],
546
+ nonce
547
+ }
548
+ ]
549
+ }
550
+ ]
514
551
  });
515
552
  this.logger?.debug(`L1 gas used in simulation: ${result[0].calls[0].gasUsed}`, {
516
- result,
553
+ result
517
554
  });
518
555
  if (result[0].calls[0].status === 'failure') {
519
556
  this.logger?.error('L1 transaction Simulation failed', {
520
- error: result[0].calls[0].error,
557
+ error: result[0].calls[0].error
521
558
  });
522
559
  throw new Error(`L1 transaction simulation failed with error: ${result[0].calls[0].error.message}`);
523
560
  }
524
561
  return result[0].gasUsed;
525
- }
526
- catch (err) {
562
+ } catch (err) {
527
563
  if (err instanceof MethodNotFoundRpcError || err instanceof MethodNotSupportedRpcError) {
528
564
  if (gasConfig.fallbackGasEstimate) {
529
565
  this.logger?.warn(`Node does not support eth_simulateV1 API. Using fallback gas estimate: ${gasConfig.fallbackGasEstimate}`);
@@ -535,17 +571,19 @@ export class L1TxUtils {
535
571
  }
536
572
  }
537
573
  bumpGasLimit(gasLimit, _gasConfig) {
538
- const gasConfig = { ...this.config, ..._gasConfig };
539
- return gasLimit + (gasLimit * BigInt((gasConfig?.gasLimitBufferPercentage || 0) * 100)) / 10000n;
574
+ const gasConfig = {
575
+ ...this.config,
576
+ ..._gasConfig
577
+ };
578
+ return gasLimit + gasLimit * BigInt((gasConfig?.gasLimitBufferPercentage || 0) * 1_00) / 100_00n;
540
579
  }
541
580
  /**
542
- * Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
543
- * @param nonce - The nonce of the transaction to cancel
544
- * @param previousGasPrice - The gas price of the previous transaction
545
- * @param attempts - The number of attempts to cancel the transaction
546
- * @returns The hash of the cancellation transaction
547
- */
548
- async attemptTxCancellation(nonce, isBlobTx = false, previousGasPrice, attempts = 0) {
581
+ * Attempts to cancel a transaction by sending a 0-value tx to self with same nonce but higher gas prices
582
+ * @param nonce - The nonce of the transaction to cancel
583
+ * @param previousGasPrice - The gas price of the previous transaction
584
+ * @param attempts - The number of attempts to cancel the transaction
585
+ * @returns The hash of the cancellation transaction
586
+ */ async attemptTxCancellation(nonce, isBlobTx = false, previousGasPrice, attempts = 0) {
549
587
  if (isBlobTx) {
550
588
  throw new Error('Cannot cancel blob transactions, please use L1TxUtilsWithBlobsClass');
551
589
  }
@@ -554,37 +592,40 @@ export class L1TxUtils {
554
592
  const cancelGasPrice = await this.getGasPrice({
555
593
  ...this.config,
556
594
  // Use high bump for cancellation to ensure it replaces the original tx
557
- priorityFeeRetryBumpPercentage: 150, // 150% bump should be enough to replace any tx
595
+ priorityFeeRetryBumpPercentage: 150
558
596
  }, isBlobTx, attempts + 1, previousGasPrice);
559
597
  this.logger?.debug(`Attempting to cancel transaction with nonce ${nonce}`, {
560
598
  maxFeePerGas: formatGwei(cancelGasPrice.maxFeePerGas),
561
- maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas),
599
+ maxPriorityFeePerGas: formatGwei(cancelGasPrice.maxPriorityFeePerGas)
562
600
  });
563
601
  const request = {
564
602
  to: account.address,
565
- value: 0n,
603
+ value: 0n
566
604
  };
567
605
  // Send 0-value tx to self with higher gas price
568
606
  const cancelTxHash = await this.walletClient.sendTransaction({
569
607
  ...request,
570
608
  nonce,
571
- gas: 21000n, // Standard ETH transfer gas
609
+ gas: 21_000n,
572
610
  maxFeePerGas: cancelGasPrice.maxFeePerGas,
573
- maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas,
611
+ maxPriorityFeePerGas: cancelGasPrice.maxPriorityFeePerGas
574
612
  });
575
- const receipt = await this.monitorTransaction(request, cancelTxHash, { gasLimit: 21000n }, undefined, undefined, true);
613
+ const receipt = await this.monitorTransaction(request, cancelTxHash, {
614
+ gasLimit: 21_000n
615
+ }, undefined, undefined, true);
576
616
  return receipt.transactionHash;
577
617
  }
578
618
  }
579
619
  export function tryGetCustomErrorNameContractFunction(err) {
580
- return compactArray([err.shortMessage, ...(err.metaMessages ?? []).slice(0, 2).map(s => s.trim())]).join(' ');
620
+ return compactArray([
621
+ err.shortMessage,
622
+ ...(err.metaMessages ?? []).slice(0, 2).map((s)=>s.trim())
623
+ ]).join(' ');
581
624
  }
582
625
  /*
583
626
  * Returns cost of calldata usage in Ethereum.
584
627
  * @param data - Calldata.
585
628
  * @returns 4 for each zero byte, 16 for each nonzero.
586
- */
587
- export function getCalldataGasUsage(data) {
588
- return data.filter(byte => byte === 0).length * 4 + data.filter(byte => byte !== 0).length * 16;
629
+ */ export function getCalldataGasUsage(data) {
630
+ return data.filter((byte)=>byte === 0).length * 4 + data.filter((byte)=>byte !== 0).length * 16;
589
631
  }
590
- //# 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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"}