@aztec/sequencer-client 0.0.1-commit.e558bd1c → 0.0.1-commit.e5a3663dd
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/sequencer-client.d.ts +17 -7
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +63 -30
- package/dest/config.d.ts +27 -7
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +58 -37
- package/dest/global_variable_builder/fee_predictor.d.ts +37 -0
- package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -0
- package/dest/global_variable_builder/fee_predictor.js +128 -0
- package/dest/global_variable_builder/fee_provider.d.ts +21 -0
- package/dest/global_variable_builder/fee_provider.d.ts.map +1 -0
- package/dest/global_variable_builder/fee_provider.js +58 -0
- package/dest/global_variable_builder/global_builder.d.ts +15 -16
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +16 -50
- package/dest/global_variable_builder/index.d.ts +4 -2
- package/dest/global_variable_builder/index.d.ts.map +1 -1
- package/dest/global_variable_builder/index.js +2 -0
- package/dest/publisher/config.d.ts +47 -17
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/config.js +121 -42
- package/dest/publisher/index.d.ts +2 -1
- package/dest/publisher/index.d.ts.map +1 -1
- package/dest/publisher/l1_tx_failed_store/factory.d.ts +11 -0
- package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/factory.js +22 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +58 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +1 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +15 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +34 -0
- package/dest/publisher/l1_tx_failed_store/index.d.ts +4 -0
- package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -0
- package/dest/publisher/l1_tx_failed_store/index.js +2 -0
- package/dest/publisher/sequencer-publisher-factory.d.ts +11 -5
- package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-factory.js +27 -3
- package/dest/publisher/sequencer-publisher.d.ts +75 -48
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +434 -141
- package/dest/sequencer/chain_state_overrides.d.ts +25 -0
- package/dest/sequencer/chain_state_overrides.d.ts.map +1 -0
- package/dest/sequencer/chain_state_overrides.js +39 -0
- package/dest/sequencer/checkpoint_proposal_job.d.ts +46 -10
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +705 -223
- package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts +34 -0
- package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts.map +1 -0
- package/dest/sequencer/checkpoint_proposal_job_metrics.js +72 -0
- package/dest/sequencer/checkpoint_voter.d.ts +1 -2
- package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_voter.js +2 -5
- package/dest/sequencer/events.d.ts +7 -1
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/metrics.d.ts +23 -8
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +117 -21
- package/dest/sequencer/sequencer.d.ts +53 -19
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +188 -101
- package/dest/sequencer/timetable.d.ts +17 -6
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +51 -46
- package/dest/sequencer/types.d.ts +2 -2
- package/dest/sequencer/types.d.ts.map +1 -1
- package/dest/test/index.d.ts +3 -5
- package/dest/test/index.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.d.ts +11 -11
- package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
- package/dest/test/mock_checkpoint_builder.js +45 -34
- package/dest/test/utils.d.ts +3 -3
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +10 -8
- package/package.json +27 -28
- package/src/client/sequencer-client.ts +81 -30
- package/src/config.ts +77 -46
- package/src/global_variable_builder/README.md +44 -0
- package/src/global_variable_builder/fee_predictor.ts +172 -0
- package/src/global_variable_builder/fee_provider.ts +75 -0
- package/src/global_variable_builder/global_builder.ts +27 -63
- package/src/global_variable_builder/index.ts +3 -1
- package/src/publisher/config.ts +157 -45
- package/src/publisher/index.ts +3 -0
- package/src/publisher/l1_tx_failed_store/factory.ts +32 -0
- package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +57 -0
- package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +46 -0
- package/src/publisher/l1_tx_failed_store/index.ts +3 -0
- package/src/publisher/sequencer-publisher-factory.ts +38 -9
- package/src/publisher/sequencer-publisher.ts +501 -202
- package/src/sequencer/README.md +82 -13
- package/src/sequencer/chain_state_overrides.ts +87 -0
- package/src/sequencer/checkpoint_proposal_job.ts +873 -243
- package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/events.ts +6 -1
- package/src/sequencer/metrics.ts +132 -25
- package/src/sequencer/sequencer.ts +262 -115
- package/src/sequencer/timetable.ts +70 -57
- package/src/sequencer/types.ts +1 -1
- package/src/test/index.ts +2 -4
- package/src/test/mock_checkpoint_builder.ts +63 -49
- package/src/test/utils.ts +31 -10
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { BlobClientInterface } from '@aztec/blob-client/client';
|
|
2
2
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
3
|
-
import {
|
|
3
|
+
import { type Delayer, L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
|
|
4
4
|
import { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
5
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import type { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -11,20 +11,22 @@ import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
|
|
|
11
11
|
import type { ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
|
|
12
12
|
import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
|
|
13
13
|
import { L1Metrics, type TelemetryClient } from '@aztec/telemetry-client';
|
|
14
|
-
import { FullNodeCheckpointsBuilder, type ValidatorClient } from '@aztec/validator-client';
|
|
15
|
-
import type
|
|
14
|
+
import { FullNodeCheckpointsBuilder, NodeKeystoreAdapter, type ValidatorClient } from '@aztec/validator-client';
|
|
15
|
+
import { type SequencerClientConfig } from '../config.js';
|
|
16
|
+
import type { GlobalVariableBuilder } from '../global_variable_builder/index.js';
|
|
16
17
|
import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
17
18
|
import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
|
|
18
19
|
/**
|
|
19
20
|
* Encapsulates the full sequencer and publisher.
|
|
20
21
|
*/
|
|
21
22
|
export declare class SequencerClient {
|
|
22
|
-
protected publisherManager: PublisherManager<
|
|
23
|
+
protected publisherManager: PublisherManager<L1TxUtils>;
|
|
23
24
|
protected sequencer: Sequencer;
|
|
24
25
|
protected checkpointsBuilder: FullNodeCheckpointsBuilder;
|
|
25
26
|
protected validatorClient?: ValidatorClient | undefined;
|
|
26
27
|
private l1Metrics?;
|
|
27
|
-
|
|
28
|
+
private delayer_?;
|
|
29
|
+
constructor(publisherManager: PublisherManager<L1TxUtils>, sequencer: Sequencer, checkpointsBuilder: FullNodeCheckpointsBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined, delayer_?: Delayer | undefined);
|
|
28
30
|
/**
|
|
29
31
|
* Initializes a new instance.
|
|
30
32
|
* @param config - Configuration for the sequencer, publisher, and L1 tx sender.
|
|
@@ -50,8 +52,10 @@ export declare class SequencerClient {
|
|
|
50
52
|
blobClient: BlobClientInterface;
|
|
51
53
|
dateProvider: DateProvider;
|
|
52
54
|
epochCache?: EpochCache;
|
|
53
|
-
l1TxUtils:
|
|
55
|
+
l1TxUtils: L1TxUtils[];
|
|
56
|
+
funderL1TxUtils?: L1TxUtils;
|
|
54
57
|
nodeKeyStore: KeystoreManager;
|
|
58
|
+
globalVariableBuilder: GlobalVariableBuilder;
|
|
55
59
|
}): Promise<SequencerClient>;
|
|
56
60
|
/**
|
|
57
61
|
* Updates sequencer and validator client config.
|
|
@@ -64,8 +68,14 @@ export declare class SequencerClient {
|
|
|
64
68
|
* Stops the sequencer from processing new txs.
|
|
65
69
|
*/
|
|
66
70
|
stop(): Promise<void>;
|
|
71
|
+
/** Triggers an immediate run of the sequencer, bypassing the polling interval. */
|
|
72
|
+
trigger(): Promise<void> | undefined;
|
|
67
73
|
getSequencer(): Sequencer;
|
|
74
|
+
/** Updates the publisher factory's node keystore adapter after a keystore reload. */
|
|
75
|
+
updatePublisherNodeKeyStore(adapter: NodeKeystoreAdapter): void;
|
|
76
|
+
/** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */
|
|
77
|
+
getDelayer(): Delayer | undefined;
|
|
68
78
|
get validatorAddresses(): EthAddress[] | undefined;
|
|
69
79
|
get maxL2BlockGas(): number | undefined;
|
|
70
80
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDekcsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLG1CQUFtQixFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEgsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXlDLE1BQU0sY0FBYyxDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDakYsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDeEYsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhFOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUV4QixTQUFTLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDO0lBQ3ZELFNBQVMsQ0FBQyxTQUFTLEVBQUUsU0FBUztJQUM5QixTQUFTLENBQUMsa0JBQWtCLEVBQUUsMEJBQTBCO0lBQ3hELFNBQVMsQ0FBQyxlQUFlLENBQUM7SUFDMUIsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUNsQixPQUFPLENBQUMsUUFBUSxDQUFDO0lBTm5CLFlBQ1ksZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLEVBQzdDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGtCQUFrQixFQUFFLDBCQUEwQixFQUM5QyxlQUFlLENBQUMsNkJBQWlCLEVBQ25DLFNBQVMsQ0FBQyx1QkFBVyxFQUNyQixRQUFRLENBQUMscUJBQVMsRUFDeEI7SUFFSjs7Ozs7Ozs7Ozs7T0FXRztJQUNILE9BQW9CLEdBQUcsQ0FDckIsTUFBTSxFQUFFLHFCQUFxQixFQUM3QixJQUFJLEVBQUU7UUFDSixlQUFlLEVBQUUsZUFBZSxDQUFDO1FBQ2pDLFNBQVMsRUFBRSxHQUFHLENBQUM7UUFDZixzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztRQUMvQyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO1FBQ2xELGtCQUFrQixFQUFFLDBCQUEwQixDQUFDO1FBQy9DLGFBQWEsRUFBRSxhQUFhLEdBQUcsV0FBVyxDQUFDO1FBQzNDLG1CQUFtQixFQUFFLG1CQUFtQixDQUFDO1FBQ3pDLFNBQVMsRUFBRSxlQUFlLENBQUM7UUFDM0IsZ0JBQWdCLENBQUMsRUFBRSx5QkFBeUIsQ0FBQztRQUM3QyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7UUFDaEMsWUFBWSxFQUFFLFlBQVksQ0FBQztRQUMzQixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7UUFDeEIsU0FBUyxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ3ZCLGVBQWUsQ0FBQyxFQUFFLFNBQVMsQ0FBQztRQUM1QixZQUFZLEVBQUUsZUFBZSxDQUFDO1FBQzlCLHFCQUFxQixFQUFFLHFCQUFxQixDQUFDO0tBQzlDLDRCQXlHRjtJQUVEOzs7T0FHRztJQUNJLFlBQVksQ0FBQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxRQUkvRTtJQUVELDRCQUE0QjtJQUNmLEtBQUssa0JBS2pCO0lBRUQ7O09BRUc7SUFDVSxJQUFJLGtCQUtoQjtJQUVELGtGQUFrRjtJQUMzRSxPQUFPLDhCQUViO0lBRU0sWUFBWSxJQUFJLFNBQVMsQ0FFL0I7SUFFRCxxRkFBcUY7SUFDOUUsMkJBQTJCLENBQUMsT0FBTyxFQUFFLG1CQUFtQixHQUFHLElBQUksQ0FFckU7SUFFRCxpRkFBaUY7SUFDakYsVUFBVSxJQUFJLE9BQU8sR0FBRyxTQUFTLENBRWhDO0lBRUQsSUFBSSxrQkFBa0IsSUFBSSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBRWpEO0lBRUQsSUFBSSxhQUFhLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdEM7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
|
+
import { MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT } from '@aztec/constants';
|
|
1
2
|
import { EpochCache } from '@aztec/epoch-cache';
|
|
2
3
|
import { isAnvilTestChain } from '@aztec/ethereum/chain';
|
|
3
4
|
import { getPublicClient } from '@aztec/ethereum/client';
|
|
4
5
|
import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
|
|
5
6
|
import { PublisherManager } from '@aztec/ethereum/publisher-manager';
|
|
6
|
-
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
7
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
8
|
-
import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
|
|
9
8
|
import { L1Metrics } from '@aztec/telemetry-client';
|
|
10
9
|
import { NodeKeystoreAdapter } from '@aztec/validator-client';
|
|
11
|
-
import {
|
|
10
|
+
import { getPublisherConfigFromSequencerConfig } from '../config.js';
|
|
12
11
|
import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
13
12
|
import { Sequencer } from '../sequencer/index.js';
|
|
14
13
|
/**
|
|
@@ -19,12 +18,14 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
19
18
|
checkpointsBuilder;
|
|
20
19
|
validatorClient;
|
|
21
20
|
l1Metrics;
|
|
22
|
-
|
|
21
|
+
delayer_;
|
|
22
|
+
constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer_){
|
|
23
23
|
this.publisherManager = publisherManager;
|
|
24
24
|
this.sequencer = sequencer;
|
|
25
25
|
this.checkpointsBuilder = checkpointsBuilder;
|
|
26
26
|
this.validatorClient = validatorClient;
|
|
27
27
|
this.l1Metrics = l1Metrics;
|
|
28
|
+
this.delayer_ = delayer_;
|
|
28
29
|
}
|
|
29
30
|
/**
|
|
30
31
|
* Initializes a new instance.
|
|
@@ -44,12 +45,14 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
44
45
|
const publicClient = getPublicClient(config);
|
|
45
46
|
const l1TxUtils = deps.l1TxUtils;
|
|
46
47
|
const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
|
|
47
|
-
const publisherManager = new PublisherManager(l1TxUtils, config,
|
|
48
|
+
const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
|
|
49
|
+
bindings: log.getBindings(),
|
|
50
|
+
funder: deps.funderL1TxUtils
|
|
51
|
+
});
|
|
48
52
|
const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
|
|
49
|
-
const [l1GenesisTime, slotDuration,
|
|
53
|
+
const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
|
|
50
54
|
rollupContract.getL1GenesisTime(),
|
|
51
55
|
rollupContract.getSlotDuration(),
|
|
52
|
-
rollupContract.getVersion(),
|
|
53
56
|
rollupContract.getManaLimit().then(Number)
|
|
54
57
|
]);
|
|
55
58
|
const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
|
|
@@ -57,17 +60,16 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
57
60
|
l1RpcUrls: rpcUrls,
|
|
58
61
|
l1ChainId: chainId,
|
|
59
62
|
viemPollingIntervalMS: config.viemPollingIntervalMS,
|
|
60
|
-
ethereumSlotDuration: config.ethereumSlotDuration
|
|
63
|
+
ethereumSlotDuration: config.ethereumSlotDuration,
|
|
64
|
+
enableProposerPipelining: config.enableProposerPipelining
|
|
61
65
|
}, {
|
|
62
66
|
dateProvider: deps.dateProvider
|
|
63
67
|
});
|
|
64
|
-
const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
|
|
65
68
|
const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
|
|
66
69
|
telemetry: telemetryClient,
|
|
67
70
|
blobClient: deps.blobClient,
|
|
68
71
|
epochCache,
|
|
69
72
|
governanceProposerContract,
|
|
70
|
-
slashFactoryContract,
|
|
71
73
|
rollupContract,
|
|
72
74
|
dateProvider: deps.dateProvider,
|
|
73
75
|
publisherManager,
|
|
@@ -75,21 +77,7 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
75
77
|
logger: log
|
|
76
78
|
});
|
|
77
79
|
const ethereumSlotDuration = config.ethereumSlotDuration;
|
|
78
|
-
const
|
|
79
|
-
l1GenesisTime,
|
|
80
|
-
slotDuration: Number(slotDuration),
|
|
81
|
-
ethereumSlotDuration
|
|
82
|
-
};
|
|
83
|
-
const globalsBuilder = new GlobalVariableBuilder({
|
|
84
|
-
...config,
|
|
85
|
-
...l1Constants,
|
|
86
|
-
rollupVersion
|
|
87
|
-
});
|
|
88
|
-
let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
|
|
89
|
-
if (sequencerManaLimit > rollupManaLimit) {
|
|
90
|
-
log.warn(`Provided maxL2BlockGas ${sequencerManaLimit} is greater than the max allowed by L1. Setting limit to ${rollupManaLimit}.`);
|
|
91
|
-
sequencerManaLimit = rollupManaLimit;
|
|
92
|
-
}
|
|
80
|
+
const globalsBuilder = deps.globalVariableBuilder;
|
|
93
81
|
// When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
|
|
94
82
|
// Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
|
|
95
83
|
// In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
|
|
@@ -97,13 +85,24 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
97
85
|
// See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
|
|
98
86
|
const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
|
|
99
87
|
const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
|
|
88
|
+
const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = capPerBlockLimits(config, rollupManaLimit, log);
|
|
89
|
+
const l1Constants = {
|
|
90
|
+
l1GenesisTime,
|
|
91
|
+
slotDuration: Number(slotDuration),
|
|
92
|
+
ethereumSlotDuration,
|
|
93
|
+
rollupManaLimit
|
|
94
|
+
};
|
|
100
95
|
const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
|
|
101
96
|
...config,
|
|
102
97
|
l1PublishingTime,
|
|
103
|
-
maxL2BlockGas
|
|
98
|
+
maxL2BlockGas,
|
|
99
|
+
maxDABlockGas,
|
|
100
|
+
maxTxsPerBlock
|
|
104
101
|
}, telemetryClient, log);
|
|
105
|
-
|
|
106
|
-
|
|
102
|
+
sequencer.init();
|
|
103
|
+
// Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
|
|
104
|
+
const delayer = l1TxUtils[0]?.delayer;
|
|
105
|
+
return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer);
|
|
107
106
|
}
|
|
108
107
|
/**
|
|
109
108
|
* Updates sequencer and validator client config.
|
|
@@ -117,19 +116,28 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
117
116
|
await this.validatorClient?.start();
|
|
118
117
|
this.sequencer.start();
|
|
119
118
|
this.l1Metrics?.start();
|
|
120
|
-
await this.publisherManager.
|
|
119
|
+
await this.publisherManager.start();
|
|
121
120
|
}
|
|
122
121
|
/**
|
|
123
122
|
* Stops the sequencer from processing new txs.
|
|
124
123
|
*/ async stop() {
|
|
125
124
|
await this.sequencer.stop();
|
|
126
125
|
await this.validatorClient?.stop();
|
|
127
|
-
this.publisherManager.
|
|
126
|
+
await this.publisherManager.stop();
|
|
128
127
|
this.l1Metrics?.stop();
|
|
129
128
|
}
|
|
129
|
+
/** Triggers an immediate run of the sequencer, bypassing the polling interval. */ trigger() {
|
|
130
|
+
return this.sequencer.trigger();
|
|
131
|
+
}
|
|
130
132
|
getSequencer() {
|
|
131
133
|
return this.sequencer;
|
|
132
134
|
}
|
|
135
|
+
/** Updates the publisher factory's node keystore adapter after a keystore reload. */ updatePublisherNodeKeyStore(adapter) {
|
|
136
|
+
this.sequencer.updatePublisherNodeKeyStore(adapter);
|
|
137
|
+
}
|
|
138
|
+
/** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */ getDelayer() {
|
|
139
|
+
return this.delayer_;
|
|
140
|
+
}
|
|
133
141
|
get validatorAddresses() {
|
|
134
142
|
return this.sequencer.getValidatorAddresses();
|
|
135
143
|
}
|
|
@@ -137,3 +145,28 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
137
145
|
return this.sequencer.maxL2BlockGas;
|
|
138
146
|
}
|
|
139
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* Caps operator-provided per-block limits at checkpoint-level limits.
|
|
150
|
+
* Returns undefined for any limit the operator didn't set — the checkpoint builder handles redistribution.
|
|
151
|
+
*/ function capPerBlockLimits(config, rollupManaLimit, log) {
|
|
152
|
+
let maxL2BlockGas = config.maxL2BlockGas;
|
|
153
|
+
if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
|
|
154
|
+
log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
|
|
155
|
+
maxL2BlockGas = rollupManaLimit;
|
|
156
|
+
}
|
|
157
|
+
let maxDABlockGas = config.maxDABlockGas;
|
|
158
|
+
if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
|
|
159
|
+
log.warn(`Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`);
|
|
160
|
+
maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
|
|
161
|
+
}
|
|
162
|
+
let maxTxsPerBlock = config.maxTxsPerBlock;
|
|
163
|
+
if (maxTxsPerBlock !== undefined && config.maxTxsPerCheckpoint !== undefined && maxTxsPerBlock > config.maxTxsPerCheckpoint) {
|
|
164
|
+
log.warn(`Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
|
|
165
|
+
maxTxsPerBlock = config.maxTxsPerCheckpoint;
|
|
166
|
+
}
|
|
167
|
+
return {
|
|
168
|
+
maxL2BlockGas,
|
|
169
|
+
maxDABlockGas,
|
|
170
|
+
maxTxsPerBlock
|
|
171
|
+
};
|
|
172
|
+
}
|
package/dest/config.d.ts
CHANGED
|
@@ -3,26 +3,46 @@ import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
|
|
|
3
3
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
4
4
|
import { type KeyStoreConfig } from '@aztec/node-keystore/config';
|
|
5
5
|
import { type P2PConfig } from '@aztec/p2p/config';
|
|
6
|
-
import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
|
|
7
|
-
import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
|
|
6
|
+
import { type ChainConfig, type PipelineConfig, type SequencerConfig } from '@aztec/stdlib/config';
|
|
8
7
|
import { type ValidatorClientConfig } from '@aztec/validator-client/config';
|
|
9
|
-
import { type
|
|
8
|
+
import { type SequencerPublisherConfig, type SequencerTxSenderConfig } from './publisher/config.js';
|
|
10
9
|
export * from './publisher/config.js';
|
|
11
10
|
export type { SequencerConfig };
|
|
12
|
-
export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
|
|
13
11
|
/**
|
|
14
12
|
* Default values for SequencerConfig.
|
|
15
13
|
* Centralized location for all sequencer configuration defaults.
|
|
16
14
|
*/
|
|
17
|
-
export declare const DefaultSequencerConfig:
|
|
15
|
+
export declare const DefaultSequencerConfig: {
|
|
16
|
+
sequencerPollingIntervalMS: number;
|
|
17
|
+
minTxsPerBlock: number;
|
|
18
|
+
buildCheckpointIfEmpty: false;
|
|
19
|
+
publishTxsWithProposals: false;
|
|
20
|
+
perBlockAllocationMultiplier: number;
|
|
21
|
+
redistributeCheckpointBudget: true;
|
|
22
|
+
enforceTimeTable: true;
|
|
23
|
+
attestationPropagationTime: number;
|
|
24
|
+
secondsBeforeInvalidatingBlockAsCommitteeMember: number;
|
|
25
|
+
secondsBeforeInvalidatingBlockAsNonCommitteeMember: number;
|
|
26
|
+
skipCollectingAttestations: false;
|
|
27
|
+
skipInvalidateBlockAsProposer: false;
|
|
28
|
+
broadcastInvalidBlockProposal: false;
|
|
29
|
+
injectFakeAttestation: false;
|
|
30
|
+
injectHighSValueAttestation: false;
|
|
31
|
+
injectUnrecoverableSignatureAttestation: false;
|
|
32
|
+
fishermanMode: false;
|
|
33
|
+
shuffleAttestationOrdering: false;
|
|
34
|
+
skipPushProposedBlocksToArchiver: false;
|
|
35
|
+
skipPublishingCheckpointsPercent: number;
|
|
36
|
+
maxBlocksPerCheckpoint: number;
|
|
37
|
+
};
|
|
18
38
|
/**
|
|
19
39
|
* Configuration settings for the SequencerClient.
|
|
20
40
|
*/
|
|
21
|
-
export type SequencerClientConfig =
|
|
41
|
+
export type SequencerClientConfig = SequencerPublisherConfig & KeyStoreConfig & ValidatorClientConfig & SequencerTxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & PipelineConfig & Pick<P2PConfig, 'txPublicSetupAllowListExtend'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
|
|
22
42
|
export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
|
|
23
43
|
export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
|
|
24
44
|
/**
|
|
25
45
|
* Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
26
46
|
*/
|
|
27
47
|
export declare function getConfigEnvVars(): SequencerClientConfig;
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFNeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsS0FBSyxjQUFjLEVBQ25CLEtBQUssZUFBZSxFQUlyQixNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFpQyxNQUFNLGdDQUFnQyxDQUFDO0FBRTNHLE9BQU8sRUFDTCxLQUFLLHdCQUF3QixFQUM3QixLQUFLLHVCQUF1QixFQUc3QixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBRWhDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxzQkFBc0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FzQkEsQ0FBQztBQUVwQzs7R0FFRztBQUNILE1BQU0sTUFBTSxxQkFBcUIsR0FBRyx3QkFBd0IsR0FDMUQsY0FBYyxHQUNkLHFCQUFxQixHQUNyQix1QkFBdUIsR0FDdkIsZUFBZSxHQUNmLGNBQWMsR0FDZCxXQUFXLEdBQ1gsY0FBYyxHQUNkLElBQUksQ0FBQyxTQUFTLEVBQUUsOEJBQThCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixHQUFHLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDLENBQUM7QUFFL0YsZUFBTyxNQUFNLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLGVBQWUsQ0ErSnZFLENBQUM7QUFFRixlQUFPLE1BQU0sNkJBQTZCLEVBQUUsa0JBQWtCLENBQUMscUJBQXFCLENBWW5GLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxxQkFBcUIsQ0FFeEQifQ==
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,cAAc,EACnB,KAAK,eAAe,EAIrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAG7B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;CAsBA,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAC1D,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,WAAW,GACX,cAAc,GACd,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA+JvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAYnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
|
package/dest/config.js
CHANGED
|
@@ -1,38 +1,40 @@
|
|
|
1
1
|
import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
|
|
2
2
|
import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
|
|
3
|
-
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
|
|
3
|
+
import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
|
|
6
6
|
import { p2pConfigMappings } from '@aztec/p2p/config';
|
|
7
7
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
8
|
-
import { chainConfigMappings } from '@aztec/stdlib/config';
|
|
8
|
+
import { DEFAULT_MAX_BLOCKS_PER_CHECKPOINT, chainConfigMappings, pipelineConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
|
|
9
|
+
import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
|
|
9
10
|
import { validatorClientConfigMappings } from '@aztec/validator-client/config';
|
|
10
|
-
import {
|
|
11
|
+
import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
|
|
11
12
|
export * from './publisher/config.js';
|
|
12
|
-
export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
|
|
13
13
|
/**
|
|
14
14
|
* Default values for SequencerConfig.
|
|
15
15
|
* Centralized location for all sequencer configuration defaults.
|
|
16
16
|
*/ export const DefaultSequencerConfig = {
|
|
17
17
|
sequencerPollingIntervalMS: 500,
|
|
18
|
-
maxTxsPerBlock: 32,
|
|
19
18
|
minTxsPerBlock: 1,
|
|
20
19
|
buildCheckpointIfEmpty: false,
|
|
21
20
|
publishTxsWithProposals: false,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
maxBlockSizeInBytes: 1024 * 1024,
|
|
21
|
+
perBlockAllocationMultiplier: 1.2,
|
|
22
|
+
redistributeCheckpointBudget: true,
|
|
25
23
|
enforceTimeTable: true,
|
|
26
|
-
attestationPropagationTime:
|
|
24
|
+
attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
|
|
27
25
|
secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
|
|
28
26
|
secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
|
|
29
27
|
skipCollectingAttestations: false,
|
|
30
28
|
skipInvalidateBlockAsProposer: false,
|
|
31
29
|
broadcastInvalidBlockProposal: false,
|
|
32
30
|
injectFakeAttestation: false,
|
|
31
|
+
injectHighSValueAttestation: false,
|
|
32
|
+
injectUnrecoverableSignatureAttestation: false,
|
|
33
33
|
fishermanMode: false,
|
|
34
34
|
shuffleAttestationOrdering: false,
|
|
35
|
-
skipPushProposedBlocksToArchiver: false
|
|
35
|
+
skipPushProposedBlocksToArchiver: false,
|
|
36
|
+
skipPublishingCheckpointsPercent: 0,
|
|
37
|
+
maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT
|
|
36
38
|
};
|
|
37
39
|
export const sequencerConfigMappings = {
|
|
38
40
|
sequencerPollingIntervalMS: {
|
|
@@ -40,10 +42,10 @@ export const sequencerConfigMappings = {
|
|
|
40
42
|
description: 'The number of ms to wait between polling for checking to build on the next slot.',
|
|
41
43
|
...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
|
|
42
44
|
},
|
|
43
|
-
|
|
44
|
-
env: '
|
|
45
|
-
description: 'The maximum number of txs
|
|
46
|
-
...
|
|
45
|
+
maxTxsPerCheckpoint: {
|
|
46
|
+
env: 'SEQ_MAX_TX_PER_CHECKPOINT',
|
|
47
|
+
description: 'The maximum number of txs across all blocks in a checkpoint.',
|
|
48
|
+
...optionalNumberConfigHelper()
|
|
47
49
|
},
|
|
48
50
|
minTxsPerBlock: {
|
|
49
51
|
env: 'SEQ_MIN_TX_PER_BLOCK',
|
|
@@ -61,16 +63,26 @@ export const sequencerConfigMappings = {
|
|
|
61
63
|
maxL2BlockGas: {
|
|
62
64
|
env: 'SEQ_MAX_L2_BLOCK_GAS',
|
|
63
65
|
description: 'The maximum L2 block gas.',
|
|
64
|
-
...
|
|
66
|
+
...optionalNumberConfigHelper()
|
|
65
67
|
},
|
|
66
68
|
maxDABlockGas: {
|
|
67
69
|
env: 'SEQ_MAX_DA_BLOCK_GAS',
|
|
68
70
|
description: 'The maximum DA block gas.',
|
|
69
|
-
...
|
|
71
|
+
...optionalNumberConfigHelper()
|
|
72
|
+
},
|
|
73
|
+
perBlockAllocationMultiplier: {
|
|
74
|
+
env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
|
|
75
|
+
description: 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' + ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
|
|
76
|
+
...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
|
|
77
|
+
},
|
|
78
|
+
redistributeCheckpointBudget: {
|
|
79
|
+
env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
|
|
80
|
+
description: 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
|
|
81
|
+
...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget)
|
|
70
82
|
},
|
|
71
83
|
coinbase: {
|
|
72
84
|
env: 'COINBASE',
|
|
73
|
-
parseEnv: (val)=>
|
|
85
|
+
parseEnv: (val)=>EthAddress.fromString(val),
|
|
74
86
|
description: 'Recipient of block reward.'
|
|
75
87
|
},
|
|
76
88
|
feeRecipient: {
|
|
@@ -86,11 +98,6 @@ export const sequencerConfigMappings = {
|
|
|
86
98
|
env: 'ACVM_BINARY_PATH',
|
|
87
99
|
description: 'The path to the ACVM binary'
|
|
88
100
|
},
|
|
89
|
-
maxBlockSizeInBytes: {
|
|
90
|
-
env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
|
|
91
|
-
description: 'Max block size',
|
|
92
|
-
...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes)
|
|
93
|
-
},
|
|
94
101
|
enforceTimeTable: {
|
|
95
102
|
env: 'SEQ_ENFORCE_TIME_TABLE',
|
|
96
103
|
description: 'Whether to enforce the time table when building blocks',
|
|
@@ -104,12 +111,7 @@ export const sequencerConfigMappings = {
|
|
|
104
111
|
l1PublishingTime: {
|
|
105
112
|
env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
|
|
106
113
|
description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
|
|
107
|
-
|
|
108
|
-
},
|
|
109
|
-
attestationPropagationTime: {
|
|
110
|
-
env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
|
|
111
|
-
description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
|
|
112
|
-
...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
|
|
114
|
+
...optionalNumberConfigHelper()
|
|
113
115
|
},
|
|
114
116
|
fakeProcessingDelayPerTxMs: {
|
|
115
117
|
description: 'Used for testing to introduce a fake delay after processing each tx'
|
|
@@ -143,6 +145,14 @@ export const sequencerConfigMappings = {
|
|
|
143
145
|
description: 'Inject a fake attestation (for testing only)',
|
|
144
146
|
...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
|
|
145
147
|
},
|
|
148
|
+
injectHighSValueAttestation: {
|
|
149
|
+
description: 'Inject a malleable attestation with a high-s value (for testing only)',
|
|
150
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation)
|
|
151
|
+
},
|
|
152
|
+
injectUnrecoverableSignatureAttestation: {
|
|
153
|
+
description: 'Inject an attestation with an unrecoverable signature (for testing only)',
|
|
154
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation)
|
|
155
|
+
},
|
|
146
156
|
fishermanMode: {
|
|
147
157
|
env: 'FISHERMAN_MODE',
|
|
148
158
|
description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
|
|
@@ -152,11 +162,7 @@ export const sequencerConfigMappings = {
|
|
|
152
162
|
description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
|
|
153
163
|
...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering)
|
|
154
164
|
},
|
|
155
|
-
|
|
156
|
-
env: 'SEQ_BLOCK_DURATION_MS',
|
|
157
|
-
description: 'Duration per block in milliseconds when building multiple blocks per slot. ' + 'If undefined (default), builds a single block per slot using the full slot duration.',
|
|
158
|
-
parseEnv: (val)=>val ? parseInt(val, 10) : undefined
|
|
159
|
-
},
|
|
165
|
+
...sharedSequencerConfigMappings,
|
|
160
166
|
buildCheckpointIfEmpty: {
|
|
161
167
|
env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
|
|
162
168
|
description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
|
|
@@ -166,18 +172,33 @@ export const sequencerConfigMappings = {
|
|
|
166
172
|
description: 'Skip pushing proposed blocks to archiver (default: true)',
|
|
167
173
|
...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver)
|
|
168
174
|
},
|
|
175
|
+
minBlocksForCheckpoint: {
|
|
176
|
+
description: 'Minimum number of blocks required for a checkpoint proposal (test only)'
|
|
177
|
+
},
|
|
178
|
+
skipPublishingCheckpointsPercent: {
|
|
179
|
+
env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
|
|
180
|
+
description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
|
|
181
|
+
...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent)
|
|
182
|
+
},
|
|
183
|
+
skipBroadcastProposals: {
|
|
184
|
+
description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
|
|
185
|
+
...booleanConfigHelper(false)
|
|
186
|
+
},
|
|
169
187
|
...pickConfigMappings(p2pConfigMappings, [
|
|
170
|
-
'
|
|
188
|
+
'txPublicSetupAllowListExtend'
|
|
171
189
|
])
|
|
172
190
|
};
|
|
173
191
|
export const sequencerClientConfigMappings = {
|
|
192
|
+
// chainConfigMappings must come first: its l1Contracts only maps rollupAddress,
|
|
193
|
+
// while l1ReaderConfigMappings (spread later) maps all L1 contract addresses.
|
|
194
|
+
...chainConfigMappings,
|
|
174
195
|
...validatorClientConfigMappings,
|
|
175
196
|
...sequencerConfigMappings,
|
|
176
197
|
...keyStoreConfigMappings,
|
|
177
198
|
...l1ReaderConfigMappings,
|
|
178
|
-
...
|
|
179
|
-
...
|
|
180
|
-
...
|
|
199
|
+
...sequencerTxSenderConfigMappings,
|
|
200
|
+
...sequencerPublisherConfigMappings,
|
|
201
|
+
...pipelineConfigMappings,
|
|
181
202
|
...pickConfigMappings(l1ContractsConfigMappings, [
|
|
182
203
|
'ethereumSlotDuration',
|
|
183
204
|
'aztecSlotDuration',
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { type RollupContract } from '@aztec/ethereum/contracts';
|
|
2
|
+
import type { DateProvider } from '@aztec/foundation/timer';
|
|
3
|
+
import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
|
|
4
|
+
/**
|
|
5
|
+
* Predicts min fees for LAG upcoming slots based on the L1 oracle state.
|
|
6
|
+
* A new oracle update can activate at startSlot + LAG, so only the first LAG entries
|
|
7
|
+
* are guaranteed stable. Caches L1 queries per L1 block and recomputes predictions
|
|
8
|
+
* for each mana usage estimate.
|
|
9
|
+
*/
|
|
10
|
+
export declare class FeePredictor {
|
|
11
|
+
private readonly rollupContract;
|
|
12
|
+
private readonly publicClient;
|
|
13
|
+
private readonly dateProvider;
|
|
14
|
+
private cachedState;
|
|
15
|
+
private cachedL1BlockNumber;
|
|
16
|
+
private readonly slotDuration;
|
|
17
|
+
private readonly l1GenesisTime;
|
|
18
|
+
private readonly ethereumSlotDuration;
|
|
19
|
+
constructor(rollupContract: RollupContract, publicClient: {
|
|
20
|
+
getBlockNumber: (opts?: {
|
|
21
|
+
cacheTime?: number;
|
|
22
|
+
}) => Promise<bigint>;
|
|
23
|
+
}, dateProvider: DateProvider, config: {
|
|
24
|
+
slotDuration: number;
|
|
25
|
+
l1GenesisTime: bigint;
|
|
26
|
+
ethereumSlotDuration: number;
|
|
27
|
+
});
|
|
28
|
+
/** Returns predicted min fees for each slot in the prediction window. */
|
|
29
|
+
getPredictedMinFees(manaUsage: ManaUsageEstimate): Promise<GasFees[]>;
|
|
30
|
+
private getState;
|
|
31
|
+
private fetchState;
|
|
32
|
+
/** Computes per-slot fee predictions given cached state and a mana usage assumption. */
|
|
33
|
+
private computePredictions;
|
|
34
|
+
private getAssumedManaUsed;
|
|
35
|
+
private computeGasFees;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3ByZWRpY3Rvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dsb2JhbF92YXJpYWJsZV9idWlsZGVyL2ZlZV9wcmVkaWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvRCxLQUFLLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR2xILE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFFTCxPQUFPLEVBRVAsaUJBQWlCLEVBR2xCLE1BQU0sbUJBQW1CLENBQUM7QUFlM0I7Ozs7O0dBS0c7QUFDSCxxQkFBYSxZQUFZO0lBU3JCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxXQUFXLENBQXNDO0lBQ3pELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBcUI7SUFFaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQVM7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBUztJQUU5QyxZQUNtQixjQUFjLEVBQUUsY0FBYyxFQUM5QixZQUFZLEVBQUU7UUFBRSxjQUFjLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUFFLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtTQUFFLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0tBQUUsRUFDcEYsWUFBWSxFQUFFLFlBQVksRUFDM0MsTUFBTSxFQUFFO1FBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUt0RjtJQUVELHlFQUF5RTtJQUNuRSxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRzFFO1lBR2EsUUFBUTtZQVNSLFVBQVU7SUFpRHhCLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsa0JBQWtCO0lBdUIxQixPQUFPLENBQUMsa0JBQWtCO0lBVzFCLE9BQU8sQ0FBQyxjQUFjO0NBbUJ2QiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fee_predictor.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_predictor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAEL,OAAO,EAEP,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAe3B;;;;;GAKG;AACH,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,YACmB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE;QAAE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,EACpF,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAKtF;IAED,yEAAyE;IACnE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAG1E;YAGa,QAAQ;YASR,UAAU;IAiDxB,wFAAwF;IACxF,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;CAmBvB"}
|