@aztec/sequencer-client 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5d02921e
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 +15 -7
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +60 -26
- package/dest/config.d.ts +26 -6
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +44 -21
- package/dest/global_variable_builder/global_builder.d.ts +15 -11
- package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
- package/dest/global_variable_builder/global_builder.js +29 -25
- package/dest/global_variable_builder/index.d.ts +2 -2
- package/dest/global_variable_builder/index.d.ts.map +1 -1
- 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 +59 -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 -3
- package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher-factory.js +27 -2
- package/dest/publisher/sequencer-publisher.d.ts +76 -30
- package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
- package/dest/publisher/sequencer-publisher.js +396 -71
- package/dest/sequencer/checkpoint_proposal_job.d.ts +33 -8
- package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
- package/dest/sequencer/checkpoint_proposal_job.js +345 -172
- 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 +2 -1
- package/dest/sequencer/events.d.ts.map +1 -1
- package/dest/sequencer/metrics.d.ts +21 -5
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +97 -15
- package/dest/sequencer/sequencer.d.ts +40 -17
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +145 -91
- package/dest/sequencer/timetable.d.ts +4 -3
- package/dest/sequencer/timetable.d.ts.map +1 -1
- package/dest/sequencer/timetable.js +6 -7
- 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 +5 -4
- package/package.json +27 -28
- package/src/client/sequencer-client.ts +76 -23
- package/src/config.ts +56 -27
- package/src/global_variable_builder/global_builder.ts +38 -27
- package/src/global_variable_builder/index.ts +1 -1
- package/src/publisher/config.ts +153 -43
- 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 +55 -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 -6
- package/src/publisher/sequencer-publisher.ts +442 -95
- package/src/sequencer/checkpoint_proposal_job.ts +454 -178
- package/src/sequencer/checkpoint_voter.ts +1 -12
- package/src/sequencer/events.ts +1 -1
- package/src/sequencer/metrics.ts +106 -18
- package/src/sequencer/sequencer.ts +208 -107
- package/src/sequencer/timetable.ts +7 -7
- 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 +5 -2
|
@@ -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.
|
|
@@ -65,7 +69,11 @@ export declare class SequencerClient {
|
|
|
65
69
|
*/
|
|
66
70
|
stop(): Promise<void>;
|
|
67
71
|
getSequencer(): Sequencer;
|
|
72
|
+
/** Updates the publisher factory's node keystore adapter after a keystore reload. */
|
|
73
|
+
updatePublisherNodeKeyStore(adapter: NodeKeystoreAdapter): void;
|
|
74
|
+
/** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */
|
|
75
|
+
getDelayer(): Delayer | undefined;
|
|
68
76
|
get validatorAddresses(): EthAddress[] | undefined;
|
|
69
77
|
get maxL2BlockGas(): number | undefined;
|
|
70
78
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFckUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxLQUFLLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUN0RSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNyRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLHlCQUF5QixFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFekcsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNuRSxPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxFQUFFLDBCQUEwQixFQUFFLG1CQUFtQixFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEgsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQXlDLE1BQU0sY0FBYyxDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFDakYsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDeEYsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhFOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUV4QixTQUFTLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDO0lBQ3ZELFNBQVMsQ0FBQyxTQUFTLEVBQUUsU0FBUztJQUM5QixTQUFTLENBQUMsa0JBQWtCLEVBQUUsMEJBQTBCO0lBQ3hELFNBQVMsQ0FBQyxlQUFlLENBQUM7SUFDMUIsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUNsQixPQUFPLENBQUMsUUFBUSxDQUFDO0lBTm5CLFlBQ1ksZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLEVBQzdDLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLGtCQUFrQixFQUFFLDBCQUEwQixFQUM5QyxlQUFlLENBQUMsNkJBQWlCLEVBQ25DLFNBQVMsQ0FBQyx1QkFBVyxFQUNyQixRQUFRLENBQUMscUJBQVMsRUFDeEI7SUFFSjs7Ozs7Ozs7Ozs7T0FXRztJQUNILE9BQW9CLEdBQUcsQ0FDckIsTUFBTSxFQUFFLHFCQUFxQixFQUM3QixJQUFJLEVBQUU7UUFDSixlQUFlLEVBQUUsZUFBZSxDQUFDO1FBQ2pDLFNBQVMsRUFBRSxHQUFHLENBQUM7UUFDZixzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztRQUMvQyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO1FBQ2xELGtCQUFrQixFQUFFLDBCQUEwQixDQUFDO1FBQy9DLGFBQWEsRUFBRSxhQUFhLEdBQUcsV0FBVyxDQUFDO1FBQzNDLG1CQUFtQixFQUFFLG1CQUFtQixDQUFDO1FBQ3pDLFNBQVMsRUFBRSxlQUFlLENBQUM7UUFDM0IsZ0JBQWdCLENBQUMsRUFBRSx5QkFBeUIsQ0FBQztRQUM3QyxVQUFVLEVBQUUsbUJBQW1CLENBQUM7UUFDaEMsWUFBWSxFQUFFLFlBQVksQ0FBQztRQUMzQixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7UUFDeEIsU0FBUyxFQUFFLFNBQVMsRUFBRSxDQUFDO1FBQ3ZCLGVBQWUsQ0FBQyxFQUFFLFNBQVMsQ0FBQztRQUM1QixZQUFZLEVBQUUsZUFBZSxDQUFDO1FBQzlCLHFCQUFxQixFQUFFLHFCQUFxQixDQUFDO0tBQzlDLDRCQStHRjtJQUVEOzs7T0FHRztJQUNJLFlBQVksQ0FBQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxRQUkvRTtJQUVELDRCQUE0QjtJQUNmLEtBQUssa0JBS2pCO0lBRUQ7O09BRUc7SUFDVSxJQUFJLGtCQUtoQjtJQUVNLFlBQVksSUFBSSxTQUFTLENBRS9CO0lBRUQscUZBQXFGO0lBQzlFLDJCQUEyQixDQUFDLE9BQU8sRUFBRSxtQkFBbUIsR0FBRyxJQUFJLENBRXJFO0lBRUQsaUZBQWlGO0lBQ2pGLFVBQVUsSUFBSSxPQUFPLEdBQUcsU0FBUyxDQUVoQztJQUVELElBQUksa0JBQWtCLElBQUksVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUVqRDtJQUVELElBQUksYUFBYSxJQUFJLE1BQU0sR0FBRyxTQUFTLENBRXRDO0NBQ0YifQ==
|
|
@@ -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,3 +1,4 @@
|
|
|
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';
|
|
@@ -8,7 +9,7 @@ import { createLogger } from '@aztec/foundation/log';
|
|
|
8
9
|
import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
|
|
9
10
|
import { L1Metrics } from '@aztec/telemetry-client';
|
|
10
11
|
import { NodeKeystoreAdapter } from '@aztec/validator-client';
|
|
11
|
-
import {
|
|
12
|
+
import { getPublisherConfigFromSequencerConfig } from '../config.js';
|
|
12
13
|
import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
|
|
13
14
|
import { Sequencer } from '../sequencer/index.js';
|
|
14
15
|
/**
|
|
@@ -19,12 +20,14 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
19
20
|
checkpointsBuilder;
|
|
20
21
|
validatorClient;
|
|
21
22
|
l1Metrics;
|
|
22
|
-
|
|
23
|
+
delayer_;
|
|
24
|
+
constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer_){
|
|
23
25
|
this.publisherManager = publisherManager;
|
|
24
26
|
this.sequencer = sequencer;
|
|
25
27
|
this.checkpointsBuilder = checkpointsBuilder;
|
|
26
28
|
this.validatorClient = validatorClient;
|
|
27
29
|
this.l1Metrics = l1Metrics;
|
|
30
|
+
this.delayer_ = delayer_;
|
|
28
31
|
}
|
|
29
32
|
/**
|
|
30
33
|
* Initializes a new instance.
|
|
@@ -44,12 +47,14 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
44
47
|
const publicClient = getPublicClient(config);
|
|
45
48
|
const l1TxUtils = deps.l1TxUtils;
|
|
46
49
|
const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
|
|
47
|
-
const publisherManager = new PublisherManager(l1TxUtils, config,
|
|
50
|
+
const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
|
|
51
|
+
bindings: log.getBindings(),
|
|
52
|
+
funder: deps.funderL1TxUtils
|
|
53
|
+
});
|
|
48
54
|
const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
|
|
49
|
-
const [l1GenesisTime, slotDuration,
|
|
55
|
+
const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
|
|
50
56
|
rollupContract.getL1GenesisTime(),
|
|
51
57
|
rollupContract.getSlotDuration(),
|
|
52
|
-
rollupContract.getVersion(),
|
|
53
58
|
rollupContract.getManaLimit().then(Number)
|
|
54
59
|
]);
|
|
55
60
|
const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
|
|
@@ -57,7 +62,8 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
57
62
|
l1RpcUrls: rpcUrls,
|
|
58
63
|
l1ChainId: chainId,
|
|
59
64
|
viemPollingIntervalMS: config.viemPollingIntervalMS,
|
|
60
|
-
ethereumSlotDuration: config.ethereumSlotDuration
|
|
65
|
+
ethereumSlotDuration: config.ethereumSlotDuration,
|
|
66
|
+
enableProposerPipelining: config.enableProposerPipelining
|
|
61
67
|
}, {
|
|
62
68
|
dateProvider: deps.dateProvider
|
|
63
69
|
});
|
|
@@ -75,21 +81,7 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
75
81
|
logger: log
|
|
76
82
|
});
|
|
77
83
|
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
|
-
}
|
|
84
|
+
const globalsBuilder = deps.globalVariableBuilder;
|
|
93
85
|
// When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
|
|
94
86
|
// Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
|
|
95
87
|
// In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
|
|
@@ -97,13 +89,24 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
97
89
|
// See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
|
|
98
90
|
const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
|
|
99
91
|
const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
|
|
92
|
+
const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = capPerBlockLimits(config, rollupManaLimit, log);
|
|
93
|
+
const l1Constants = {
|
|
94
|
+
l1GenesisTime,
|
|
95
|
+
slotDuration: Number(slotDuration),
|
|
96
|
+
ethereumSlotDuration,
|
|
97
|
+
rollupManaLimit
|
|
98
|
+
};
|
|
100
99
|
const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
|
|
101
100
|
...config,
|
|
102
101
|
l1PublishingTime,
|
|
103
|
-
maxL2BlockGas
|
|
102
|
+
maxL2BlockGas,
|
|
103
|
+
maxDABlockGas,
|
|
104
|
+
maxTxsPerBlock
|
|
104
105
|
}, telemetryClient, log);
|
|
105
|
-
|
|
106
|
-
|
|
106
|
+
sequencer.init();
|
|
107
|
+
// Extract the shared delayer from the first L1TxUtils instance (all instances share the same delayer)
|
|
108
|
+
const delayer = l1TxUtils[0]?.delayer;
|
|
109
|
+
return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer);
|
|
107
110
|
}
|
|
108
111
|
/**
|
|
109
112
|
* Updates sequencer and validator client config.
|
|
@@ -117,19 +120,25 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
117
120
|
await this.validatorClient?.start();
|
|
118
121
|
this.sequencer.start();
|
|
119
122
|
this.l1Metrics?.start();
|
|
120
|
-
await this.publisherManager.
|
|
123
|
+
await this.publisherManager.start();
|
|
121
124
|
}
|
|
122
125
|
/**
|
|
123
126
|
* Stops the sequencer from processing new txs.
|
|
124
127
|
*/ async stop() {
|
|
125
128
|
await this.sequencer.stop();
|
|
126
129
|
await this.validatorClient?.stop();
|
|
127
|
-
this.publisherManager.
|
|
130
|
+
await this.publisherManager.stop();
|
|
128
131
|
this.l1Metrics?.stop();
|
|
129
132
|
}
|
|
130
133
|
getSequencer() {
|
|
131
134
|
return this.sequencer;
|
|
132
135
|
}
|
|
136
|
+
/** Updates the publisher factory's node keystore adapter after a keystore reload. */ updatePublisherNodeKeyStore(adapter) {
|
|
137
|
+
this.sequencer.updatePublisherNodeKeyStore(adapter);
|
|
138
|
+
}
|
|
139
|
+
/** Returns the shared tx delayer for sequencer L1 txs, if enabled. Test-only. */ getDelayer() {
|
|
140
|
+
return this.delayer_;
|
|
141
|
+
}
|
|
133
142
|
get validatorAddresses() {
|
|
134
143
|
return this.sequencer.getValidatorAddresses();
|
|
135
144
|
}
|
|
@@ -137,3 +146,28 @@ import { Sequencer } from '../sequencer/index.js';
|
|
|
137
146
|
return this.sequencer.maxL2BlockGas;
|
|
138
147
|
}
|
|
139
148
|
}
|
|
149
|
+
/**
|
|
150
|
+
* Caps operator-provided per-block limits at checkpoint-level limits.
|
|
151
|
+
* Returns undefined for any limit the operator didn't set — the checkpoint builder handles redistribution.
|
|
152
|
+
*/ function capPerBlockLimits(config, rollupManaLimit, log) {
|
|
153
|
+
let maxL2BlockGas = config.maxL2BlockGas;
|
|
154
|
+
if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
|
|
155
|
+
log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
|
|
156
|
+
maxL2BlockGas = rollupManaLimit;
|
|
157
|
+
}
|
|
158
|
+
let maxDABlockGas = config.maxDABlockGas;
|
|
159
|
+
if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
|
|
160
|
+
log.warn(`Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`);
|
|
161
|
+
maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
|
|
162
|
+
}
|
|
163
|
+
let maxTxsPerBlock = config.maxTxsPerBlock;
|
|
164
|
+
if (maxTxsPerBlock !== undefined && config.maxTxsPerCheckpoint !== undefined && maxTxsPerBlock > config.maxTxsPerCheckpoint) {
|
|
165
|
+
log.warn(`Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
|
|
166
|
+
maxTxsPerBlock = config.maxTxsPerCheckpoint;
|
|
167
|
+
}
|
|
168
|
+
return {
|
|
169
|
+
maxL2BlockGas,
|
|
170
|
+
maxDABlockGas,
|
|
171
|
+
maxTxsPerBlock
|
|
172
|
+
};
|
|
173
|
+
}
|
package/dest/config.d.ts
CHANGED
|
@@ -3,25 +3,45 @@ 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
11
|
/**
|
|
13
12
|
* Default values for SequencerConfig.
|
|
14
13
|
* Centralized location for all sequencer configuration defaults.
|
|
15
14
|
*/
|
|
16
|
-
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
|
+
};
|
|
17
37
|
/**
|
|
18
38
|
* Configuration settings for the SequencerClient.
|
|
19
39
|
*/
|
|
20
|
-
export type SequencerClientConfig =
|
|
40
|
+
export type SequencerClientConfig = SequencerPublisherConfig & KeyStoreConfig & ValidatorClientConfig & SequencerTxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & PipelineConfig & Pick<P2PConfig, 'txPublicSetupAllowListExtend'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
|
|
21
41
|
export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
|
|
22
42
|
export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
|
|
23
43
|
/**
|
|
24
44
|
* Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
|
|
25
45
|
*/
|
|
26
46
|
export declare function getConfigEnvVars(): SequencerClientConfig;
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxjQUFjLEVBQ25CLEtBQUssZUFBZSxFQUlyQixNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFpQyxNQUFNLGdDQUFnQyxDQUFDO0FBRTNHLE9BQU8sRUFDTCxLQUFLLHdCQUF3QixFQUM3QixLQUFLLHVCQUF1QixFQUc3QixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBRWhDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxzQkFBc0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXFCQSxDQUFDO0FBRXBDOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixHQUFHLHdCQUF3QixHQUMxRCxjQUFjLEdBQ2QscUJBQXFCLEdBQ3JCLHVCQUF1QixHQUN2QixlQUFlLEdBQ2YsY0FBYyxHQUNkLFdBQVcsR0FDWCxjQUFjLEdBQ2QsSUFBSSxDQUFDLFNBQVMsRUFBRSw4QkFBOEIsQ0FBQyxHQUMvQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQWdLdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FVbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9
|
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,EAKxB,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,EAChB,KAAK,
|
|
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,EAKxB,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,EAChB,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;;;;;;;;;;;;;;;;;;;;;CAqBA,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,CAgKvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAUnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
|
package/dest/config.js
CHANGED
|
@@ -5,23 +5,21 @@ 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, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
|
|
8
|
+
import { chainConfigMappings, pipelineConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
|
|
9
9
|
import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
|
|
10
10
|
import { validatorClientConfigMappings } from '@aztec/validator-client/config';
|
|
11
|
-
import {
|
|
11
|
+
import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
|
|
12
12
|
export * from './publisher/config.js';
|
|
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
24
|
attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
|
|
27
25
|
secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
|
|
@@ -30,9 +28,12 @@ export * from './publisher/config.js';
|
|
|
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
|
|
36
37
|
};
|
|
37
38
|
export const sequencerConfigMappings = {
|
|
38
39
|
sequencerPollingIntervalMS: {
|
|
@@ -40,10 +41,10 @@ export const sequencerConfigMappings = {
|
|
|
40
41
|
description: 'The number of ms to wait between polling for checking to build on the next slot.',
|
|
41
42
|
...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
|
|
42
43
|
},
|
|
43
|
-
|
|
44
|
-
env: '
|
|
45
|
-
description: 'The maximum number of txs
|
|
46
|
-
|
|
44
|
+
maxTxsPerCheckpoint: {
|
|
45
|
+
env: 'SEQ_MAX_TX_PER_CHECKPOINT',
|
|
46
|
+
description: 'The maximum number of txs across all blocks in a checkpoint.',
|
|
47
|
+
parseEnv: (val)=>val ? parseInt(val, 10) : undefined
|
|
47
48
|
},
|
|
48
49
|
minTxsPerBlock: {
|
|
49
50
|
env: 'SEQ_MIN_TX_PER_BLOCK',
|
|
@@ -61,12 +62,22 @@ export const sequencerConfigMappings = {
|
|
|
61
62
|
maxL2BlockGas: {
|
|
62
63
|
env: 'SEQ_MAX_L2_BLOCK_GAS',
|
|
63
64
|
description: 'The maximum L2 block gas.',
|
|
64
|
-
|
|
65
|
+
parseEnv: (val)=>val ? parseInt(val, 10) : undefined
|
|
65
66
|
},
|
|
66
67
|
maxDABlockGas: {
|
|
67
68
|
env: 'SEQ_MAX_DA_BLOCK_GAS',
|
|
68
69
|
description: 'The maximum DA block gas.',
|
|
69
|
-
|
|
70
|
+
parseEnv: (val)=>val ? parseInt(val, 10) : undefined
|
|
71
|
+
},
|
|
72
|
+
perBlockAllocationMultiplier: {
|
|
73
|
+
env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
|
|
74
|
+
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.',
|
|
75
|
+
...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
|
|
76
|
+
},
|
|
77
|
+
redistributeCheckpointBudget: {
|
|
78
|
+
env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
|
|
79
|
+
description: 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
|
|
80
|
+
...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget)
|
|
70
81
|
},
|
|
71
82
|
coinbase: {
|
|
72
83
|
env: 'COINBASE',
|
|
@@ -86,11 +97,6 @@ export const sequencerConfigMappings = {
|
|
|
86
97
|
env: 'ACVM_BINARY_PATH',
|
|
87
98
|
description: 'The path to the ACVM binary'
|
|
88
99
|
},
|
|
89
|
-
maxBlockSizeInBytes: {
|
|
90
|
-
env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
|
|
91
|
-
description: 'Max block size',
|
|
92
|
-
...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes)
|
|
93
|
-
},
|
|
94
100
|
enforceTimeTable: {
|
|
95
101
|
env: 'SEQ_ENFORCE_TIME_TABLE',
|
|
96
102
|
description: 'Whether to enforce the time table when building blocks',
|
|
@@ -143,6 +149,14 @@ export const sequencerConfigMappings = {
|
|
|
143
149
|
description: 'Inject a fake attestation (for testing only)',
|
|
144
150
|
...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
|
|
145
151
|
},
|
|
152
|
+
injectHighSValueAttestation: {
|
|
153
|
+
description: 'Inject a malleable attestation with a high-s value (for testing only)',
|
|
154
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectHighSValueAttestation)
|
|
155
|
+
},
|
|
156
|
+
injectUnrecoverableSignatureAttestation: {
|
|
157
|
+
description: 'Inject an attestation with an unrecoverable signature (for testing only)',
|
|
158
|
+
...booleanConfigHelper(DefaultSequencerConfig.injectUnrecoverableSignatureAttestation)
|
|
159
|
+
},
|
|
146
160
|
fishermanMode: {
|
|
147
161
|
env: 'FISHERMAN_MODE',
|
|
148
162
|
description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
|
|
@@ -162,8 +176,16 @@ export const sequencerConfigMappings = {
|
|
|
162
176
|
description: 'Skip pushing proposed blocks to archiver (default: true)',
|
|
163
177
|
...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver)
|
|
164
178
|
},
|
|
179
|
+
minBlocksForCheckpoint: {
|
|
180
|
+
description: 'Minimum number of blocks required for a checkpoint proposal (test only)'
|
|
181
|
+
},
|
|
182
|
+
skipPublishingCheckpointsPercent: {
|
|
183
|
+
env: 'SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT',
|
|
184
|
+
description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
|
|
185
|
+
...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent)
|
|
186
|
+
},
|
|
165
187
|
...pickConfigMappings(p2pConfigMappings, [
|
|
166
|
-
'
|
|
188
|
+
'txPublicSetupAllowListExtend'
|
|
167
189
|
])
|
|
168
190
|
};
|
|
169
191
|
export const sequencerClientConfigMappings = {
|
|
@@ -171,9 +193,10 @@ export const sequencerClientConfigMappings = {
|
|
|
171
193
|
...sequencerConfigMappings,
|
|
172
194
|
...keyStoreConfigMappings,
|
|
173
195
|
...l1ReaderConfigMappings,
|
|
174
|
-
...
|
|
175
|
-
...
|
|
196
|
+
...sequencerTxSenderConfigMappings,
|
|
197
|
+
...sequencerPublisherConfigMappings,
|
|
176
198
|
...chainConfigMappings,
|
|
199
|
+
...pipelineConfigMappings,
|
|
177
200
|
...pickConfigMappings(l1ContractsConfigMappings, [
|
|
178
201
|
'ethereumSlotDuration',
|
|
179
202
|
'aztecSlotDuration',
|
|
@@ -1,29 +1,35 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type {
|
|
1
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
|
+
import type { ViemPublicClient } from '@aztec/ethereum/types';
|
|
3
3
|
import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
4
4
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
|
+
import type { DateProvider } from '@aztec/foundation/timer';
|
|
5
6
|
import type { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
6
7
|
import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
7
8
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
8
|
-
import type { CheckpointGlobalVariables, GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
|
|
9
|
+
import type { BuildCheckpointGlobalVariablesOpts, CheckpointGlobalVariables, GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
|
|
9
10
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
11
|
+
/** Configuration for the GlobalVariableBuilder (excludes L1 client config). */
|
|
12
|
+
export type GlobalVariableBuilderConfig = {
|
|
13
|
+
l1Contracts: Pick<L1ContractAddresses, 'rollupAddress'>;
|
|
14
|
+
ethereumSlotDuration: number;
|
|
15
|
+
rollupVersion: bigint;
|
|
16
|
+
} & Pick<L1RollupConstants, 'slotDuration' | 'l1GenesisTime'>;
|
|
10
17
|
/**
|
|
11
18
|
* Simple global variables builder.
|
|
12
19
|
*/
|
|
13
20
|
export declare class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
|
|
21
|
+
private readonly dateProvider;
|
|
22
|
+
private readonly publicClient;
|
|
14
23
|
private log;
|
|
15
24
|
private currentMinFees;
|
|
16
25
|
private currentL1BlockNumber;
|
|
17
26
|
private readonly rollupContract;
|
|
18
|
-
private readonly publicClient;
|
|
19
27
|
private readonly ethereumSlotDuration;
|
|
20
28
|
private readonly aztecSlotDuration;
|
|
21
29
|
private readonly l1GenesisTime;
|
|
22
30
|
private chainId;
|
|
23
31
|
private version;
|
|
24
|
-
constructor(
|
|
25
|
-
rollupVersion: bigint;
|
|
26
|
-
});
|
|
32
|
+
constructor(dateProvider: DateProvider, publicClient: ViemPublicClient, config: GlobalVariableBuilderConfig);
|
|
27
33
|
private computeCurrentMinFees;
|
|
28
34
|
getCurrentMinFees(): Promise<GasFees>;
|
|
29
35
|
/**
|
|
@@ -36,8 +42,6 @@ export declare class GlobalVariableBuilder implements GlobalVariableBuilderInter
|
|
|
36
42
|
*/
|
|
37
43
|
buildGlobalVariables(blockNumber: BlockNumber, coinbase: EthAddress, feeRecipient: AztecAddress, maybeSlot?: SlotNumber): Promise<GlobalVariables>;
|
|
38
44
|
/** Builds global variables that are constant throughout a checkpoint. */
|
|
39
|
-
buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber): Promise<CheckpointGlobalVariables
|
|
40
|
-
timestamp: bigint;
|
|
41
|
-
}>;
|
|
45
|
+
buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber, opts?: BuildCheckpointGlobalVariablesOpts): Promise<CheckpointGlobalVariables>;
|
|
42
46
|
}
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUxRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBK0MsTUFBTSw2QkFBNkIsQ0FBQztBQUNsSCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQ1Ysa0NBQWtDLEVBQ2xDLHlCQUF5QixFQUN6QixxQkFBcUIsSUFBSSw4QkFBOEIsRUFDeEQsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQsK0VBQStFO0FBQy9FLE1BQU0sTUFBTSwyQkFBMkIsR0FBRztJQUN4QyxXQUFXLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQ3hELG9CQUFvQixFQUFFLE1BQU0sQ0FBQztJQUM3QixhQUFhLEVBQUUsTUFBTSxDQUFDO0NBQ3ZCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUMsQ0FBQztBQUU5RDs7R0FFRztBQUNILHFCQUFhLHFCQUFzQixZQUFXLDhCQUE4QjtJQWN4RSxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBZC9CLE9BQU8sQ0FBQyxHQUFHLENBQXFEO0lBQ2hFLE9BQU8sQ0FBQyxjQUFjLENBQXdEO0lBQzlFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBaUM7SUFFN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBUztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBUztJQUV2QyxPQUFPLENBQUMsT0FBTyxDQUFLO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFFcEIsWUFDbUIsWUFBWSxFQUFFLFlBQVksRUFDMUIsWUFBWSxFQUFFLGdCQUFnQixFQUMvQyxNQUFNLEVBQUUsMkJBQTJCLEVBVXBDO1lBTWEscUJBQXFCO0lBa0J0QixpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBVWpEO0lBRUQ7Ozs7Ozs7T0FPRztJQUNVLG9CQUFvQixDQUMvQixXQUFXLEVBQUUsV0FBVyxFQUN4QixRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixTQUFTLENBQUMsRUFBRSxVQUFVLEdBQ3JCLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FZMUI7SUFFRCx5RUFBeUU7SUFDNUQsOEJBQThCLENBQ3pDLFFBQVEsRUFBRSxVQUFVLEVBQ3BCLFlBQVksRUFBRSxZQUFZLEVBQzFCLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLElBQUksQ0FBQyxFQUFFLGtDQUFrQyxHQUN4QyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0F1QnBDO0NBQ0YifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAA+C,MAAM,6BAA6B,CAAC;AAClH,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EACV,kCAAkC,EAClC,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,+EAA+E;AAC/E,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACxD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAcxE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAd/B,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,CAAC,OAAO,CAAK;IAEpB,YACmB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,gBAAgB,EAC/C,MAAM,EAAE,2BAA2B,EAUpC;YAMa,qBAAqB;IAkBtB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;IAED;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,SAAS,CAAC,EAAE,UAAU,GACrB,OAAO,CAAC,eAAe,CAAC,CAY1B;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,IAAI,CAAC,EAAE,kCAAkC,GACxC,OAAO,CAAC,yBAAyB,CAAC,CAuBpC;CACF"}
|
|
@@ -1,41 +1,36 @@
|
|
|
1
|
-
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
2
1
|
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
3
2
|
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
4
3
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
|
-
import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
5
|
+
import { getNextL1SlotTimestamp, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
|
|
7
6
|
import { GasFees } from '@aztec/stdlib/gas';
|
|
8
7
|
import { GlobalVariables } from '@aztec/stdlib/tx';
|
|
9
|
-
import { createPublicClient, fallback, http } from 'viem';
|
|
10
8
|
/**
|
|
11
9
|
* Simple global variables builder.
|
|
12
10
|
*/ export class GlobalVariableBuilder {
|
|
13
|
-
|
|
14
|
-
currentMinFees = Promise.resolve(new GasFees(0, 0));
|
|
15
|
-
currentL1BlockNumber = undefined;
|
|
16
|
-
rollupContract;
|
|
11
|
+
dateProvider;
|
|
17
12
|
publicClient;
|
|
13
|
+
log;
|
|
14
|
+
currentMinFees;
|
|
15
|
+
currentL1BlockNumber;
|
|
16
|
+
rollupContract;
|
|
18
17
|
ethereumSlotDuration;
|
|
19
18
|
aztecSlotDuration;
|
|
20
19
|
l1GenesisTime;
|
|
21
20
|
chainId;
|
|
22
21
|
version;
|
|
23
|
-
constructor(config){
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
constructor(dateProvider, publicClient, config){
|
|
23
|
+
this.dateProvider = dateProvider;
|
|
24
|
+
this.publicClient = publicClient;
|
|
25
|
+
this.log = createLogger('sequencer:global_variable_builder');
|
|
26
|
+
this.currentMinFees = Promise.resolve(new GasFees(0, 0));
|
|
27
|
+
this.currentL1BlockNumber = undefined;
|
|
26
28
|
this.version = new Fr(config.rollupVersion);
|
|
27
|
-
this.chainId = new Fr(
|
|
29
|
+
this.chainId = new Fr(this.publicClient.chain.id);
|
|
28
30
|
this.ethereumSlotDuration = config.ethereumSlotDuration;
|
|
29
31
|
this.aztecSlotDuration = config.slotDuration;
|
|
30
32
|
this.l1GenesisTime = config.l1GenesisTime;
|
|
31
|
-
this.
|
|
32
|
-
chain: chain.chainInfo,
|
|
33
|
-
transport: fallback(chain.rpcUrls.map((url)=>http(url, {
|
|
34
|
-
batch: false
|
|
35
|
-
}))),
|
|
36
|
-
pollingInterval: config.viemPollingIntervalMS
|
|
37
|
-
});
|
|
38
|
-
this.rollupContract = new RollupContract(this.publicClient, l1Contracts.rollupAddress);
|
|
33
|
+
this.rollupContract = new RollupContract(this.publicClient, config.l1Contracts.rollupAddress);
|
|
39
34
|
}
|
|
40
35
|
/**
|
|
41
36
|
* Computes the "current" min fees, e.g., the price that you currently should pay to get include in the next block
|
|
@@ -46,7 +41,10 @@ import { createPublicClient, fallback, http } from 'viem';
|
|
|
46
41
|
// The timestamp of that last block will act as a lower bound for the next block.
|
|
47
42
|
const lastCheckpoint = await this.rollupContract.getPendingCheckpoint();
|
|
48
43
|
const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(BigInt(lastCheckpoint.slotNumber) + 1n));
|
|
49
|
-
const nextEthTimestamp =
|
|
44
|
+
const nextEthTimestamp = getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), {
|
|
45
|
+
l1GenesisTime: this.l1GenesisTime,
|
|
46
|
+
ethereumSlotDuration: this.ethereumSlotDuration
|
|
47
|
+
});
|
|
50
48
|
const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
|
|
51
49
|
return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
|
|
52
50
|
}
|
|
@@ -68,22 +66,28 @@ import { createPublicClient, fallback, http } from 'viem';
|
|
|
68
66
|
* @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
|
|
69
67
|
* @returns The global variables for the given block number.
|
|
70
68
|
*/ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, maybeSlot) {
|
|
71
|
-
const slot = maybeSlot ?? await this.rollupContract.getSlotAt(
|
|
69
|
+
const slot = maybeSlot ?? await this.rollupContract.getSlotAt(getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), {
|
|
70
|
+
l1GenesisTime: this.l1GenesisTime,
|
|
71
|
+
ethereumSlotDuration: this.ethereumSlotDuration
|
|
72
|
+
}));
|
|
72
73
|
const checkpointGlobalVariables = await this.buildCheckpointGlobalVariables(coinbase, feeRecipient, slot);
|
|
73
74
|
return GlobalVariables.from({
|
|
74
75
|
blockNumber,
|
|
75
76
|
...checkpointGlobalVariables
|
|
76
77
|
});
|
|
77
78
|
}
|
|
78
|
-
/** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber) {
|
|
79
|
+
/** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber, opts) {
|
|
79
80
|
const { chainId, version } = this;
|
|
80
81
|
const timestamp = getTimestampForSlot(slotNumber, {
|
|
81
82
|
slotDuration: this.aztecSlotDuration,
|
|
82
83
|
l1GenesisTime: this.l1GenesisTime
|
|
83
84
|
});
|
|
84
|
-
//
|
|
85
|
-
//
|
|
86
|
-
const
|
|
85
|
+
// When pipelining, force the proposed checkpoint number and fee header to the parent so that
|
|
86
|
+
// the fee computation matches what L1 will see when the previous pipelined checkpoint has landed.
|
|
87
|
+
const pendingNumberOverride = await this.rollupContract.makePendingCheckpointNumberOverride(opts?.forcePendingCheckpointNumber);
|
|
88
|
+
const feeHeaderOverride = opts?.forceProposedFeeHeader ? await this.rollupContract.makeFeeHeaderOverride(opts.forceProposedFeeHeader.checkpointNumber, opts.forceProposedFeeHeader.feeHeader) : [];
|
|
89
|
+
const stateOverride = RollupContract.mergeStateOverrides(pendingNumberOverride, feeHeaderOverride);
|
|
90
|
+
const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true, stateOverride));
|
|
87
91
|
return {
|
|
88
92
|
chainId,
|
|
89
93
|
version,
|