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