@aztec/ethereum 3.0.3 → 3.9.9-nightly.20260312
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/client.js +6 -2
- package/dest/config.d.ts +19 -27
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +60 -55
- package/dest/contracts/empire_base.d.ts +4 -1
- package/dest/contracts/empire_base.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.d.ts +4 -1
- package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.js +31 -15
- package/dest/contracts/fee_asset_handler.d.ts +6 -5
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.js +11 -9
- package/dest/contracts/fee_asset_price_oracle.d.ts +101 -0
- package/dest/contracts/fee_asset_price_oracle.d.ts.map +1 -0
- package/dest/contracts/fee_asset_price_oracle.js +651 -0
- package/dest/contracts/governance.d.ts +3 -1
- package/dest/contracts/governance.d.ts.map +1 -1
- package/dest/contracts/governance.js +14 -4
- package/dest/contracts/governance_proposer.d.ts +4 -1
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +404 -9
- package/dest/contracts/inbox.d.ts +22 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +36 -1
- package/dest/contracts/index.d.ts +4 -1
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +3 -0
- package/dest/contracts/log.d.ts +13 -0
- package/dest/contracts/log.d.ts.map +1 -0
- package/dest/contracts/log.js +1 -0
- package/dest/contracts/multicall.d.ts +1 -1
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +2 -1
- package/dest/contracts/outbox.d.ts +41 -0
- package/dest/contracts/outbox.d.ts.map +1 -0
- package/dest/contracts/outbox.js +86 -0
- package/dest/contracts/registry.d.ts +3 -1
- package/dest/contracts/registry.d.ts.map +1 -1
- package/dest/contracts/registry.js +30 -1
- package/dest/contracts/rollup.d.ts +163 -81
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +703 -132
- package/dest/contracts/tally_slashing_proposer.d.ts +1 -1
- package/dest/contracts/tally_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/tally_slashing_proposer.js +8 -1
- package/dest/deploy_aztec_l1_contracts.d.ts +18 -4
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +117 -35
- package/dest/deploy_l1_contract.js +3 -3
- package/dest/generated/l1-contracts-defaults.d.ts +30 -0
- package/dest/generated/l1-contracts-defaults.d.ts.map +1 -0
- package/dest/generated/l1-contracts-defaults.js +30 -0
- package/dest/l1_artifacts.d.ts +5975 -1575
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_contract_addresses.d.ts +1 -1
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +3 -3
- package/dest/l1_tx_utils/config.d.ts +7 -1
- package/dest/l1_tx_utils/config.d.ts.map +1 -1
- package/dest/l1_tx_utils/config.js +14 -1
- package/dest/l1_tx_utils/constants.d.ts +8 -2
- package/dest/l1_tx_utils/constants.d.ts.map +1 -1
- package/dest/l1_tx_utils/constants.js +27 -2
- package/dest/l1_tx_utils/factory.d.ts +18 -10
- package/dest/l1_tx_utils/factory.d.ts.map +1 -1
- package/dest/l1_tx_utils/factory.js +17 -7
- package/dest/l1_tx_utils/fee-strategies/index.d.ts +10 -0
- package/dest/l1_tx_utils/fee-strategies/index.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/index.js +12 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts +8 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive.js +129 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts +23 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +191 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts +51 -0
- package/dest/l1_tx_utils/fee-strategies/types.d.ts.map +1 -0
- package/dest/l1_tx_utils/fee-strategies/types.js +3 -0
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts +15 -15
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/forwarder_l1_tx_utils.js +9 -15
- package/dest/l1_tx_utils/index-blobs.d.ts +3 -3
- package/dest/l1_tx_utils/index-blobs.d.ts.map +1 -1
- package/dest/l1_tx_utils/index-blobs.js +2 -2
- package/dest/l1_tx_utils/index.d.ts +4 -1
- package/dest/l1_tx_utils/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/index.js +3 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts +233 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.d.ts.map +1 -0
- package/dest/l1_tx_utils/l1_fee_analyzer.js +506 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +18 -7
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +58 -42
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts +4 -15
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +43 -147
- package/dest/l1_tx_utils/tx_delayer.d.ts +56 -0
- package/dest/l1_tx_utils/tx_delayer.d.ts.map +1 -0
- package/dest/{test → l1_tx_utils}/tx_delayer.js +62 -34
- package/dest/publisher_manager.d.ts +3 -2
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +2 -2
- package/dest/queries.d.ts +2 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +12 -4
- package/dest/test/chain_monitor.js +1 -2
- package/dest/test/eth_cheat_codes.d.ts +13 -1
- package/dest/test/eth_cheat_codes.d.ts.map +1 -1
- package/dest/test/eth_cheat_codes.js +3 -1
- package/dest/test/index.d.ts +1 -3
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/index.js +0 -2
- package/dest/test/rollup_cheat_codes.d.ts +5 -2
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +22 -3
- package/dest/test/start_anvil.js +1 -1
- package/dest/test/upgrade_utils.js +2 -2
- package/dest/utils.d.ts +15 -2
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +64 -0
- package/package.json +9 -7
- package/src/client.ts +2 -2
- package/src/config.ts +76 -54
- package/src/contracts/README.md +157 -0
- package/src/contracts/empire_base.ts +3 -1
- package/src/contracts/empire_slashing_proposer.ts +28 -28
- package/src/contracts/fee_asset_handler.ts +10 -7
- package/src/contracts/fee_asset_price_oracle.ts +280 -0
- package/src/contracts/governance.ts +13 -4
- package/src/contracts/governance_proposer.ts +16 -2
- package/src/contracts/inbox.ts +53 -1
- package/src/contracts/index.ts +3 -0
- package/src/contracts/log.ts +13 -0
- package/src/contracts/multicall.ts +5 -2
- package/src/contracts/outbox.ts +98 -0
- package/src/contracts/registry.ts +31 -1
- package/src/contracts/rollup.ts +382 -94
- package/src/contracts/tally_slashing_proposer.ts +5 -1
- package/src/deploy_aztec_l1_contracts.ts +147 -44
- package/src/deploy_l1_contract.ts +3 -3
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_contract_addresses.ts +22 -20
- package/src/l1_tx_utils/config.ts +20 -0
- package/src/l1_tx_utils/constants.ts +13 -2
- package/src/l1_tx_utils/factory.ts +31 -31
- package/src/l1_tx_utils/fee-strategies/index.ts +22 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +163 -0
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +245 -0
- package/src/l1_tx_utils/fee-strategies/types.ts +56 -0
- package/src/l1_tx_utils/forwarder_l1_tx_utils.ts +43 -54
- package/src/l1_tx_utils/index-blobs.ts +2 -2
- package/src/l1_tx_utils/index.ts +3 -0
- package/src/l1_tx_utils/l1_fee_analyzer.ts +803 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +60 -32
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +56 -190
- package/src/{test → l1_tx_utils}/tx_delayer.ts +78 -50
- package/src/publisher_manager.ts +4 -2
- package/src/queries.ts +11 -3
- package/src/test/chain_monitor.ts +1 -1
- package/src/test/eth_cheat_codes.ts +1 -1
- package/src/test/index.ts +0 -2
- package/src/test/rollup_cheat_codes.ts +22 -4
- package/src/test/start_anvil.ts +1 -1
- package/src/test/upgrade_utils.ts +2 -2
- package/src/utils.ts +82 -0
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts +0 -26
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.d.ts.map +0 -1
- package/dest/l1_tx_utils/l1_tx_utils_with_blobs.js +0 -26
- package/dest/test/delayed_tx_utils.d.ts +0 -13
- package/dest/test/delayed_tx_utils.d.ts.map +0 -1
- package/dest/test/delayed_tx_utils.js +0 -28
- package/dest/test/tx_delayer.d.ts +0 -36
- package/dest/test/tx_delayer.d.ts.map +0 -1
- package/src/l1_tx_utils/l1_tx_utils_with_blobs.ts +0 -77
- package/src/test/delayed_tx_utils.ts +0 -52
|
@@ -1,8 +1,9 @@
|
|
|
1
|
+
import type { BlobKzgInstance } from '@aztec/blob-lib/types';
|
|
1
2
|
import { maxBigint } from '@aztec/foundation/bigint';
|
|
2
3
|
import { merge, pick } from '@aztec/foundation/collection';
|
|
3
4
|
import { InterruptError, TimeoutError } from '@aztec/foundation/error';
|
|
4
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
|
-
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
6
|
+
import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
|
|
6
7
|
import { retryUntil } from '@aztec/foundation/retry';
|
|
7
8
|
import { sleep } from '@aztec/foundation/sleep';
|
|
8
9
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -13,23 +14,21 @@ import {
|
|
|
13
14
|
type Abi,
|
|
14
15
|
type BlockOverrides,
|
|
15
16
|
type Hex,
|
|
16
|
-
type NonceManager,
|
|
17
17
|
type PrepareTransactionRequestRequest,
|
|
18
18
|
type StateOverride,
|
|
19
19
|
type TransactionReceipt,
|
|
20
20
|
type TransactionSerializable,
|
|
21
|
-
createNonceManager,
|
|
22
21
|
formatGwei,
|
|
23
22
|
serializeTransaction,
|
|
24
23
|
} from 'viem';
|
|
25
|
-
import { jsonRpc } from 'viem/nonce';
|
|
26
24
|
|
|
27
25
|
import type { ViemClient } from '../types.js';
|
|
28
26
|
import { formatViemError } from '../utils.js';
|
|
29
27
|
import { type L1TxUtilsConfig, l1TxUtilsConfigMappings } from './config.js';
|
|
30
|
-
import {
|
|
28
|
+
import { MAX_L1_TX_LIMIT } from './constants.js';
|
|
31
29
|
import type { IL1TxMetrics, IL1TxStore } from './interfaces.js';
|
|
32
30
|
import { ReadOnlyL1TxUtils } from './readonly_l1_tx_utils.js';
|
|
31
|
+
import { Delayer, createDelayer, wrapClientWithDelayer } from './tx_delayer.js';
|
|
33
32
|
import {
|
|
34
33
|
DroppedTransactionError,
|
|
35
34
|
type L1BlobInputs,
|
|
@@ -45,8 +44,13 @@ import {
|
|
|
45
44
|
const MAX_L1_TX_STATES = 32;
|
|
46
45
|
|
|
47
46
|
export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
48
|
-
protected nonceManager: NonceManager;
|
|
49
47
|
protected txs: L1TxState[] = [];
|
|
48
|
+
/** Last nonce successfully sent to the chain. Used as a lower bound when a fallback RPC node returns a stale count. */
|
|
49
|
+
private lastSentNonce: number | undefined;
|
|
50
|
+
/** Tx delayer for testing. Only set when enableDelayer config is true. */
|
|
51
|
+
public delayer?: Delayer;
|
|
52
|
+
/** KZG instance for blob operations. */
|
|
53
|
+
protected kzg?: BlobKzgInstance;
|
|
50
54
|
|
|
51
55
|
constructor(
|
|
52
56
|
public override client: ViemClient,
|
|
@@ -58,9 +62,25 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
58
62
|
debugMaxGasLimit: boolean = false,
|
|
59
63
|
protected store?: IL1TxStore,
|
|
60
64
|
protected metrics?: IL1TxMetrics,
|
|
65
|
+
kzg?: BlobKzgInstance,
|
|
66
|
+
delayer?: Delayer,
|
|
61
67
|
) {
|
|
62
68
|
super(client, logger, dateProvider, config, debugMaxGasLimit);
|
|
63
|
-
this.
|
|
69
|
+
this.kzg = kzg;
|
|
70
|
+
|
|
71
|
+
// Set up delayer: use provided one or create new
|
|
72
|
+
if (config?.enableDelayer && config?.ethereumSlotDuration) {
|
|
73
|
+
this.delayer =
|
|
74
|
+
delayer ?? this.createDelayer({ ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings());
|
|
75
|
+
this.client = wrapClientWithDelayer(this.client, this.delayer);
|
|
76
|
+
if (config.txDelayerMaxInclusionTimeIntoSlot !== undefined) {
|
|
77
|
+
this.delayer.setMaxInclusionTimeIntoSlot(config.txDelayerMaxInclusionTimeIntoSlot);
|
|
78
|
+
}
|
|
79
|
+
} else if (delayer) {
|
|
80
|
+
// Delayer provided but enableDelayer not set — just store it without wrapping
|
|
81
|
+
logger.warn('Delayer provided but enableDelayer config is not set; delayer will not be used');
|
|
82
|
+
this.delayer = delayer;
|
|
83
|
+
}
|
|
64
84
|
}
|
|
65
85
|
|
|
66
86
|
public get state() {
|
|
@@ -87,6 +107,11 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
87
107
|
this.metrics?.recordMinedTx(l1TxState, new Date(l1Timestamp));
|
|
88
108
|
} else if (newState === TxUtilsState.NOT_MINED) {
|
|
89
109
|
this.metrics?.recordDroppedTx(l1TxState);
|
|
110
|
+
// The tx was dropped: the chain nonce reverted to l1TxState.nonce, so our lower bound is
|
|
111
|
+
// no longer valid. Clear it so the next send fetches the real nonce from the chain.
|
|
112
|
+
if (this.lastSentNonce === l1TxState.nonce) {
|
|
113
|
+
this.lastSentNonce = undefined;
|
|
114
|
+
}
|
|
90
115
|
}
|
|
91
116
|
|
|
92
117
|
// Update state in the store
|
|
@@ -207,7 +232,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
207
232
|
|
|
208
233
|
let gasLimit: bigint;
|
|
209
234
|
if (this.debugMaxGasLimit) {
|
|
210
|
-
gasLimit =
|
|
235
|
+
gasLimit = MAX_L1_TX_LIMIT;
|
|
211
236
|
} else if (gasConfig.gasLimit) {
|
|
212
237
|
gasLimit = gasConfig.gasLimit;
|
|
213
238
|
} else {
|
|
@@ -221,15 +246,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
221
246
|
throw new InterruptError(`Transaction sending is interrupted`);
|
|
222
247
|
}
|
|
223
248
|
|
|
224
|
-
const nonce = await this.nonceManager.consume({
|
|
225
|
-
client: this.client,
|
|
226
|
-
address: account,
|
|
227
|
-
chainId: this.client.chain.id,
|
|
228
|
-
});
|
|
229
|
-
|
|
230
|
-
const baseState = { request, gasLimit, blobInputs, gasPrice, nonce };
|
|
231
|
-
const txData = this.makeTxData(baseState, { isCancelTx: false });
|
|
232
|
-
|
|
233
249
|
const now = new Date(await this.getL1Timestamp());
|
|
234
250
|
if (gasConfig.txTimeoutAt && now > gasConfig.txTimeoutAt) {
|
|
235
251
|
throw new TimeoutError(
|
|
@@ -237,9 +253,20 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
237
253
|
);
|
|
238
254
|
}
|
|
239
255
|
|
|
256
|
+
const chainNonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
|
|
257
|
+
// If a fallback RPC node returns a stale count (lower than what we last sent), use our
|
|
258
|
+
// local lower bound to avoid sending a duplicate of an already-pending transaction.
|
|
259
|
+
const nonce =
|
|
260
|
+
this.lastSentNonce !== undefined && chainNonce <= this.lastSentNonce ? this.lastSentNonce + 1 : chainNonce;
|
|
261
|
+
|
|
262
|
+
const baseState = { request, gasLimit, blobInputs, gasPrice, nonce };
|
|
263
|
+
const txData = this.makeTxData(baseState, { isCancelTx: false });
|
|
264
|
+
|
|
240
265
|
// Send the new tx
|
|
241
266
|
const signedRequest = await this.prepareSignedTransaction(txData);
|
|
242
267
|
const txHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
|
|
268
|
+
// Update after tx is sent successfully
|
|
269
|
+
this.lastSentNonce = nonce;
|
|
243
270
|
|
|
244
271
|
// Create the new state for monitoring
|
|
245
272
|
const l1TxState: L1TxState = {
|
|
@@ -283,7 +310,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
283
310
|
return { txHash, state: l1TxState };
|
|
284
311
|
} catch (err: any) {
|
|
285
312
|
const viemError = formatViemError(err, request.abi);
|
|
286
|
-
this.logger.error(`Failed to send L1 transaction`, viemError, {
|
|
313
|
+
this.logger.error(`Failed to send L1 transaction: ${viemError.message}`, viemError, {
|
|
287
314
|
request: pick(request, 'to', 'value'),
|
|
288
315
|
});
|
|
289
316
|
throw viemError;
|
|
@@ -423,7 +450,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
423
450
|
{ nonce, account, pendingNonce, timePassed },
|
|
424
451
|
);
|
|
425
452
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
426
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
427
453
|
throw new DroppedTransactionError(nonce, account);
|
|
428
454
|
}
|
|
429
455
|
|
|
@@ -515,12 +541,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
515
541
|
|
|
516
542
|
// Oh no, the transaction has timed out!
|
|
517
543
|
if (isCancelTx || !gasConfig.cancelTxOnTimeout) {
|
|
518
|
-
// If this was already a cancellation tx, or we are configured to not cancel txs, we just mark it as NOT_MINED
|
|
519
|
-
// and reset the nonce manager, so the next tx that comes along can reuse the nonce if/when this tx gets dropped.
|
|
520
|
-
// This is the nastiest scenario for us, since the new tx could acquire the next nonce, but then this tx is dropped,
|
|
521
|
-
// and the new tx would never get mined. Eventually, the new tx would also drop.
|
|
522
544
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
523
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
524
545
|
} else {
|
|
525
546
|
// Otherwise we fire the cancellation without awaiting to avoid blocking the caller,
|
|
526
547
|
// and monitor it in the background so we can speed it up as needed.
|
|
@@ -631,12 +652,12 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
631
652
|
from: request.from ?? this.getSenderAddress().toString(),
|
|
632
653
|
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
633
654
|
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
634
|
-
gas: request.gas ??
|
|
655
|
+
gas: request.gas ?? MAX_L1_TX_LIMIT,
|
|
635
656
|
};
|
|
636
657
|
|
|
637
658
|
if (!request.gas && !gasConfig.ignoreBlockGasLimit) {
|
|
638
|
-
//
|
|
639
|
-
blockOverrides.gasLimit =
|
|
659
|
+
// MAX_L1_TX_LIMIT is set as call.gas, ensure block gasLimit is sufficient
|
|
660
|
+
blockOverrides.gasLimit = MAX_L1_TX_LIMIT;
|
|
640
661
|
}
|
|
641
662
|
|
|
642
663
|
return this._simulate(call, blockOverrides, stateOverrides, gasConfig, abi);
|
|
@@ -659,7 +680,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
659
680
|
{ nonce, account },
|
|
660
681
|
);
|
|
661
682
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
662
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
663
683
|
return;
|
|
664
684
|
}
|
|
665
685
|
|
|
@@ -671,7 +691,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
671
691
|
{ nonce, account, currentNonce },
|
|
672
692
|
);
|
|
673
693
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
674
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
675
694
|
return;
|
|
676
695
|
}
|
|
677
696
|
|
|
@@ -731,8 +750,17 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
731
750
|
return Number(timestamp) * 1000;
|
|
732
751
|
}
|
|
733
752
|
|
|
734
|
-
/** Makes empty blob inputs for the cancellation tx.
|
|
735
|
-
protected makeEmptyBlobInputs(
|
|
736
|
-
|
|
753
|
+
/** Makes empty blob inputs for the cancellation tx. */
|
|
754
|
+
protected makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs> {
|
|
755
|
+
if (!this.kzg) {
|
|
756
|
+
throw new Error('Cannot make empty blob inputs for cancellation without kzg');
|
|
757
|
+
}
|
|
758
|
+
const blobData = new Uint8Array(131072).fill(0);
|
|
759
|
+
return { blobs: [blobData], kzg: this.kzg, maxFeePerBlobGas };
|
|
760
|
+
}
|
|
761
|
+
|
|
762
|
+
/** Creates a new delayer instance. */
|
|
763
|
+
protected createDelayer(opts: { ethereumSlotDuration: bigint | number }, bindings: LoggerBindings): Delayer {
|
|
764
|
+
return createDelayer(this.dateProvider, opts, bindings);
|
|
737
765
|
}
|
|
738
766
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { getKeys,
|
|
1
|
+
import { getKeys, merge, pick, times } from '@aztec/foundation/collection';
|
|
2
|
+
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
3
4
|
import { makeBackoff, retry } from '@aztec/foundation/retry';
|
|
4
5
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -11,6 +12,7 @@ import {
|
|
|
11
12
|
type BaseError,
|
|
12
13
|
type BlockOverrides,
|
|
13
14
|
type ContractFunctionExecutionError,
|
|
15
|
+
type GetCodeReturnType,
|
|
14
16
|
type Hex,
|
|
15
17
|
MethodNotFoundRpcError,
|
|
16
18
|
MethodNotSupportedRpcError,
|
|
@@ -25,15 +27,17 @@ import type { ViemClient } from '../types.js';
|
|
|
25
27
|
import { type L1TxUtilsConfig, defaultL1TxUtilsConfig, l1TxUtilsConfigMappings } from './config.js';
|
|
26
28
|
import {
|
|
27
29
|
BLOCK_TIME_MS,
|
|
28
|
-
|
|
30
|
+
MAX_L1_TX_LIMIT,
|
|
29
31
|
MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE,
|
|
30
32
|
MIN_REPLACEMENT_BUMP_PERCENTAGE,
|
|
31
33
|
WEI_CONST,
|
|
32
34
|
} from './constants.js';
|
|
35
|
+
import { P75AllTxsPriorityFeeStrategy, type PriorityFeeStrategy } from './fee-strategies/index.js';
|
|
33
36
|
import type { GasPrice, L1BlobInputs, L1TxRequest, TransactionStats } from './types.js';
|
|
34
37
|
import { getCalldataGasUsage, tryGetCustomErrorNameContractFunction } from './utils.js';
|
|
35
38
|
|
|
36
|
-
|
|
39
|
+
// Change this to the current strategy we want to use
|
|
40
|
+
const CurrentStrategy: PriorityFeeStrategy = P75AllTxsPriorityFeeStrategy;
|
|
37
41
|
|
|
38
42
|
export class ReadOnlyL1TxUtils {
|
|
39
43
|
public config: Required<L1TxUtilsConfig>;
|
|
@@ -65,122 +69,8 @@ export class ReadOnlyL1TxUtils {
|
|
|
65
69
|
return this.client.getBlockNumber();
|
|
66
70
|
}
|
|
67
71
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
* Falls back to network estimate if data is unavailable or fails.
|
|
71
|
-
* @param networkEstimateResult - Result from estimateMaxPriorityFeePerGas RPC call
|
|
72
|
-
* @param pendingBlockResult - Result from getBlock with pending tag RPC call
|
|
73
|
-
* @param feeHistoryResult - Result from getFeeHistory RPC call
|
|
74
|
-
* @returns A competitive priority fee based on pending txs and recent block history
|
|
75
|
-
*/
|
|
76
|
-
protected getCompetitivePriorityFee(
|
|
77
|
-
networkEstimateResult: PromiseSettledResult<bigint | null>,
|
|
78
|
-
pendingBlockResult: PromiseSettledResult<Awaited<ReturnType<ViemClient['getBlock']>> | null>,
|
|
79
|
-
feeHistoryResult: PromiseSettledResult<Awaited<ReturnType<ViemClient['getFeeHistory']>> | null>,
|
|
80
|
-
): bigint {
|
|
81
|
-
const networkEstimate =
|
|
82
|
-
networkEstimateResult.status === 'fulfilled' && typeof networkEstimateResult.value === 'bigint'
|
|
83
|
-
? networkEstimateResult.value
|
|
84
|
-
: 0n;
|
|
85
|
-
let competitiveFee = networkEstimate;
|
|
86
|
-
|
|
87
|
-
if (
|
|
88
|
-
pendingBlockResult.status === 'fulfilled' &&
|
|
89
|
-
pendingBlockResult.value !== null &&
|
|
90
|
-
pendingBlockResult.value.transactions &&
|
|
91
|
-
pendingBlockResult.value.transactions.length > 0
|
|
92
|
-
) {
|
|
93
|
-
const pendingBlock = pendingBlockResult.value;
|
|
94
|
-
// Extract priority fees from pending transactions
|
|
95
|
-
const pendingFees = pendingBlock.transactions
|
|
96
|
-
.map(tx => {
|
|
97
|
-
// Transaction can be just a hash string, so we need to check if it's an object
|
|
98
|
-
if (typeof tx === 'string') {
|
|
99
|
-
return 0n;
|
|
100
|
-
}
|
|
101
|
-
const fee = tx.maxPriorityFeePerGas || 0n;
|
|
102
|
-
// Debug: Log suspicious fees
|
|
103
|
-
if (fee > 100n * WEI_CONST) {
|
|
104
|
-
this.logger?.warn('Suspicious high priority fee in pending tx', {
|
|
105
|
-
txHash: tx.hash,
|
|
106
|
-
maxPriorityFeePerGas: formatGwei(fee),
|
|
107
|
-
maxFeePerGas: formatGwei(tx.maxFeePerGas || 0n),
|
|
108
|
-
maxFeePerBlobGas: tx.maxFeePerBlobGas ? formatGwei(tx.maxFeePerBlobGas) : 'N/A',
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
return fee;
|
|
112
|
-
})
|
|
113
|
-
.filter((fee: bigint) => fee > 0n);
|
|
114
|
-
|
|
115
|
-
if (pendingFees.length > 0) {
|
|
116
|
-
// Use 75th percentile of pending fees to be competitive
|
|
117
|
-
const sortedPendingFees = [...pendingFees].sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
|
|
118
|
-
const percentile75Index = Math.floor((sortedPendingFees.length - 1) * 0.75);
|
|
119
|
-
const pendingCompetitiveFee = sortedPendingFees[percentile75Index];
|
|
120
|
-
|
|
121
|
-
if (pendingCompetitiveFee > competitiveFee) {
|
|
122
|
-
competitiveFee = pendingCompetitiveFee;
|
|
123
|
-
}
|
|
124
|
-
|
|
125
|
-
this.logger?.debug('Analyzed pending transactions for competitive pricing', {
|
|
126
|
-
pendingTxCount: pendingFees.length,
|
|
127
|
-
pendingP75: formatGwei(pendingCompetitiveFee),
|
|
128
|
-
});
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
if (
|
|
132
|
-
feeHistoryResult.status === 'fulfilled' &&
|
|
133
|
-
feeHistoryResult.value !== null &&
|
|
134
|
-
feeHistoryResult.value.reward &&
|
|
135
|
-
feeHistoryResult.value.reward.length > 0
|
|
136
|
-
) {
|
|
137
|
-
const feeHistory = feeHistoryResult.value;
|
|
138
|
-
// Extract 75th percentile fees from each block
|
|
139
|
-
const percentile75Fees = feeHistory.reward!.map(rewards => rewards[0] || 0n).filter(fee => fee > 0n);
|
|
140
|
-
|
|
141
|
-
if (percentile75Fees.length > 0) {
|
|
142
|
-
// Calculate median of the 75th percentile fees across blocks
|
|
143
|
-
const medianHistoricalFee = median(percentile75Fees) ?? 0n;
|
|
144
|
-
|
|
145
|
-
// Debug: Log suspicious fees from history
|
|
146
|
-
if (medianHistoricalFee > 100n * WEI_CONST) {
|
|
147
|
-
this.logger?.warn('Suspicious high fee in history', {
|
|
148
|
-
historicalMedian: formatGwei(medianHistoricalFee),
|
|
149
|
-
allP75Fees: percentile75Fees.map(f => formatGwei(f)),
|
|
150
|
-
});
|
|
151
|
-
}
|
|
152
|
-
|
|
153
|
-
if (medianHistoricalFee > competitiveFee) {
|
|
154
|
-
competitiveFee = medianHistoricalFee;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
this.logger?.debug('Analyzed fee history for competitive pricing', {
|
|
158
|
-
historicalMedian: formatGwei(medianHistoricalFee),
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
// Sanity check: cap competitive fee at 100x network estimate to avoid using unrealistic fees
|
|
164
|
-
// (e.g., Anvil returns inflated historical fees that don't reflect actual network conditions)
|
|
165
|
-
const maxReasonableFee = networkEstimate * 100n;
|
|
166
|
-
if (competitiveFee > maxReasonableFee) {
|
|
167
|
-
this.logger?.warn('Competitive fee exceeds sanity cap, using capped value', {
|
|
168
|
-
competitiveFee: formatGwei(competitiveFee),
|
|
169
|
-
networkEstimate: formatGwei(networkEstimate),
|
|
170
|
-
cappedTo: formatGwei(maxReasonableFee),
|
|
171
|
-
});
|
|
172
|
-
competitiveFee = maxReasonableFee;
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
// Log final decision
|
|
176
|
-
if (competitiveFee > networkEstimate) {
|
|
177
|
-
this.logger?.debug('Using competitive fee from market analysis', {
|
|
178
|
-
networkEstimate: formatGwei(networkEstimate),
|
|
179
|
-
competitive: formatGwei(competitiveFee),
|
|
180
|
-
});
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
return competitiveFee;
|
|
72
|
+
public getCode(address: EthAddress): Promise<GetCodeReturnType> {
|
|
73
|
+
return this.client.getCode({ address: address.toString() });
|
|
184
74
|
}
|
|
185
75
|
|
|
186
76
|
/**
|
|
@@ -194,82 +84,56 @@ export class ReadOnlyL1TxUtils {
|
|
|
194
84
|
): Promise<GasPrice> {
|
|
195
85
|
const gasConfig = merge(this.config, gasConfigOverrides);
|
|
196
86
|
|
|
197
|
-
//
|
|
198
|
-
const
|
|
199
|
-
() =>
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
87
|
+
// Execute strategy - it handles all RPC calls internally and returns everything we need
|
|
88
|
+
const strategyResult = await retry(
|
|
89
|
+
() =>
|
|
90
|
+
CurrentStrategy.execute(this.client, {
|
|
91
|
+
gasConfig,
|
|
92
|
+
isBlobTx,
|
|
93
|
+
logger: this.logger,
|
|
94
|
+
}),
|
|
95
|
+
'Executing priority fee strategy',
|
|
96
|
+
makeBackoff(times(2, () => 0)),
|
|
97
|
+
this.logger,
|
|
98
|
+
true,
|
|
205
99
|
);
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
const
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
)
|
|
214
|
-
const blobBaseFeePromise = isBlobTx
|
|
215
|
-
? this.tryTwice(() => this.client.getBlobBaseFee(), 'Getting blob base fee')
|
|
216
|
-
: null;
|
|
217
|
-
|
|
218
|
-
const [latestBlockResult, networkEstimateResult, pendingBlockResult, feeHistoryResult, blobBaseFeeResult] =
|
|
219
|
-
await Promise.allSettled([
|
|
220
|
-
latestBlockPromise,
|
|
221
|
-
networkEstimatePromise,
|
|
222
|
-
pendingBlockPromise,
|
|
223
|
-
feeHistoryPromise,
|
|
224
|
-
blobBaseFeePromise ?? Promise.resolve(0n),
|
|
225
|
-
]);
|
|
226
|
-
|
|
227
|
-
// Extract results
|
|
228
|
-
const baseFee =
|
|
229
|
-
latestBlockResult.status === 'fulfilled' &&
|
|
230
|
-
typeof latestBlockResult.value === 'object' &&
|
|
231
|
-
latestBlockResult.value.baseFeePerGas
|
|
232
|
-
? latestBlockResult.value.baseFeePerGas
|
|
233
|
-
: 0n;
|
|
234
|
-
|
|
235
|
-
// Get blob base fee if available
|
|
236
|
-
let blobBaseFee = 0n;
|
|
237
|
-
if (isBlobTx && blobBaseFeeResult.status === 'fulfilled' && typeof blobBaseFeeResult.value === 'bigint') {
|
|
238
|
-
blobBaseFee = blobBaseFeeResult.value;
|
|
239
|
-
} else if (isBlobTx) {
|
|
100
|
+
|
|
101
|
+
const { latestBlock, blobBaseFee, priorityFee: strategyPriorityFee } = strategyResult;
|
|
102
|
+
|
|
103
|
+
// Extract base fee from latest block
|
|
104
|
+
const baseFee = latestBlock.baseFeePerGas ?? 0n;
|
|
105
|
+
|
|
106
|
+
// Handle blob base fee
|
|
107
|
+
if (isBlobTx && blobBaseFee === undefined) {
|
|
240
108
|
this.logger?.warn('Failed to get L1 blob base fee', attempt);
|
|
241
109
|
}
|
|
242
110
|
|
|
243
|
-
|
|
244
|
-
let priorityFee = this.getCompetitivePriorityFee(networkEstimateResult, pendingBlockResult, feeHistoryResult);
|
|
111
|
+
let priorityFee = strategyPriorityFee;
|
|
245
112
|
|
|
246
|
-
// Apply minimum priority fee
|
|
113
|
+
// Apply minimum priority fee floor if configured
|
|
247
114
|
if (gasConfig.minimumPriorityFeePerGas) {
|
|
248
|
-
const
|
|
249
|
-
if (
|
|
250
|
-
this.logger?.debug('
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
priorityFee = minimumFee;
|
|
255
|
-
} else {
|
|
256
|
-
this.logger?.debug('Competitive fee exceeds minimum, using competitive fee', {
|
|
257
|
-
minimumPriorityFeePerGas: formatGwei(minimumFee),
|
|
258
|
-
competitiveFee: formatGwei(priorityFee),
|
|
115
|
+
const minimumPriorityFee = BigInt(Math.trunc(gasConfig.minimumPriorityFeePerGas * Number(WEI_CONST)));
|
|
116
|
+
if (priorityFee < minimumPriorityFee) {
|
|
117
|
+
this.logger?.debug('Applying minimum priority fee floor', {
|
|
118
|
+
calculatedPriorityFee: formatGwei(priorityFee),
|
|
119
|
+
minimumPriorityFeePerGas: gasConfig.minimumPriorityFeePerGas,
|
|
120
|
+
appliedFee: formatGwei(minimumPriorityFee),
|
|
259
121
|
});
|
|
122
|
+
priorityFee = minimumPriorityFee;
|
|
260
123
|
}
|
|
261
124
|
}
|
|
262
125
|
let maxFeePerGas = baseFee;
|
|
263
126
|
|
|
264
|
-
let maxFeePerBlobGas = blobBaseFee;
|
|
127
|
+
let maxFeePerBlobGas = blobBaseFee ?? 0n;
|
|
265
128
|
|
|
266
129
|
// Bump base fee so it's valid for next blocks if it stalls
|
|
267
130
|
const numBlocks = Math.ceil(gasConfig.stallTimeMs! / BLOCK_TIME_MS);
|
|
268
131
|
for (let i = 0; i < numBlocks; i++) {
|
|
269
132
|
// each block can go up 12.5% from previous baseFee
|
|
270
|
-
|
|
133
|
+
// ceil, (a+b-1)/b, to avoid truncation at small values (e.g. 1 wei blob base fee)
|
|
134
|
+
maxFeePerGas = (maxFeePerGas * (1_000n + 125n) + 999n) / 1_000n;
|
|
271
135
|
// same for blob gas fee
|
|
272
|
-
maxFeePerBlobGas = (maxFeePerBlobGas * (1_000n + 125n)) / 1_000n;
|
|
136
|
+
maxFeePerBlobGas = (maxFeePerBlobGas * (1_000n + 125n) + 999n) / 1_000n;
|
|
273
137
|
}
|
|
274
138
|
|
|
275
139
|
if (attempt > 0) {
|
|
@@ -355,7 +219,7 @@ export class ReadOnlyL1TxUtils {
|
|
|
355
219
|
baseFee: formatGwei(baseFee),
|
|
356
220
|
maxFeePerGas: formatGwei(maxFeePerGas),
|
|
357
221
|
maxPriorityFeePerGas: formatGwei(maxPriorityFeePerGas),
|
|
358
|
-
blobBaseFee: formatGwei(blobBaseFee),
|
|
222
|
+
blobBaseFee: formatGwei(blobBaseFee ?? 0n),
|
|
359
223
|
maxFeePerBlobGas: formatGwei(maxFeePerBlobGas),
|
|
360
224
|
},
|
|
361
225
|
);
|
|
@@ -379,19 +243,28 @@ export class ReadOnlyL1TxUtils {
|
|
|
379
243
|
const gasConfig = { ...this.config, ..._gasConfig };
|
|
380
244
|
let initialEstimate = 0n;
|
|
381
245
|
if (_blobInputs) {
|
|
382
|
-
// @note requests with blobs also require maxFeePerBlobGas to be set
|
|
246
|
+
// @note requests with blobs also require maxFeePerBlobGas to be set.
|
|
247
|
+
// Use 2x buffer for maxFeePerBlobGas to avoid stale fees and to pass EIP-4844 validation (even if it is a gas estimation call).
|
|
248
|
+
// 1. maxFeePerBlobGas >= blobBaseFee
|
|
249
|
+
// 2. account balance >= gas * maxFeePerGas + maxFeePerBlobGas * blobCount + value
|
|
383
250
|
const gasPrice = await this.getGasPrice(gasConfig, true, 0);
|
|
384
251
|
initialEstimate = await this.client.estimateGas({
|
|
385
252
|
account,
|
|
386
253
|
...request,
|
|
387
254
|
..._blobInputs,
|
|
388
|
-
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas
|
|
389
|
-
gas:
|
|
255
|
+
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas! * 2n,
|
|
256
|
+
gas: MAX_L1_TX_LIMIT,
|
|
257
|
+
blockTag: 'latest',
|
|
390
258
|
});
|
|
391
259
|
|
|
392
260
|
this.logger?.trace(`Estimated gas for blob tx: ${initialEstimate}`);
|
|
393
261
|
} else {
|
|
394
|
-
initialEstimate = await this.client.estimateGas({
|
|
262
|
+
initialEstimate = await this.client.estimateGas({
|
|
263
|
+
account,
|
|
264
|
+
...request,
|
|
265
|
+
gas: MAX_L1_TX_LIMIT,
|
|
266
|
+
blockTag: 'latest',
|
|
267
|
+
});
|
|
395
268
|
this.logger?.trace(`Estimated gas for non-blob tx: ${initialEstimate}`);
|
|
396
269
|
}
|
|
397
270
|
|
|
@@ -547,11 +420,4 @@ export class ReadOnlyL1TxUtils {
|
|
|
547
420
|
});
|
|
548
421
|
return bumpedGasLimit;
|
|
549
422
|
}
|
|
550
|
-
|
|
551
|
-
/**
|
|
552
|
-
* Helper function to retry RPC calls twice
|
|
553
|
-
*/
|
|
554
|
-
private tryTwice<T>(fn: () => Promise<T>, description: string): Promise<T> {
|
|
555
|
-
return retry<T>(fn, description, makeBackoff(times(2, () => 0)), this.logger, true);
|
|
556
|
-
}
|
|
557
423
|
}
|