@aztec/ethereum 0.0.1-commit.6d3c34e → 0.0.1-commit.72dcdcda8
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/config.d.ts +15 -28
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +50 -57
- package/dest/contracts/empire_base.d.ts +3 -1
- package/dest/contracts/empire_base.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.d.ts +3 -1
- package/dest/contracts/empire_slashing_proposer.d.ts.map +1 -1
- package/dest/contracts/empire_slashing_proposer.js +22 -15
- package/dest/contracts/fee_asset_handler.d.ts +1 -1
- package/dest/contracts/fee_asset_handler.d.ts.map +1 -1
- package/dest/contracts/fee_asset_handler.js +2 -0
- 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 +3 -1
- package/dest/contracts/governance_proposer.d.ts.map +1 -1
- package/dest/contracts/governance_proposer.js +13 -1
- package/dest/contracts/inbox.d.ts +18 -1
- package/dest/contracts/inbox.d.ts.map +1 -1
- package/dest/contracts/inbox.js +32 -1
- package/dest/contracts/index.d.ts +3 -1
- package/dest/contracts/index.d.ts.map +1 -1
- package/dest/contracts/index.js +2 -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/rollup.d.ts +35 -3
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +86 -6
- 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 +7 -3
- package/dest/deploy_aztec_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_aztec_l1_contracts.js +56 -28
- 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 +2405 -473
- package/dest/l1_artifacts.d.ts.map +1 -1
- 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 +1 -1
- package/dest/l1_tx_utils/constants.js +2 -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/p75_competitive.js +1 -1
- package/dest/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.js +1 -1
- 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 +2 -1
- package/dest/l1_tx_utils/index.d.ts.map +1 -1
- package/dest/l1_tx_utils/index.js +1 -0
- package/dest/l1_tx_utils/l1_tx_utils.d.ts +16 -7
- package/dest/l1_tx_utils/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/l1_tx_utils.js +47 -42
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +3 -3
- 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 +4 -1
- package/dest/test/eth_cheat_codes.d.ts +13 -1
- package/dest/test/eth_cheat_codes.d.ts.map +1 -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 +4 -2
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +10 -1
- package/dest/test/start_anvil.d.ts +9 -3
- package/dest/test/start_anvil.d.ts.map +1 -1
- package/dest/test/start_anvil.js +128 -29
- package/dest/test/upgrade_utils.js +2 -2
- package/dest/utils.d.ts +2 -1
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +46 -0
- package/package.json +8 -9
- package/src/config.ts +58 -56
- package/src/contracts/README.md +157 -0
- package/src/contracts/empire_base.ts +2 -0
- package/src/contracts/empire_slashing_proposer.ts +22 -27
- package/src/contracts/fee_asset_handler.ts +2 -0
- package/src/contracts/fee_asset_price_oracle.ts +280 -0
- package/src/contracts/governance.ts +13 -4
- package/src/contracts/governance_proposer.ts +10 -1
- package/src/contracts/inbox.ts +48 -1
- package/src/contracts/index.ts +2 -0
- package/src/contracts/log.ts +13 -0
- package/src/contracts/multicall.ts +5 -2
- package/src/contracts/rollup.ts +125 -11
- package/src/contracts/tally_slashing_proposer.ts +5 -1
- package/src/deploy_aztec_l1_contracts.ts +80 -35
- package/src/deploy_l1_contract.ts +3 -3
- package/src/generated/l1-contracts-defaults.ts +32 -0
- package/src/l1_tx_utils/config.ts +20 -0
- package/src/l1_tx_utils/constants.ts +2 -2
- package/src/l1_tx_utils/factory.ts +31 -31
- package/src/l1_tx_utils/fee-strategies/p75_competitive.ts +1 -1
- package/src/l1_tx_utils/fee-strategies/p75_competitive_blob_txs_only.ts +1 -1
- 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 +1 -0
- package/src/l1_tx_utils/l1_tx_utils.ts +47 -32
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +3 -3
- package/src/{test → l1_tx_utils}/tx_delayer.ts +78 -50
- package/src/publisher_manager.ts +4 -2
- package/src/queries.ts +3 -1
- package/src/test/index.ts +0 -2
- package/src/test/rollup_cheat_codes.ts +11 -2
- package/src/test/start_anvil.ts +146 -29
- package/src/test/upgrade_utils.ts +2 -2
- package/src/utils.ts +53 -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
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Auto-generated from spartan/environments/network-defaults.yml
|
|
2
|
+
// Do not edit manually - run yarn generate to regenerate
|
|
3
|
+
|
|
4
|
+
/** Default L1 contracts configuration values from network-defaults.yml */
|
|
5
|
+
export const l1ContractsDefaultEnv = {
|
|
6
|
+
ETHEREUM_SLOT_DURATION: 12,
|
|
7
|
+
AZTEC_SLOT_DURATION: 72,
|
|
8
|
+
AZTEC_EPOCH_DURATION: 32,
|
|
9
|
+
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
10
|
+
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
11
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
12
|
+
AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
|
|
13
|
+
AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
|
|
14
|
+
AZTEC_LOCAL_EJECTION_THRESHOLD: 98000000000000000000,
|
|
15
|
+
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
16
|
+
AZTEC_INBOX_LAG: 1,
|
|
17
|
+
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
18
|
+
AZTEC_MANA_TARGET: 100000000,
|
|
19
|
+
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
20
|
+
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
21
|
+
AZTEC_SLASHER_FLAVOR: 'tally',
|
|
22
|
+
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
23
|
+
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
24
|
+
AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS: 0,
|
|
25
|
+
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
26
|
+
AZTEC_SLASHING_VETOER: '0x0000000000000000000000000000000000000000',
|
|
27
|
+
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
28
|
+
AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
|
|
29
|
+
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
30
|
+
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
31
|
+
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
32
|
+
} as const;
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
getConfigFromMappings,
|
|
6
6
|
getDefaultConfig,
|
|
7
7
|
numberConfigHelper,
|
|
8
|
+
optionalNumberConfigHelper,
|
|
8
9
|
} from '@aztec/foundation/config';
|
|
9
10
|
|
|
10
11
|
export interface L1TxUtilsConfig {
|
|
@@ -60,6 +61,12 @@ export interface L1TxUtilsConfig {
|
|
|
60
61
|
* How long a tx nonce can be unseen in the mempool before considering it dropped
|
|
61
62
|
*/
|
|
62
63
|
txUnseenConsideredDroppedMs?: number;
|
|
64
|
+
/** Enable tx delayer. When true, wraps the viem client to intercept and delay txs. Test-only. */
|
|
65
|
+
enableDelayer?: boolean;
|
|
66
|
+
/** Max seconds into an L1 slot for tx inclusion. Txs sent later are deferred to next slot. Only used when enableDelayer is true. */
|
|
67
|
+
txDelayerMaxInclusionTimeIntoSlot?: number;
|
|
68
|
+
/** How many seconds an L1 slot lasts. */
|
|
69
|
+
ethereumSlotDuration?: number;
|
|
63
70
|
}
|
|
64
71
|
|
|
65
72
|
export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
|
|
@@ -142,6 +149,19 @@ export const l1TxUtilsConfigMappings: ConfigMappingsType<L1TxUtilsConfig> = {
|
|
|
142
149
|
env: 'L1_TX_MONITOR_TX_UNSEEN_CONSIDERED_DROPPED_MS',
|
|
143
150
|
...numberConfigHelper(6 * 12 * 1000), // 6 L1 blocks
|
|
144
151
|
},
|
|
152
|
+
enableDelayer: {
|
|
153
|
+
description: 'Enable tx delayer for testing.',
|
|
154
|
+
...booleanConfigHelper(false),
|
|
155
|
+
},
|
|
156
|
+
txDelayerMaxInclusionTimeIntoSlot: {
|
|
157
|
+
description: 'Max seconds into L1 slot for tx inclusion when delayer is enabled.',
|
|
158
|
+
...optionalNumberConfigHelper(),
|
|
159
|
+
},
|
|
160
|
+
ethereumSlotDuration: {
|
|
161
|
+
env: 'ETHEREUM_SLOT_DURATION',
|
|
162
|
+
description: 'How many seconds an L1 slot lasts.',
|
|
163
|
+
...numberConfigHelper(12),
|
|
164
|
+
},
|
|
145
165
|
};
|
|
146
166
|
|
|
147
167
|
// We abuse the fact that all mappings above have a non null default value and force-type this to Required
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
// 1_000_000_000_000_000_000 Wei = 1 ETH
|
|
4
4
|
export const WEI_CONST = 1_000_000_000n;
|
|
5
5
|
|
|
6
|
-
//
|
|
7
|
-
export const
|
|
6
|
+
// EIP-7825: protocol-level cap on tx gas limit (2^24). Clients reject above this.
|
|
7
|
+
export const MAX_L1_TX_LIMIT = 16_777_216n;
|
|
8
8
|
|
|
9
9
|
// setting a minimum bump percentage to 10% due to geth's implementation
|
|
10
10
|
// https://github.com/ethereum/go-ethereum/blob/e3d61e6db028c412f74bc4d4c7e117a9e29d0de0/core/txpool/legacypool/list.go#L298
|
|
@@ -1,64 +1,64 @@
|
|
|
1
|
+
import type { BlobKzgInstance } from '@aztec/blob-lib/types';
|
|
1
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
3
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
4
5
|
|
|
5
|
-
import type { TransactionSerializable } from 'viem';
|
|
6
|
-
|
|
7
6
|
import type { EthSigner } from '../eth-signer/eth-signer.js';
|
|
8
7
|
import type { ExtendedViemWalletClient, ViemClient } from '../types.js';
|
|
9
8
|
import type { L1TxUtilsConfig } from './config.js';
|
|
10
9
|
import type { IL1TxMetrics, IL1TxStore } from './interfaces.js';
|
|
11
10
|
import { L1TxUtils } from './l1_tx_utils.js';
|
|
12
11
|
import { createViemSigner } from './signer.js';
|
|
12
|
+
import { Delayer } from './tx_delayer.js';
|
|
13
13
|
import type { SigningCallback } from './types.js';
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
15
|
+
/** Source of signing capability: either a wallet client or a separate client + signer. */
|
|
16
|
+
export type L1SignerSource = ExtendedViemWalletClient | { client: ViemClient; signer: EthSigner };
|
|
17
|
+
|
|
18
|
+
export function resolveSignerSource(source: L1SignerSource): {
|
|
19
|
+
client: ViemClient;
|
|
20
|
+
address: EthAddress;
|
|
21
|
+
signingCallback: SigningCallback;
|
|
22
|
+
} {
|
|
23
|
+
if ('account' in source && source.account) {
|
|
24
|
+
return {
|
|
25
|
+
client: source as ExtendedViemWalletClient,
|
|
26
|
+
address: EthAddress.fromString((source as ExtendedViemWalletClient).account.address),
|
|
27
|
+
signingCallback: createViemSigner(source as ExtendedViemWalletClient),
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
const { client, signer } = source as { client: ViemClient; signer: EthSigner };
|
|
31
|
+
return {
|
|
26
32
|
client,
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
deps?.dateProvider,
|
|
31
|
-
config,
|
|
32
|
-
config?.debugMaxGasLimit ?? false,
|
|
33
|
-
deps?.store,
|
|
34
|
-
deps?.metrics,
|
|
35
|
-
);
|
|
33
|
+
address: signer.address,
|
|
34
|
+
signingCallback: async (tx, _addr) => (await signer.signTransaction(tx)).toViemTransactionSignature(),
|
|
35
|
+
};
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
-
export function
|
|
39
|
-
|
|
40
|
-
signer: EthSigner,
|
|
38
|
+
export function createL1TxUtils(
|
|
39
|
+
source: L1SignerSource,
|
|
41
40
|
deps?: {
|
|
42
41
|
logger?: Logger;
|
|
43
42
|
dateProvider?: DateProvider;
|
|
44
43
|
store?: IL1TxStore;
|
|
45
44
|
metrics?: IL1TxMetrics;
|
|
45
|
+
kzg?: BlobKzgInstance;
|
|
46
|
+
delayer?: Delayer;
|
|
46
47
|
},
|
|
47
48
|
config?: Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean },
|
|
48
49
|
): L1TxUtils {
|
|
49
|
-
const
|
|
50
|
-
return (await signer.signTransaction(transaction)).toViemTransactionSignature();
|
|
51
|
-
};
|
|
52
|
-
|
|
50
|
+
const { client, address, signingCallback } = resolveSignerSource(source);
|
|
53
51
|
return new L1TxUtils(
|
|
54
52
|
client,
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
address,
|
|
54
|
+
signingCallback,
|
|
57
55
|
deps?.logger,
|
|
58
56
|
deps?.dateProvider,
|
|
59
57
|
config,
|
|
60
58
|
config?.debugMaxGasLimit ?? false,
|
|
61
59
|
deps?.store,
|
|
62
60
|
deps?.metrics,
|
|
61
|
+
deps?.kzg,
|
|
62
|
+
deps?.delayer,
|
|
63
63
|
);
|
|
64
64
|
}
|
|
@@ -134,7 +134,7 @@ export const P75AllTxsPriorityFeeStrategy: PriorityFeeStrategy = {
|
|
|
134
134
|
// Sanity check: cap competitive fee at 100x network estimate to avoid using unrealistic fees
|
|
135
135
|
const maxReasonableFee = networkEstimate * 100n;
|
|
136
136
|
if (competitiveFee > maxReasonableFee && networkEstimate > 0n) {
|
|
137
|
-
logger?.
|
|
137
|
+
logger?.debug('Competitive fee exceeds sanity cap, using capped value', {
|
|
138
138
|
competitiveFee: formatGwei(competitiveFee),
|
|
139
139
|
networkEstimate: formatGwei(networkEstimate),
|
|
140
140
|
cappedTo: formatGwei(maxReasonableFee),
|
|
@@ -207,7 +207,7 @@ export const P75BlobTxsOnlyPriorityFeeStrategy: PriorityFeeStrategy = {
|
|
|
207
207
|
|
|
208
208
|
// Debug: Log suspicious fees from history
|
|
209
209
|
if (medianHistoricalFee > 100n * WEI_CONST) {
|
|
210
|
-
logger?.
|
|
210
|
+
logger?.debug('Suspicious high fee in history', {
|
|
211
211
|
historicalMedian: formatGwei(medianHistoricalFee),
|
|
212
212
|
allP75Fees: percentile75Fees.map(f => formatGwei(f)),
|
|
213
213
|
});
|
|
@@ -1,25 +1,27 @@
|
|
|
1
|
+
import type { BlobKzgInstance } from '@aztec/blob-lib/types';
|
|
1
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
2
3
|
import type { Logger } from '@aztec/foundation/log';
|
|
3
4
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
4
5
|
|
|
5
6
|
import { type Hex, encodeFunctionData } from 'viem';
|
|
6
7
|
|
|
7
|
-
import type { EthSigner } from '../eth-signer/eth-signer.js';
|
|
8
8
|
import { FORWARDER_ABI } from '../forwarder_proxy.js';
|
|
9
|
-
import type {
|
|
9
|
+
import type { ViemClient } from '../types.js';
|
|
10
10
|
import type { L1TxUtilsConfig } from './config.js';
|
|
11
|
+
import type { L1SignerSource } from './factory.js';
|
|
12
|
+
import { resolveSignerSource } from './factory.js';
|
|
11
13
|
import type { IL1TxMetrics, IL1TxStore } from './interfaces.js';
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
+
import { L1TxUtils } from './l1_tx_utils.js';
|
|
15
|
+
import { Delayer } from './tx_delayer.js';
|
|
14
16
|
import type { L1BlobInputs, L1TxConfig, L1TxRequest, SigningCallback } from './types.js';
|
|
15
17
|
|
|
16
18
|
/**
|
|
17
|
-
* Extends
|
|
19
|
+
* Extends L1TxUtils to wrap all transactions through a forwarder contract.
|
|
18
20
|
* This is mainly used for testing the archiver's ability to decode transactions that go through proxies.
|
|
19
21
|
*/
|
|
20
|
-
export class ForwarderL1TxUtils extends
|
|
22
|
+
export class ForwarderL1TxUtils extends L1TxUtils {
|
|
21
23
|
constructor(
|
|
22
|
-
client: ViemClient
|
|
24
|
+
client: ViemClient,
|
|
23
25
|
senderAddress: EthAddress,
|
|
24
26
|
signingCallback: SigningCallback,
|
|
25
27
|
logger: Logger | undefined,
|
|
@@ -28,9 +30,23 @@ export class ForwarderL1TxUtils extends L1TxUtilsWithBlobs {
|
|
|
28
30
|
debugMaxGasLimit: boolean,
|
|
29
31
|
store: IL1TxStore | undefined,
|
|
30
32
|
metrics: IL1TxMetrics | undefined,
|
|
33
|
+
kzg: BlobKzgInstance | undefined,
|
|
34
|
+
delayer: Delayer | undefined,
|
|
31
35
|
private readonly forwarderAddress: EthAddress,
|
|
32
36
|
) {
|
|
33
|
-
super(
|
|
37
|
+
super(
|
|
38
|
+
client,
|
|
39
|
+
senderAddress,
|
|
40
|
+
signingCallback,
|
|
41
|
+
logger,
|
|
42
|
+
dateProvider,
|
|
43
|
+
config,
|
|
44
|
+
debugMaxGasLimit,
|
|
45
|
+
store,
|
|
46
|
+
metrics,
|
|
47
|
+
kzg,
|
|
48
|
+
delayer,
|
|
49
|
+
);
|
|
34
50
|
}
|
|
35
51
|
|
|
36
52
|
/**
|
|
@@ -61,59 +77,32 @@ export class ForwarderL1TxUtils extends L1TxUtilsWithBlobs {
|
|
|
61
77
|
}
|
|
62
78
|
}
|
|
63
79
|
|
|
64
|
-
export function
|
|
65
|
-
|
|
80
|
+
export function createForwarderL1TxUtils(
|
|
81
|
+
source: L1SignerSource,
|
|
66
82
|
forwarderAddress: EthAddress,
|
|
67
|
-
deps
|
|
83
|
+
deps?: {
|
|
68
84
|
logger?: Logger;
|
|
69
85
|
dateProvider?: DateProvider;
|
|
70
86
|
store?: IL1TxStore;
|
|
71
87
|
metrics?: IL1TxMetrics;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
88
|
+
kzg?: BlobKzgInstance;
|
|
89
|
+
delayer?: Delayer;
|
|
90
|
+
},
|
|
91
|
+
config?: Partial<L1TxUtilsConfig> & { debugMaxGasLimit?: boolean },
|
|
92
|
+
): ForwarderL1TxUtils {
|
|
93
|
+
const { client, address, signingCallback } = resolveSignerSource(source);
|
|
76
94
|
return new ForwarderL1TxUtils(
|
|
77
95
|
client,
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
deps
|
|
81
|
-
deps
|
|
82
|
-
config,
|
|
83
|
-
debugMaxGasLimit,
|
|
84
|
-
deps
|
|
85
|
-
deps
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
export function createForwarderL1TxUtilsFromEthSigner(
|
|
91
|
-
client: ViemClient,
|
|
92
|
-
signer: EthSigner,
|
|
93
|
-
forwarderAddress: EthAddress,
|
|
94
|
-
deps: {
|
|
95
|
-
logger?: Logger;
|
|
96
|
-
dateProvider?: DateProvider;
|
|
97
|
-
store?: IL1TxStore;
|
|
98
|
-
metrics?: IL1TxMetrics;
|
|
99
|
-
} = {},
|
|
100
|
-
config: Partial<L1TxUtilsConfig> = {},
|
|
101
|
-
debugMaxGasLimit: boolean = false,
|
|
102
|
-
) {
|
|
103
|
-
const callback: SigningCallback = async (transaction, _signingAddress) => {
|
|
104
|
-
return (await signer.signTransaction(transaction)).toViemTransactionSignature();
|
|
105
|
-
};
|
|
106
|
-
|
|
107
|
-
return new ForwarderL1TxUtils(
|
|
108
|
-
client,
|
|
109
|
-
signer.address,
|
|
110
|
-
callback,
|
|
111
|
-
deps.logger,
|
|
112
|
-
deps.dateProvider,
|
|
113
|
-
config,
|
|
114
|
-
debugMaxGasLimit,
|
|
115
|
-
deps.store,
|
|
116
|
-
deps.metrics,
|
|
96
|
+
address,
|
|
97
|
+
signingCallback,
|
|
98
|
+
deps?.logger,
|
|
99
|
+
deps?.dateProvider,
|
|
100
|
+
config ?? {},
|
|
101
|
+
config?.debugMaxGasLimit ?? false,
|
|
102
|
+
deps?.store,
|
|
103
|
+
deps?.metrics,
|
|
104
|
+
deps?.kzg,
|
|
105
|
+
deps?.delayer,
|
|
117
106
|
forwarderAddress,
|
|
118
107
|
);
|
|
119
108
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export
|
|
2
|
-
export
|
|
1
|
+
export { createForwarderL1TxUtils, ForwarderL1TxUtils } from './forwarder_l1_tx_utils.js';
|
|
2
|
+
export { createL1TxUtils, type L1SignerSource, resolveSignerSource } from './factory.js';
|
package/src/l1_tx_utils/index.ts
CHANGED
|
@@ -8,6 +8,7 @@ export * from './l1_tx_utils.js';
|
|
|
8
8
|
export * from './readonly_l1_tx_utils.js';
|
|
9
9
|
export * from './signer.js';
|
|
10
10
|
export * from './types.js';
|
|
11
|
+
export * from './tx_delayer.js';
|
|
11
12
|
export * from './utils.js';
|
|
12
13
|
|
|
13
14
|
// Note: We intentionally do not export l1_tx_utils_with_blobs.js
|
|
@@ -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,11 @@ 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
|
+
/** Tx delayer for testing. Only set when enableDelayer config is true. */
|
|
49
|
+
public delayer?: Delayer;
|
|
50
|
+
/** KZG instance for blob operations. */
|
|
51
|
+
protected kzg?: BlobKzgInstance;
|
|
50
52
|
|
|
51
53
|
constructor(
|
|
52
54
|
public override client: ViemClient,
|
|
@@ -58,9 +60,25 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
58
60
|
debugMaxGasLimit: boolean = false,
|
|
59
61
|
protected store?: IL1TxStore,
|
|
60
62
|
protected metrics?: IL1TxMetrics,
|
|
63
|
+
kzg?: BlobKzgInstance,
|
|
64
|
+
delayer?: Delayer,
|
|
61
65
|
) {
|
|
62
66
|
super(client, logger, dateProvider, config, debugMaxGasLimit);
|
|
63
|
-
this.
|
|
67
|
+
this.kzg = kzg;
|
|
68
|
+
|
|
69
|
+
// Set up delayer: use provided one or create new
|
|
70
|
+
if (config?.enableDelayer && config?.ethereumSlotDuration) {
|
|
71
|
+
this.delayer =
|
|
72
|
+
delayer ?? this.createDelayer({ ethereumSlotDuration: config.ethereumSlotDuration }, logger.getBindings());
|
|
73
|
+
this.client = wrapClientWithDelayer(this.client, this.delayer);
|
|
74
|
+
if (config.txDelayerMaxInclusionTimeIntoSlot !== undefined) {
|
|
75
|
+
this.delayer.setMaxInclusionTimeIntoSlot(config.txDelayerMaxInclusionTimeIntoSlot);
|
|
76
|
+
}
|
|
77
|
+
} else if (delayer) {
|
|
78
|
+
// Delayer provided but enableDelayer not set — just store it without wrapping
|
|
79
|
+
logger.warn('Delayer provided but enableDelayer config is not set; delayer will not be used');
|
|
80
|
+
this.delayer = delayer;
|
|
81
|
+
}
|
|
64
82
|
}
|
|
65
83
|
|
|
66
84
|
public get state() {
|
|
@@ -207,7 +225,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
207
225
|
|
|
208
226
|
let gasLimit: bigint;
|
|
209
227
|
if (this.debugMaxGasLimit) {
|
|
210
|
-
gasLimit =
|
|
228
|
+
gasLimit = MAX_L1_TX_LIMIT;
|
|
211
229
|
} else if (gasConfig.gasLimit) {
|
|
212
230
|
gasLimit = gasConfig.gasLimit;
|
|
213
231
|
} else {
|
|
@@ -221,15 +239,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
221
239
|
throw new InterruptError(`Transaction sending is interrupted`);
|
|
222
240
|
}
|
|
223
241
|
|
|
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
242
|
const now = new Date(await this.getL1Timestamp());
|
|
234
243
|
if (gasConfig.txTimeoutAt && now > gasConfig.txTimeoutAt) {
|
|
235
244
|
throw new TimeoutError(
|
|
@@ -237,6 +246,11 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
237
246
|
);
|
|
238
247
|
}
|
|
239
248
|
|
|
249
|
+
const nonce = await this.client.getTransactionCount({ address: account, blockTag: 'pending' });
|
|
250
|
+
|
|
251
|
+
const baseState = { request, gasLimit, blobInputs, gasPrice, nonce };
|
|
252
|
+
const txData = this.makeTxData(baseState, { isCancelTx: false });
|
|
253
|
+
|
|
240
254
|
// Send the new tx
|
|
241
255
|
const signedRequest = await this.prepareSignedTransaction(txData);
|
|
242
256
|
const txHash = await this.client.sendRawTransaction({ serializedTransaction: signedRequest });
|
|
@@ -283,7 +297,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
283
297
|
return { txHash, state: l1TxState };
|
|
284
298
|
} catch (err: any) {
|
|
285
299
|
const viemError = formatViemError(err, request.abi);
|
|
286
|
-
this.logger.error(`Failed to send L1 transaction`, viemError, {
|
|
300
|
+
this.logger.error(`Failed to send L1 transaction: ${viemError.message}`, viemError, {
|
|
287
301
|
request: pick(request, 'to', 'value'),
|
|
288
302
|
});
|
|
289
303
|
throw viemError;
|
|
@@ -423,7 +437,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
423
437
|
{ nonce, account, pendingNonce, timePassed },
|
|
424
438
|
);
|
|
425
439
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
426
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
427
440
|
throw new DroppedTransactionError(nonce, account);
|
|
428
441
|
}
|
|
429
442
|
|
|
@@ -515,12 +528,7 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
515
528
|
|
|
516
529
|
// Oh no, the transaction has timed out!
|
|
517
530
|
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
531
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
523
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
524
532
|
} else {
|
|
525
533
|
// Otherwise we fire the cancellation without awaiting to avoid blocking the caller,
|
|
526
534
|
// and monitor it in the background so we can speed it up as needed.
|
|
@@ -631,12 +639,12 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
631
639
|
from: request.from ?? this.getSenderAddress().toString(),
|
|
632
640
|
maxFeePerGas: gasPrice.maxFeePerGas,
|
|
633
641
|
maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
|
|
634
|
-
gas: request.gas ??
|
|
642
|
+
gas: request.gas ?? MAX_L1_TX_LIMIT,
|
|
635
643
|
};
|
|
636
644
|
|
|
637
645
|
if (!request.gas && !gasConfig.ignoreBlockGasLimit) {
|
|
638
|
-
//
|
|
639
|
-
blockOverrides.gasLimit =
|
|
646
|
+
// MAX_L1_TX_LIMIT is set as call.gas, ensure block gasLimit is sufficient
|
|
647
|
+
blockOverrides.gasLimit = MAX_L1_TX_LIMIT;
|
|
640
648
|
}
|
|
641
649
|
|
|
642
650
|
return this._simulate(call, blockOverrides, stateOverrides, gasConfig, abi);
|
|
@@ -659,7 +667,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
659
667
|
{ nonce, account },
|
|
660
668
|
);
|
|
661
669
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
662
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
663
670
|
return;
|
|
664
671
|
}
|
|
665
672
|
|
|
@@ -671,7 +678,6 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
671
678
|
{ nonce, account, currentNonce },
|
|
672
679
|
);
|
|
673
680
|
await this.updateState(state, TxUtilsState.NOT_MINED);
|
|
674
|
-
this.nonceManager.reset({ address: account, chainId: this.client.chain.id });
|
|
675
681
|
return;
|
|
676
682
|
}
|
|
677
683
|
|
|
@@ -731,8 +737,17 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
|
|
|
731
737
|
return Number(timestamp) * 1000;
|
|
732
738
|
}
|
|
733
739
|
|
|
734
|
-
/** Makes empty blob inputs for the cancellation tx.
|
|
735
|
-
protected makeEmptyBlobInputs(
|
|
736
|
-
|
|
740
|
+
/** Makes empty blob inputs for the cancellation tx. */
|
|
741
|
+
protected makeEmptyBlobInputs(maxFeePerBlobGas: bigint): Required<L1BlobInputs> {
|
|
742
|
+
if (!this.kzg) {
|
|
743
|
+
throw new Error('Cannot make empty blob inputs for cancellation without kzg');
|
|
744
|
+
}
|
|
745
|
+
const blobData = new Uint8Array(131072).fill(0);
|
|
746
|
+
return { blobs: [blobData], kzg: this.kzg, maxFeePerBlobGas };
|
|
747
|
+
}
|
|
748
|
+
|
|
749
|
+
/** Creates a new delayer instance. */
|
|
750
|
+
protected createDelayer(opts: { ethereumSlotDuration: bigint | number }, bindings: LoggerBindings): Delayer {
|
|
751
|
+
return createDelayer(this.dateProvider, opts, bindings);
|
|
737
752
|
}
|
|
738
753
|
}
|
|
@@ -27,7 +27,7 @@ import type { ViemClient } from '../types.js';
|
|
|
27
27
|
import { type L1TxUtilsConfig, defaultL1TxUtilsConfig, l1TxUtilsConfigMappings } from './config.js';
|
|
28
28
|
import {
|
|
29
29
|
BLOCK_TIME_MS,
|
|
30
|
-
|
|
30
|
+
MAX_L1_TX_LIMIT,
|
|
31
31
|
MIN_BLOB_REPLACEMENT_BUMP_PERCENTAGE,
|
|
32
32
|
MIN_REPLACEMENT_BUMP_PERCENTAGE,
|
|
33
33
|
WEI_CONST,
|
|
@@ -249,7 +249,7 @@ export class ReadOnlyL1TxUtils {
|
|
|
249
249
|
...request,
|
|
250
250
|
..._blobInputs,
|
|
251
251
|
maxFeePerBlobGas: gasPrice.maxFeePerBlobGas!,
|
|
252
|
-
gas:
|
|
252
|
+
gas: MAX_L1_TX_LIMIT,
|
|
253
253
|
blockTag: 'latest',
|
|
254
254
|
});
|
|
255
255
|
|
|
@@ -258,7 +258,7 @@ export class ReadOnlyL1TxUtils {
|
|
|
258
258
|
initialEstimate = await this.client.estimateGas({
|
|
259
259
|
account,
|
|
260
260
|
...request,
|
|
261
|
-
gas:
|
|
261
|
+
gas: MAX_L1_TX_LIMIT,
|
|
262
262
|
blockTag: 'latest',
|
|
263
263
|
});
|
|
264
264
|
this.logger?.trace(`Estimated gas for non-blob tx: ${initialEstimate}`);
|