@aztec/sequencer-client 0.0.1-commit.9b94fc1 → 0.0.1-commit.9ee6fcc6

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.
Files changed (118) hide show
  1. package/dest/client/sequencer-client.d.ts +24 -16
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +73 -32
  4. package/dest/config.d.ts +35 -9
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +106 -44
  7. package/dest/global_variable_builder/global_builder.d.ts +27 -14
  8. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  9. package/dest/global_variable_builder/global_builder.js +65 -54
  10. package/dest/global_variable_builder/index.d.ts +2 -2
  11. package/dest/global_variable_builder/index.d.ts.map +1 -1
  12. package/dest/index.d.ts +2 -3
  13. package/dest/index.d.ts.map +1 -1
  14. package/dest/index.js +1 -2
  15. package/dest/publisher/config.d.ts +53 -20
  16. package/dest/publisher/config.d.ts.map +1 -1
  17. package/dest/publisher/config.js +124 -39
  18. package/dest/publisher/index.d.ts +2 -1
  19. package/dest/publisher/index.d.ts.map +1 -1
  20. package/dest/publisher/l1_tx_failed_store/factory.d.ts +11 -0
  21. package/dest/publisher/l1_tx_failed_store/factory.d.ts.map +1 -0
  22. package/dest/publisher/l1_tx_failed_store/factory.js +22 -0
  23. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +59 -0
  24. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -0
  25. package/dest/publisher/l1_tx_failed_store/failed_tx_store.js +1 -0
  26. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts +15 -0
  27. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.d.ts.map +1 -0
  28. package/dest/publisher/l1_tx_failed_store/file_store_failed_tx_store.js +34 -0
  29. package/dest/publisher/l1_tx_failed_store/index.d.ts +4 -0
  30. package/dest/publisher/l1_tx_failed_store/index.d.ts.map +1 -0
  31. package/dest/publisher/l1_tx_failed_store/index.js +2 -0
  32. package/dest/publisher/sequencer-publisher-factory.d.ts +15 -6
  33. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  34. package/dest/publisher/sequencer-publisher-factory.js +28 -3
  35. package/dest/publisher/sequencer-publisher-metrics.d.ts +3 -3
  36. package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
  37. package/dest/publisher/sequencer-publisher-metrics.js +23 -86
  38. package/dest/publisher/sequencer-publisher.d.ts +79 -49
  39. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  40. package/dest/publisher/sequencer-publisher.js +932 -155
  41. package/dest/sequencer/checkpoint_proposal_job.d.ts +108 -0
  42. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -0
  43. package/dest/sequencer/checkpoint_proposal_job.js +1289 -0
  44. package/dest/sequencer/checkpoint_voter.d.ts +35 -0
  45. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -0
  46. package/dest/sequencer/checkpoint_voter.js +109 -0
  47. package/dest/sequencer/config.d.ts +3 -2
  48. package/dest/sequencer/config.d.ts.map +1 -1
  49. package/dest/sequencer/events.d.ts +47 -0
  50. package/dest/sequencer/events.d.ts.map +1 -0
  51. package/dest/sequencer/events.js +1 -0
  52. package/dest/sequencer/index.d.ts +4 -2
  53. package/dest/sequencer/index.d.ts.map +1 -1
  54. package/dest/sequencer/index.js +3 -1
  55. package/dest/sequencer/metrics.d.ts +42 -6
  56. package/dest/sequencer/metrics.d.ts.map +1 -1
  57. package/dest/sequencer/metrics.js +227 -72
  58. package/dest/sequencer/sequencer.d.ts +125 -134
  59. package/dest/sequencer/sequencer.d.ts.map +1 -1
  60. package/dest/sequencer/sequencer.js +754 -652
  61. package/dest/sequencer/timetable.d.ts +54 -16
  62. package/dest/sequencer/timetable.d.ts.map +1 -1
  63. package/dest/sequencer/timetable.js +147 -62
  64. package/dest/sequencer/types.d.ts +3 -0
  65. package/dest/sequencer/types.d.ts.map +1 -0
  66. package/dest/sequencer/types.js +1 -0
  67. package/dest/sequencer/utils.d.ts +14 -8
  68. package/dest/sequencer/utils.d.ts.map +1 -1
  69. package/dest/sequencer/utils.js +7 -4
  70. package/dest/test/index.d.ts +6 -7
  71. package/dest/test/index.d.ts.map +1 -1
  72. package/dest/test/mock_checkpoint_builder.d.ts +95 -0
  73. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -0
  74. package/dest/test/mock_checkpoint_builder.js +231 -0
  75. package/dest/test/utils.d.ts +53 -0
  76. package/dest/test/utils.d.ts.map +1 -0
  77. package/dest/test/utils.js +104 -0
  78. package/package.json +31 -30
  79. package/src/client/sequencer-client.ts +97 -55
  80. package/src/config.ts +124 -53
  81. package/src/global_variable_builder/global_builder.ts +76 -73
  82. package/src/global_variable_builder/index.ts +1 -1
  83. package/src/index.ts +1 -7
  84. package/src/publisher/config.ts +163 -50
  85. package/src/publisher/index.ts +3 -0
  86. package/src/publisher/l1_tx_failed_store/factory.ts +32 -0
  87. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +55 -0
  88. package/src/publisher/l1_tx_failed_store/file_store_failed_tx_store.ts +46 -0
  89. package/src/publisher/l1_tx_failed_store/index.ts +3 -0
  90. package/src/publisher/sequencer-publisher-factory.ts +43 -10
  91. package/src/publisher/sequencer-publisher-metrics.ts +19 -71
  92. package/src/publisher/sequencer-publisher.ts +635 -200
  93. package/src/sequencer/README.md +531 -0
  94. package/src/sequencer/checkpoint_proposal_job.ts +1049 -0
  95. package/src/sequencer/checkpoint_voter.ts +130 -0
  96. package/src/sequencer/config.ts +2 -1
  97. package/src/sequencer/events.ts +27 -0
  98. package/src/sequencer/index.ts +3 -1
  99. package/src/sequencer/metrics.ts +282 -82
  100. package/src/sequencer/sequencer.ts +521 -859
  101. package/src/sequencer/timetable.ts +178 -83
  102. package/src/sequencer/types.ts +6 -0
  103. package/src/sequencer/utils.ts +18 -9
  104. package/src/test/index.ts +5 -6
  105. package/src/test/mock_checkpoint_builder.ts +323 -0
  106. package/src/test/utils.ts +167 -0
  107. package/dest/sequencer/block_builder.d.ts +0 -27
  108. package/dest/sequencer/block_builder.d.ts.map +0 -1
  109. package/dest/sequencer/block_builder.js +0 -134
  110. package/dest/tx_validator/nullifier_cache.d.ts +0 -14
  111. package/dest/tx_validator/nullifier_cache.d.ts.map +0 -1
  112. package/dest/tx_validator/nullifier_cache.js +0 -24
  113. package/dest/tx_validator/tx_validator_factory.d.ts +0 -17
  114. package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
  115. package/dest/tx_validator/tx_validator_factory.js +0 -53
  116. package/src/sequencer/block_builder.ts +0 -222
  117. package/src/tx_validator/nullifier_cache.ts +0 -30
  118. package/src/tx_validator/tx_validator_factory.ts +0 -132
@@ -1,30 +1,32 @@
1
- import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
1
+ import type { BlobClientInterface } from '@aztec/blob-client/client';
2
2
  import { EpochCache } from '@aztec/epoch-cache';
3
- import { PublisherManager } from '@aztec/ethereum';
4
- import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
3
+ import { type Delayer, L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
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';
7
7
  import type { KeystoreManager } from '@aztec/node-keystore';
8
8
  import type { P2P } from '@aztec/p2p';
9
9
  import type { SlasherClientInterface } from '@aztec/slasher';
10
- import type { L2BlockSource } from '@aztec/stdlib/block';
11
- import type { IFullNodeBlockBuilder, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
10
+ import type { L2BlockSink, L2BlockSource } from '@aztec/stdlib/block';
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 { type ValidatorClient } from '@aztec/validator-client';
15
- import type { SequencerClientConfig } from '../config.js';
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<L1TxUtilsWithBlobs>;
23
+ protected publisherManager: PublisherManager<L1TxUtils>;
23
24
  protected sequencer: Sequencer;
24
- protected blockBuilder: IFullNodeBlockBuilder;
25
+ protected checkpointsBuilder: FullNodeCheckpointsBuilder;
25
26
  protected validatorClient?: ValidatorClient | undefined;
26
27
  private l1Metrics?;
27
- constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, blockBuilder: IFullNodeBlockBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
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.
@@ -38,20 +40,22 @@ export declare class SequencerClient {
38
40
  * @returns A new running instance.
39
41
  */
40
42
  static new(config: SequencerClientConfig, deps: {
41
- validatorClient: ValidatorClient | undefined;
43
+ validatorClient: ValidatorClient;
42
44
  p2pClient: P2P;
43
45
  worldStateSynchronizer: WorldStateSynchronizer;
44
46
  slasherClient: SlasherClientInterface | undefined;
45
- blockBuilder: IFullNodeBlockBuilder;
46
- l2BlockSource: L2BlockSource;
47
+ checkpointsBuilder: FullNodeCheckpointsBuilder;
48
+ l2BlockSource: L2BlockSource & L2BlockSink;
47
49
  l1ToL2MessageSource: L1ToL2MessageSource;
48
50
  telemetry: TelemetryClient;
49
51
  publisherFactory?: SequencerPublisherFactory;
50
- blobSinkClient?: BlobSinkClientInterface;
52
+ blobClient: BlobClientInterface;
51
53
  dateProvider: DateProvider;
52
54
  epochCache?: EpochCache;
53
- l1TxUtils: L1TxUtilsWithBlobs[];
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ2hELE9BQU8sRUFFTCxnQkFBZ0IsRUFJakIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUM1RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQ1YscUJBQXFCLEVBQ3JCLHlCQUF5QixFQUN6QixzQkFBc0IsRUFDdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUV6QyxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ25FLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMxRSxPQUFPLEVBQXVCLEtBQUssZUFBZSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFcEYsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUQsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDeEYsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXhFOztHQUVHO0FBQ0gscUJBQWEsZUFBZTtJQUV4QixTQUFTLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsa0JBQWtCLENBQUM7SUFDaEUsU0FBUyxDQUFDLFNBQVMsRUFBRSxTQUFTO0lBQzlCLFNBQVMsQ0FBQyxZQUFZLEVBQUUscUJBQXFCO0lBQzdDLFNBQVMsQ0FBQyxlQUFlLENBQUM7SUFDMUIsT0FBTyxDQUFDLFNBQVMsQ0FBQztJQUxwQixZQUNZLGdCQUFnQixFQUFFLGdCQUFnQixDQUFDLGtCQUFrQixDQUFDLEVBQ3RELFNBQVMsRUFBRSxTQUFTLEVBQ3BCLFlBQVksRUFBRSxxQkFBcUIsRUFDbkMsZUFBZSxDQUFDLDZCQUFpQixFQUNuQyxTQUFTLENBQUMsdUJBQVcsRUFDM0I7SUFFSjs7Ozs7Ozs7Ozs7T0FXRztJQUNILE9BQW9CLEdBQUcsQ0FDckIsTUFBTSxFQUFFLHFCQUFxQixFQUM3QixJQUFJLEVBQUU7UUFDSixlQUFlLEVBQUUsZUFBZSxHQUFHLFNBQVMsQ0FBQztRQUM3QyxTQUFTLEVBQUUsR0FBRyxDQUFDO1FBQ2Ysc0JBQXNCLEVBQUUsc0JBQXNCLENBQUM7UUFDL0MsYUFBYSxFQUFFLHNCQUFzQixHQUFHLFNBQVMsQ0FBQztRQUNsRCxZQUFZLEVBQUUscUJBQXFCLENBQUM7UUFDcEMsYUFBYSxFQUFFLGFBQWEsQ0FBQztRQUM3QixtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztRQUN6QyxTQUFTLEVBQUUsZUFBZSxDQUFDO1FBQzNCLGdCQUFnQixDQUFDLEVBQUUseUJBQXlCLENBQUM7UUFDN0MsY0FBYyxDQUFDLEVBQUUsdUJBQXVCLENBQUM7UUFDekMsWUFBWSxFQUFFLFlBQVksQ0FBQztRQUMzQixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7UUFDeEIsU0FBUyxFQUFFLGtCQUFrQixFQUFFLENBQUM7UUFDaEMsWUFBWSxFQUFFLGVBQWUsQ0FBQztLQUMvQiw0QkFrSEY7SUFFRDs7O09BR0c7SUFDSSxZQUFZLENBQUMsTUFBTSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMseUJBQXlCLENBQUMsUUFJL0U7SUFFRCw0QkFBNEI7SUFDZixLQUFLLGtCQUtqQjtJQUVEOztPQUVHO0lBQ1UsSUFBSSxrQkFLaEI7SUFFTSxZQUFZLElBQUksU0FBUyxDQUUvQjtJQUVELElBQUksa0JBQWtCLElBQUksVUFBVSxFQUFFLEdBQUcsU0FBUyxDQUVqRDtJQUVELElBQUksYUFBYSxJQUFJLE1BQU0sR0FBRyxTQUFTLENBRXRDO0NBQ0YifQ==
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,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAEL,gBAAgB,EAIjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EACV,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExE;;GAEG;AACH,qBAAa,eAAe;IAExB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC;IAChE,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,YAAY,EAAE,qBAAqB;IAC7C,SAAS,CAAC,eAAe,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAC;IALpB,YACY,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,qBAAqB,EACnC,eAAe,CAAC,6BAAiB,EACnC,SAAS,CAAC,uBAAW,EAC3B;IAEJ;;;;;;;;;;;OAWG;IACH,OAAoB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;QACJ,eAAe,EAAE,eAAe,GAAG,SAAS,CAAC;QAC7C,SAAS,EAAE,GAAG,CAAC;QACf,sBAAsB,EAAE,sBAAsB,CAAC;QAC/C,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;QAClD,YAAY,EAAE,qBAAqB,CAAC;QACpC,aAAa,EAAE,aAAa,CAAC;QAC7B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;QAC7C,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,YAAY,EAAE,eAAe,CAAC;KAC/B,4BAkHF;IAED;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC,QAI/E;IAED,4BAA4B;IACf,KAAK,kBAKjB;IAED;;OAEG;IACU,IAAI,kBAKhB;IAEM,YAAY,IAAI,SAAS,CAE/B;IAED,IAAI,kBAAkB,IAAI,UAAU,EAAE,GAAG,SAAS,CAEjD;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;CACF"}
1
+ {"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,15 @@
1
+ import { MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT } from '@aztec/constants';
1
2
  import { EpochCache } from '@aztec/epoch-cache';
2
- import { GovernanceProposerContract, PublisherManager, RollupContract, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
3
+ import { isAnvilTestChain } from '@aztec/ethereum/chain';
4
+ import { getPublicClient } from '@aztec/ethereum/client';
5
+ import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
6
+ import { PublisherManager } from '@aztec/ethereum/publisher-manager';
3
7
  import { EthAddress } from '@aztec/foundation/eth-address';
4
8
  import { createLogger } from '@aztec/foundation/log';
5
9
  import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
6
10
  import { L1Metrics } from '@aztec/telemetry-client';
7
11
  import { NodeKeystoreAdapter } from '@aztec/validator-client';
8
- import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
12
+ import { getPublisherConfigFromSequencerConfig } from '../config.js';
9
13
  import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
10
14
  import { Sequencer } from '../sequencer/index.js';
11
15
  /**
@@ -13,15 +17,17 @@ import { Sequencer } from '../sequencer/index.js';
13
17
  */ export class SequencerClient {
14
18
  publisherManager;
15
19
  sequencer;
16
- blockBuilder;
20
+ checkpointsBuilder;
17
21
  validatorClient;
18
22
  l1Metrics;
19
- constructor(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics){
23
+ delayer_;
24
+ constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics, delayer_){
20
25
  this.publisherManager = publisherManager;
21
26
  this.sequencer = sequencer;
22
- this.blockBuilder = blockBuilder;
27
+ this.checkpointsBuilder = checkpointsBuilder;
23
28
  this.validatorClient = validatorClient;
24
29
  this.l1Metrics = l1Metrics;
30
+ this.delayer_ = delayer_;
25
31
  }
26
32
  /**
27
33
  * Initializes a new instance.
@@ -35,31 +41,36 @@ import { Sequencer } from '../sequencer/index.js';
35
41
  * @param prover - An instance of a block prover
36
42
  * @returns A new running instance.
37
43
  */ static async new(config, deps) {
38
- const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, blockBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
44
+ const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, checkpointsBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
39
45
  const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
40
46
  const log = createLogger('sequencer');
41
47
  const publicClient = getPublicClient(config);
42
48
  const l1TxUtils = deps.l1TxUtils;
43
49
  const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
44
- const publisherManager = new PublisherManager(l1TxUtils, config);
50
+ const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
51
+ bindings: log.getBindings(),
52
+ funder: deps.funderL1TxUtils
53
+ });
45
54
  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
46
- const [l1GenesisTime, slotDuration] = await Promise.all([
55
+ const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
47
56
  rollupContract.getL1GenesisTime(),
48
- rollupContract.getSlotDuration()
57
+ rollupContract.getSlotDuration(),
58
+ rollupContract.getManaLimit().then(Number)
49
59
  ]);
50
60
  const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
51
61
  const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
52
62
  l1RpcUrls: rpcUrls,
53
63
  l1ChainId: chainId,
54
64
  viemPollingIntervalMS: config.viemPollingIntervalMS,
55
- ethereumSlotDuration: config.ethereumSlotDuration
65
+ ethereumSlotDuration: config.ethereumSlotDuration,
66
+ enableProposerPipelining: config.enableProposerPipelining
56
67
  }, {
57
68
  dateProvider: deps.dateProvider
58
69
  });
59
70
  const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
60
71
  const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
61
72
  telemetry: telemetryClient,
62
- blobSinkClient: deps.blobSinkClient,
73
+ blobClient: deps.blobClient,
63
74
  epochCache,
64
75
  governanceProposerContract,
65
76
  slashFactoryContract,
@@ -69,60 +80,65 @@ import { Sequencer } from '../sequencer/index.js';
69
80
  nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
70
81
  logger: log
71
82
  });
72
- const globalsBuilder = new GlobalVariableBuilder(config);
73
83
  const ethereumSlotDuration = config.ethereumSlotDuration;
74
- const rollupManaLimit = Number(await rollupContract.getManaLimit());
75
- let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
76
- if (sequencerManaLimit > rollupManaLimit) {
77
- log.warn(`Provided maxL2BlockGas of ${sequencerManaLimit} is greater than the maximum allowed by the L1 (${rollupManaLimit}), setting limit to ${rollupManaLimit}`);
78
- sequencerManaLimit = rollupManaLimit;
79
- }
84
+ const globalsBuilder = deps.globalVariableBuilder;
80
85
  // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
81
- // Otherwise, assume we must have broadcasted the tx before the slot started (we use a default
82
- // maxL1TxInclusionTimeIntoSlot of zero) to get the tx into that L1 slot.
86
+ // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
83
87
  // In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
84
- // make it with a propagation time into slot equal to 4s. However, we prefer being conservative.
88
+ // reduce the publishing time allowance. However, we prefer being conservative.
85
89
  // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
86
- const maxInclusionBasedOnChain = isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration - 1 : 0;
87
- const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? maxInclusionBasedOnChain;
90
+ const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
91
+ const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
92
+ const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = capPerBlockLimits(config, rollupManaLimit, log);
88
93
  const l1Constants = {
89
94
  l1GenesisTime,
90
95
  slotDuration: Number(slotDuration),
91
- ethereumSlotDuration
96
+ ethereumSlotDuration,
97
+ rollupManaLimit
92
98
  };
93
- const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
99
+ const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
94
100
  ...config,
95
- maxL1TxInclusionTimeIntoSlot,
96
- maxL2BlockGas: sequencerManaLimit
101
+ l1PublishingTime,
102
+ maxL2BlockGas,
103
+ maxDABlockGas,
104
+ maxTxsPerBlock
97
105
  }, telemetryClient, log);
98
- await sequencer.init();
99
- return new SequencerClient(publisherManager, sequencer, blockBuilder, validatorClient, l1Metrics);
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);
100
110
  }
101
111
  /**
102
112
  * Updates sequencer and validator client config.
103
113
  * @param config - New parameters.
104
114
  */ updateConfig(config) {
105
115
  this.sequencer.updateConfig(config);
106
- this.blockBuilder.updateConfig(config);
116
+ this.checkpointsBuilder.updateConfig(config);
107
117
  this.validatorClient?.updateConfig(config);
108
118
  }
109
119
  /** Starts the sequencer. */ async start() {
110
120
  await this.validatorClient?.start();
111
121
  this.sequencer.start();
112
122
  this.l1Metrics?.start();
113
- await this.publisherManager.loadState();
123
+ await this.publisherManager.start();
114
124
  }
115
125
  /**
116
126
  * Stops the sequencer from processing new txs.
117
127
  */ async stop() {
118
128
  await this.sequencer.stop();
119
129
  await this.validatorClient?.stop();
120
- this.publisherManager.interrupt();
130
+ await this.publisherManager.stop();
121
131
  this.l1Metrics?.stop();
122
132
  }
123
133
  getSequencer() {
124
134
  return this.sequencer;
125
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
+ }
126
142
  get validatorAddresses() {
127
143
  return this.sequencer.getValidatorAddresses();
128
144
  }
@@ -130,3 +146,28 @@ import { Sequencer } from '../sequencer/index.js';
130
146
  return this.sequencer.maxL2BlockGas;
131
147
  }
132
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
@@ -1,21 +1,47 @@
1
- import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
1
+ import { type L1ContractsConfig } from '@aztec/ethereum/config';
2
+ import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
2
3
  import { type ConfigMappingsType } from '@aztec/foundation/config';
3
- import { type KeyStoreConfig } from '@aztec/node-keystore';
4
- import { type P2PConfig } from '@aztec/p2p';
5
- import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
6
- import { type ValidatorClientConfig } from '@aztec/validator-client';
7
- import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
4
+ import { type KeyStoreConfig } from '@aztec/node-keystore/config';
5
+ import { type P2PConfig } from '@aztec/p2p/config';
6
+ import { type ChainConfig, type PipelineConfig, type SequencerConfig } from '@aztec/stdlib/config';
7
+ import { type ValidatorClientConfig } from '@aztec/validator-client/config';
8
+ import { type SequencerPublisherConfig, type SequencerTxSenderConfig } from './publisher/config.js';
8
9
  export * from './publisher/config.js';
9
10
  export type { SequencerConfig };
10
- export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
11
+ /**
12
+ * Default values for SequencerConfig.
13
+ * Centralized location for all sequencer configuration defaults.
14
+ */
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
+ };
11
37
  /**
12
38
  * Configuration settings for the SequencerClient.
13
39
  */
14
- export type SequencerClientConfig = PublisherConfig & KeyStoreConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
40
+ export type SequencerClientConfig = SequencerPublisherConfig & KeyStoreConfig & ValidatorClientConfig & SequencerTxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & PipelineConfig & Pick<P2PConfig, 'txPublicSetupAllowListExtend'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
15
41
  export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
16
42
  export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
17
43
  /**
18
44
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
19
45
  */
20
46
  export declare function getConfigEnvVars(): SequencerClientConfig;
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGlCQUFpQixFQUN0QixLQUFLLGNBQWMsRUFHcEIsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sc0JBQXNCLENBQUM7QUFDbkYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLFlBQVksQ0FBQztBQUUvRCxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQUUsS0FBSyxlQUFlLEVBQXVCLE1BQU0sc0JBQXNCLENBQUM7QUFDbkcsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQWlDLE1BQU0seUJBQXlCLENBQUM7QUFFcEcsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUNwQixLQUFLLGNBQWMsRUFHcEIsTUFBTSx1QkFBdUIsQ0FBQztBQUUvQixjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLFlBQVksRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoQyxlQUFPLE1BQU0sb0NBQW9DLElBQUksQ0FBQztBQUV0RDs7R0FFRztBQUNILE1BQU0sTUFBTSxxQkFBcUIsR0FBRyxlQUFlLEdBQ2pELGNBQWMsR0FDZCxxQkFBcUIsR0FDckIsY0FBYyxHQUNkLGVBQWUsR0FDZixjQUFjLEdBQ2QsV0FBVyxHQUNYLElBQUksQ0FBQyxTQUFTLEVBQUUsd0JBQXdCLENBQUMsR0FDekMsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixHQUFHLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDLENBQUM7QUFFL0YsZUFBTyxNQUFNLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLGVBQWUsQ0F5SHZFLENBQUM7QUFFRixlQUFPLE1BQU0sNkJBQTZCLEVBQUUsa0JBQWtCLENBQUMscUJBQXFCLENBU25GLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxxQkFBcUIsQ0FFeEQifQ==
47
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxjQUFjLEVBQ25CLEtBQUssZUFBZSxFQUlyQixNQUFNLHNCQUFzQixDQUFDO0FBRzlCLE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFpQyxNQUFNLGdDQUFnQyxDQUFDO0FBRTNHLE9BQU8sRUFDTCxLQUFLLHdCQUF3QixFQUM3QixLQUFLLHVCQUF1QixFQUc3QixNQUFNLHVCQUF1QixDQUFDO0FBRS9CLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsWUFBWSxFQUFFLGVBQWUsRUFBRSxDQUFDO0FBRWhDOzs7R0FHRztBQUNILGVBQU8sTUFBTSxzQkFBc0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXFCQSxDQUFDO0FBRXBDOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixHQUFHLHdCQUF3QixHQUMxRCxjQUFjLEdBQ2QscUJBQXFCLEdBQ3JCLHVCQUF1QixHQUN2QixlQUFlLEdBQ2YsY0FBYyxHQUNkLFdBQVcsR0FDWCxjQUFjLEdBQ2QsSUFBSSxDQUFDLFNBQVMsRUFBRSw4QkFBOEIsQ0FBQyxHQUMvQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQWdLdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FVbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,sBAAsB,CAAC;AACnF,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,yBAAyB,CAAC;AAEpG,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,cAAc,EAGpB,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,eAAO,MAAM,oCAAoC,IAAI,CAAC;AAEtD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,cAAc,GACd,qBAAqB,GACrB,cAAc,GACd,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,GACzC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAyHvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
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
@@ -1,44 +1,83 @@
1
- import { l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
1
+ import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
2
+ import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
2
3
  import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
3
4
  import { EthAddress } from '@aztec/foundation/eth-address';
4
- import { keyStoreConfigMappings } from '@aztec/node-keystore';
5
- import { p2pConfigMappings } from '@aztec/p2p';
5
+ import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
6
+ import { p2pConfigMappings } from '@aztec/p2p/config';
6
7
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
7
- import { chainConfigMappings } from '@aztec/stdlib/config';
8
- import { validatorClientConfigMappings } from '@aztec/validator-client';
9
- import { getPublisherConfigMappings, getTxSenderConfigMappings } from './publisher/config.js';
8
+ import { chainConfigMappings, pipelineConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
9
+ import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
10
+ import { validatorClientConfigMappings } from '@aztec/validator-client/config';
11
+ import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
10
12
  export * from './publisher/config.js';
11
- export const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
13
+ /**
14
+ * Default values for SequencerConfig.
15
+ * Centralized location for all sequencer configuration defaults.
16
+ */ export const DefaultSequencerConfig = {
17
+ sequencerPollingIntervalMS: 500,
18
+ minTxsPerBlock: 1,
19
+ buildCheckpointIfEmpty: false,
20
+ publishTxsWithProposals: false,
21
+ perBlockAllocationMultiplier: 1.2,
22
+ redistributeCheckpointBudget: true,
23
+ enforceTimeTable: true,
24
+ attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
25
+ secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
26
+ secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
27
+ skipCollectingAttestations: false,
28
+ skipInvalidateBlockAsProposer: false,
29
+ broadcastInvalidBlockProposal: false,
30
+ injectFakeAttestation: false,
31
+ injectHighSValueAttestation: false,
32
+ injectUnrecoverableSignatureAttestation: false,
33
+ fishermanMode: false,
34
+ shuffleAttestationOrdering: false,
35
+ skipPushProposedBlocksToArchiver: false,
36
+ skipPublishingCheckpointsPercent: 0
37
+ };
12
38
  export const sequencerConfigMappings = {
13
- transactionPollingIntervalMS: {
14
- env: 'SEQ_TX_POLLING_INTERVAL_MS',
15
- description: 'The number of ms to wait between polling for pending txs.',
16
- ...numberConfigHelper(500)
17
- },
18
- maxTxsPerBlock: {
19
- env: 'SEQ_MAX_TX_PER_BLOCK',
20
- description: 'The maximum number of txs to include in a block.',
21
- ...numberConfigHelper(32)
39
+ sequencerPollingIntervalMS: {
40
+ env: 'SEQ_POLLING_INTERVAL_MS',
41
+ description: 'The number of ms to wait between polling for checking to build on the next slot.',
42
+ ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
43
+ },
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
22
48
  },
23
49
  minTxsPerBlock: {
24
50
  env: 'SEQ_MIN_TX_PER_BLOCK',
25
51
  description: 'The minimum number of txs to include in a block.',
26
- ...numberConfigHelper(1)
52
+ ...numberConfigHelper(DefaultSequencerConfig.minTxsPerBlock)
53
+ },
54
+ minValidTxsPerBlock: {
55
+ description: 'The minimum number of valid txs (after execution) to include in a block. If not set, falls back to minTxsPerBlock.'
27
56
  },
28
57
  publishTxsWithProposals: {
29
58
  env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
30
59
  description: 'Whether to publish txs with proposals.',
31
- ...booleanConfigHelper(false)
60
+ ...booleanConfigHelper(DefaultSequencerConfig.publishTxsWithProposals)
32
61
  },
33
62
  maxL2BlockGas: {
34
63
  env: 'SEQ_MAX_L2_BLOCK_GAS',
35
64
  description: 'The maximum L2 block gas.',
36
- ...numberConfigHelper(10e9)
65
+ parseEnv: (val)=>val ? parseInt(val, 10) : undefined
37
66
  },
38
67
  maxDABlockGas: {
39
68
  env: 'SEQ_MAX_DA_BLOCK_GAS',
40
69
  description: 'The maximum DA block gas.',
41
- ...numberConfigHelper(10e9)
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)
42
81
  },
43
82
  coinbase: {
44
83
  env: 'COINBASE',
@@ -58,73 +97,95 @@ export const sequencerConfigMappings = {
58
97
  env: 'ACVM_BINARY_PATH',
59
98
  description: 'The path to the ACVM binary'
60
99
  },
61
- maxBlockSizeInBytes: {
62
- env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
63
- description: 'Max block size',
64
- ...numberConfigHelper(1024 * 1024)
65
- },
66
100
  enforceTimeTable: {
67
101
  env: 'SEQ_ENFORCE_TIME_TABLE',
68
102
  description: 'Whether to enforce the time table when building blocks',
69
- ...booleanConfigHelper(),
70
- defaultValue: true
103
+ ...booleanConfigHelper(DefaultSequencerConfig.enforceTimeTable)
71
104
  },
72
105
  governanceProposerPayload: {
73
106
  env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
74
107
  description: 'The address of the payload for the governanceProposer',
75
- parseEnv: (val)=>EthAddress.fromString(val),
76
- defaultValue: EthAddress.ZERO
108
+ parseEnv: (val)=>EthAddress.fromString(val)
77
109
  },
78
- maxL1TxInclusionTimeIntoSlot: {
79
- env: 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT',
80
- description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
110
+ l1PublishingTime: {
111
+ env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
112
+ description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
81
113
  parseEnv: (val)=>val ? parseInt(val, 10) : undefined
82
114
  },
83
115
  attestationPropagationTime: {
84
116
  env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
85
117
  description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
86
- ...numberConfigHelper(DEFAULT_ATTESTATION_PROPAGATION_TIME)
118
+ ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
87
119
  },
88
120
  fakeProcessingDelayPerTxMs: {
89
121
  description: 'Used for testing to introduce a fake delay after processing each tx'
90
122
  },
123
+ fakeThrowAfterProcessingTxCount: {
124
+ description: 'Used for testing to throw an error after processing N txs'
125
+ },
91
126
  secondsBeforeInvalidatingBlockAsCommitteeMember: {
92
127
  env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER',
93
128
  description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, so the committee acts as a fallback.',
94
- ...numberConfigHelper(144)
129
+ ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsCommitteeMember)
95
130
  },
96
131
  secondsBeforeInvalidatingBlockAsNonCommitteeMember: {
97
132
  env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER',
98
133
  description: 'How many seconds to wait before trying to invalidate a block from the pending chain as a non-committee member (zero to never invalidate).' + ' The next proposer is expected to invalidate, then the committee, so other sequencers act as a fallback.',
99
- ...numberConfigHelper(432)
134
+ ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsNonCommitteeMember)
100
135
  },
101
136
  skipCollectingAttestations: {
102
137
  description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
103
- ...booleanConfigHelper(false)
138
+ ...booleanConfigHelper(DefaultSequencerConfig.skipCollectingAttestations)
104
139
  },
105
140
  skipInvalidateBlockAsProposer: {
106
141
  description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
107
- ...booleanConfigHelper(false)
142
+ ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
108
143
  },
109
144
  broadcastInvalidBlockProposal: {
110
145
  description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
111
- ...booleanConfigHelper(false)
146
+ ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
112
147
  },
113
148
  injectFakeAttestation: {
114
149
  description: 'Inject a fake attestation (for testing only)',
115
- ...booleanConfigHelper(false)
150
+ ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
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)
116
159
  },
117
160
  fishermanMode: {
118
161
  env: 'FISHERMAN_MODE',
119
162
  description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
120
- ...booleanConfigHelper(false)
163
+ ...booleanConfigHelper(DefaultSequencerConfig.fishermanMode)
121
164
  },
122
165
  shuffleAttestationOrdering: {
123
166
  description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
124
- ...booleanConfigHelper(false)
167
+ ...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering)
168
+ },
169
+ ...sharedSequencerConfigMappings,
170
+ buildCheckpointIfEmpty: {
171
+ env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
172
+ description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
173
+ ...booleanConfigHelper(DefaultSequencerConfig.buildCheckpointIfEmpty)
174
+ },
175
+ skipPushProposedBlocksToArchiver: {
176
+ description: 'Skip pushing proposed blocks to archiver (default: true)',
177
+ ...booleanConfigHelper(DefaultSequencerConfig.skipPushProposedBlocksToArchiver)
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)
125
186
  },
126
187
  ...pickConfigMappings(p2pConfigMappings, [
127
- 'txPublicSetupAllowList'
188
+ 'txPublicSetupAllowListExtend'
128
189
  ])
129
190
  };
130
191
  export const sequencerClientConfigMappings = {
@@ -132,9 +193,10 @@ export const sequencerClientConfigMappings = {
132
193
  ...sequencerConfigMappings,
133
194
  ...keyStoreConfigMappings,
134
195
  ...l1ReaderConfigMappings,
135
- ...getTxSenderConfigMappings('SEQ'),
136
- ...getPublisherConfigMappings('SEQ'),
196
+ ...sequencerTxSenderConfigMappings,
197
+ ...sequencerPublisherConfigMappings,
137
198
  ...chainConfigMappings,
199
+ ...pipelineConfigMappings,
138
200
  ...pickConfigMappings(l1ContractsConfigMappings, [
139
201
  'ethereumSlotDuration',
140
202
  'aztecSlotDuration',