@aztec/sequencer-client 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

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 (108) hide show
  1. package/dest/client/index.d.ts +1 -1
  2. package/dest/client/sequencer-client.d.ts +10 -8
  3. package/dest/client/sequencer-client.d.ts.map +1 -1
  4. package/dest/client/sequencer-client.js +40 -28
  5. package/dest/config.d.ts +13 -5
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +82 -25
  8. package/dest/global_variable_builder/global_builder.d.ts +22 -16
  9. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  10. package/dest/global_variable_builder/global_builder.js +52 -39
  11. package/dest/global_variable_builder/index.d.ts +1 -1
  12. package/dest/index.d.ts +2 -2
  13. package/dest/index.d.ts.map +1 -1
  14. package/dest/index.js +1 -1
  15. package/dest/publisher/config.d.ts +11 -8
  16. package/dest/publisher/config.d.ts.map +1 -1
  17. package/dest/publisher/config.js +21 -13
  18. package/dest/publisher/index.d.ts +2 -2
  19. package/dest/publisher/index.d.ts.map +1 -1
  20. package/dest/publisher/index.js +1 -1
  21. package/dest/publisher/sequencer-publisher-factory.d.ts +11 -5
  22. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  23. package/dest/publisher/sequencer-publisher-factory.js +9 -2
  24. package/dest/publisher/sequencer-publisher-metrics.d.ts +4 -4
  25. package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
  26. package/dest/publisher/sequencer-publisher-metrics.js +1 -1
  27. package/dest/publisher/sequencer-publisher.d.ts +78 -70
  28. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  29. package/dest/publisher/sequencer-publisher.js +687 -182
  30. package/dest/sequencer/block_builder.d.ts +6 -10
  31. package/dest/sequencer/block_builder.d.ts.map +1 -1
  32. package/dest/sequencer/block_builder.js +21 -10
  33. package/dest/sequencer/checkpoint_builder.d.ts +63 -0
  34. package/dest/sequencer/checkpoint_builder.d.ts.map +1 -0
  35. package/dest/sequencer/checkpoint_builder.js +131 -0
  36. package/dest/sequencer/checkpoint_proposal_job.d.ts +76 -0
  37. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -0
  38. package/dest/sequencer/checkpoint_proposal_job.js +1070 -0
  39. package/dest/sequencer/checkpoint_voter.d.ts +34 -0
  40. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -0
  41. package/dest/sequencer/checkpoint_voter.js +85 -0
  42. package/dest/sequencer/config.d.ts +3 -2
  43. package/dest/sequencer/config.d.ts.map +1 -1
  44. package/dest/sequencer/errors.d.ts +11 -0
  45. package/dest/sequencer/errors.d.ts.map +1 -0
  46. package/dest/sequencer/errors.js +15 -0
  47. package/dest/sequencer/events.d.ts +46 -0
  48. package/dest/sequencer/events.d.ts.map +1 -0
  49. package/dest/sequencer/events.js +1 -0
  50. package/dest/sequencer/index.d.ts +5 -1
  51. package/dest/sequencer/index.d.ts.map +1 -1
  52. package/dest/sequencer/index.js +4 -0
  53. package/dest/sequencer/metrics.d.ts +37 -20
  54. package/dest/sequencer/metrics.d.ts.map +1 -1
  55. package/dest/sequencer/metrics.js +211 -85
  56. package/dest/sequencer/sequencer.d.ts +110 -121
  57. package/dest/sequencer/sequencer.d.ts.map +1 -1
  58. package/dest/sequencer/sequencer.js +809 -524
  59. package/dest/sequencer/timetable.d.ts +57 -21
  60. package/dest/sequencer/timetable.d.ts.map +1 -1
  61. package/dest/sequencer/timetable.js +150 -68
  62. package/dest/sequencer/types.d.ts +3 -0
  63. package/dest/sequencer/types.d.ts.map +1 -0
  64. package/dest/sequencer/types.js +1 -0
  65. package/dest/sequencer/utils.d.ts +20 -28
  66. package/dest/sequencer/utils.d.ts.map +1 -1
  67. package/dest/sequencer/utils.js +12 -24
  68. package/dest/test/index.d.ts +4 -2
  69. package/dest/test/index.d.ts.map +1 -1
  70. package/dest/test/mock_checkpoint_builder.d.ts +83 -0
  71. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -0
  72. package/dest/test/mock_checkpoint_builder.js +179 -0
  73. package/dest/test/utils.d.ts +49 -0
  74. package/dest/test/utils.d.ts.map +1 -0
  75. package/dest/test/utils.js +94 -0
  76. package/dest/tx_validator/nullifier_cache.d.ts +1 -1
  77. package/dest/tx_validator/nullifier_cache.d.ts.map +1 -1
  78. package/dest/tx_validator/tx_validator_factory.d.ts +4 -3
  79. package/dest/tx_validator/tx_validator_factory.d.ts.map +1 -1
  80. package/dest/tx_validator/tx_validator_factory.js +12 -9
  81. package/package.json +32 -31
  82. package/src/client/sequencer-client.ts +34 -40
  83. package/src/config.ts +89 -29
  84. package/src/global_variable_builder/global_builder.ts +67 -59
  85. package/src/index.ts +2 -0
  86. package/src/publisher/config.ts +32 -19
  87. package/src/publisher/index.ts +1 -1
  88. package/src/publisher/sequencer-publisher-factory.ts +19 -6
  89. package/src/publisher/sequencer-publisher-metrics.ts +3 -3
  90. package/src/publisher/sequencer-publisher.ts +418 -242
  91. package/src/sequencer/README.md +531 -0
  92. package/src/sequencer/block_builder.ts +28 -30
  93. package/src/sequencer/checkpoint_builder.ts +217 -0
  94. package/src/sequencer/checkpoint_proposal_job.ts +722 -0
  95. package/src/sequencer/checkpoint_voter.ts +105 -0
  96. package/src/sequencer/config.ts +2 -1
  97. package/src/sequencer/errors.ts +21 -0
  98. package/src/sequencer/events.ts +27 -0
  99. package/src/sequencer/index.ts +4 -0
  100. package/src/sequencer/metrics.ts +269 -94
  101. package/src/sequencer/sequencer.ts +508 -675
  102. package/src/sequencer/timetable.ts +181 -91
  103. package/src/sequencer/types.ts +6 -0
  104. package/src/sequencer/utils.ts +24 -29
  105. package/src/test/index.ts +3 -1
  106. package/src/test/mock_checkpoint_builder.ts +247 -0
  107. package/src/test/utils.ts +137 -0
  108. package/src/tx_validator/tx_validator_factory.ts +13 -7
@@ -1,2 +1,2 @@
1
1
  export * from './sequencer-client.js';
2
- //# sourceMappingURL=index.d.ts.map
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx1QkFBdUIsQ0FBQyJ9
@@ -1,19 +1,20 @@
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
3
  import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
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
10
  import type { L2BlockSource } from '@aztec/stdlib/block';
11
- import type { IFullNodeBlockBuilder, ValidatorClientFullConfig, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
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
14
  import { type ValidatorClient } from '@aztec/validator-client';
15
15
  import type { SequencerClientConfig } from '../config.js';
16
16
  import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
17
+ import { FullNodeCheckpointsBuilder } from '../sequencer/checkpoint_builder.js';
17
18
  import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
18
19
  /**
19
20
  * Encapsulates the full sequencer and publisher.
@@ -21,9 +22,10 @@ import { Sequencer, type SequencerConfig } from '../sequencer/index.js';
21
22
  export declare class SequencerClient {
22
23
  protected publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
23
24
  protected sequencer: Sequencer;
25
+ protected checkpointsBuilder: FullNodeCheckpointsBuilder;
24
26
  protected validatorClient?: ValidatorClient | undefined;
25
27
  private l1Metrics?;
26
- constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
28
+ constructor(publisherManager: PublisherManager<L1TxUtilsWithBlobs>, sequencer: Sequencer, checkpointsBuilder: FullNodeCheckpointsBuilder, validatorClient?: ValidatorClient | undefined, l1Metrics?: L1Metrics | undefined);
27
29
  /**
28
30
  * Initializes a new instance.
29
31
  * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
@@ -37,16 +39,16 @@ export declare class SequencerClient {
37
39
  * @returns A new running instance.
38
40
  */
39
41
  static new(config: SequencerClientConfig, deps: {
40
- validatorClient: ValidatorClient | undefined;
42
+ validatorClient: ValidatorClient;
41
43
  p2pClient: P2P;
42
44
  worldStateSynchronizer: WorldStateSynchronizer;
43
45
  slasherClient: SlasherClientInterface | undefined;
44
- blockBuilder: IFullNodeBlockBuilder;
46
+ checkpointsBuilder: FullNodeCheckpointsBuilder;
45
47
  l2BlockSource: L2BlockSource;
46
48
  l1ToL2MessageSource: L1ToL2MessageSource;
47
49
  telemetry: TelemetryClient;
48
50
  publisherFactory?: SequencerPublisherFactory;
49
- blobSinkClient?: BlobSinkClientInterface;
51
+ blobClient: BlobClientInterface;
50
52
  dateProvider: DateProvider;
51
53
  epochCache?: EpochCache;
52
54
  l1TxUtils: L1TxUtilsWithBlobs[];
@@ -67,4 +69,4 @@ export declare class SequencerClient {
67
69
  get validatorAddresses(): EthAddress[] | undefined;
68
70
  get maxL2BlockGas(): number | undefined;
69
71
  }
70
- //# sourceMappingURL=sequencer-client.d.ts.map
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9zZXF1ZW5jZXItY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSWhELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQzVFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDdEMsT0FBTyxLQUFLLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSx5QkFBeUIsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXpHLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbkUsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzFFLE9BQU8sRUFBdUIsS0FBSyxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVwRixPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUxRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSw2Q0FBNkMsQ0FBQztBQUN4RixPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUNoRixPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssZUFBZSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFeEU7O0dBRUc7QUFDSCxxQkFBYSxlQUFlO0lBRXhCLFNBQVMsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxrQkFBa0IsQ0FBQztJQUNoRSxTQUFTLENBQUMsU0FBUyxFQUFFLFNBQVM7SUFDOUIsU0FBUyxDQUFDLGtCQUFrQixFQUFFLDBCQUEwQjtJQUN4RCxTQUFTLENBQUMsZUFBZSxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxTQUFTLENBQUM7SUFMcEIsWUFDWSxnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxrQkFBa0IsQ0FBQyxFQUN0RCxTQUFTLEVBQUUsU0FBUyxFQUNwQixrQkFBa0IsRUFBRSwwQkFBMEIsRUFDOUMsZUFBZSxDQUFDLDZCQUFpQixFQUNuQyxTQUFTLENBQUMsdUJBQVcsRUFDM0I7SUFFSjs7Ozs7Ozs7Ozs7T0FXRztJQUNILE9BQW9CLEdBQUcsQ0FDckIsTUFBTSxFQUFFLHFCQUFxQixFQUM3QixJQUFJLEVBQUU7UUFDSixlQUFlLEVBQUUsZUFBZSxDQUFDO1FBQ2pDLFNBQVMsRUFBRSxHQUFHLENBQUM7UUFDZixzQkFBc0IsRUFBRSxzQkFBc0IsQ0FBQztRQUMvQyxhQUFhLEVBQUUsc0JBQXNCLEdBQUcsU0FBUyxDQUFDO1FBQ2xELGtCQUFrQixFQUFFLDBCQUEwQixDQUFDO1FBQy9DLGFBQWEsRUFBRSxhQUFhLENBQUM7UUFDN0IsbUJBQW1CLEVBQUUsbUJBQW1CLENBQUM7UUFDekMsU0FBUyxFQUFFLGVBQWUsQ0FBQztRQUMzQixnQkFBZ0IsQ0FBQyxFQUFFLHlCQUF5QixDQUFDO1FBQzdDLFVBQVUsRUFBRSxtQkFBbUIsQ0FBQztRQUNoQyxZQUFZLEVBQUUsWUFBWSxDQUFDO1FBQzNCLFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztRQUN4QixTQUFTLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQztRQUNoQyxZQUFZLEVBQUUsZUFBZSxDQUFDO0tBQy9CLDRCQThHRjtJQUVEOzs7T0FHRztJQUNJLFlBQVksQ0FBQyxNQUFNLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxRQUkvRTtJQUVELDRCQUE0QjtJQUNmLEtBQUssa0JBS2pCO0lBRUQ7O09BRUc7SUFDVSxJQUFJLGtCQUtoQjtJQUVNLFlBQVksSUFBSSxTQUFTLENBRS9CO0lBRUQsSUFBSSxrQkFBa0IsSUFBSSxVQUFVLEVBQUUsR0FBRyxTQUFTLENBRWpEO0lBRUQsSUFBSSxhQUFhLElBQUksTUFBTSxHQUFHLFNBQVMsQ0FFdEM7Q0FDRiJ9
@@ -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,eAAe,CAAC,EAAE,eAAe;IAC3C,OAAO,CAAC,SAAS,CAAC;gBAHR,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,eAAe,CAAC,EAAE,eAAe,YAAA,EACnC,SAAS,CAAC,EAAE,SAAS,YAAA;IAG/B;;;;;;;;;;;OAWG;WACiB,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;IAoHH;;;OAGG;IACI,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAKhF,4BAA4B;IACf,KAAK;IAMlB;;OAEG;IACU,IAAI;IAMV,YAAY,IAAI,SAAS;IAIhC,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":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,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,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzG,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,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,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,kBAAkB,EAAE,0BAA0B;IACxD,SAAS,CAAC,eAAe,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAC;IALpB,YACY,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,EACtD,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,0BAA0B,EAC9C,eAAe,CAAC,6BAAiB,EACnC,SAAS,CAAC,uBAAW,EAC3B;IAEJ;;;;;;;;;;;OAWG;IACH,OAAoB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE;QACJ,eAAe,EAAE,eAAe,CAAC;QACjC,SAAS,EAAE,GAAG,CAAC;QACf,sBAAsB,EAAE,sBAAsB,CAAC;QAC/C,aAAa,EAAE,sBAAsB,GAAG,SAAS,CAAC;QAClD,kBAAkB,EAAE,0BAA0B,CAAC;QAC/C,aAAa,EAAE,aAAa,CAAC;QAC7B,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;QAC7C,UAAU,EAAE,mBAAmB,CAAC;QAChC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,SAAS,EAAE,kBAAkB,EAAE,CAAC;QAChC,YAAY,EAAE,eAAe,CAAC;KAC/B,4BA8GF;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,5 +1,8 @@
1
1
  import { EpochCache } from '@aztec/epoch-cache';
2
- import { GovernanceProposerContract, PublisherManager, RollupContract, getPublicClient, isAnvilTestChain } from '@aztec/ethereum';
2
+ import { isAnvilTestChain } from '@aztec/ethereum/chain';
3
+ import { getPublicClient } from '@aztec/ethereum/client';
4
+ import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
5
+ import { PublisherManager } from '@aztec/ethereum/publisher-manager';
3
6
  import { EthAddress } from '@aztec/foundation/eth-address';
4
7
  import { createLogger } from '@aztec/foundation/log';
5
8
  import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
@@ -13,11 +16,13 @@ import { Sequencer } from '../sequencer/index.js';
13
16
  */ export class SequencerClient {
14
17
  publisherManager;
15
18
  sequencer;
19
+ checkpointsBuilder;
16
20
  validatorClient;
17
21
  l1Metrics;
18
- constructor(publisherManager, sequencer, validatorClient, l1Metrics){
22
+ constructor(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics){
19
23
  this.publisherManager = publisherManager;
20
24
  this.sequencer = sequencer;
25
+ this.checkpointsBuilder = checkpointsBuilder;
21
26
  this.validatorClient = validatorClient;
22
27
  this.l1Metrics = l1Metrics;
23
28
  }
@@ -33,85 +38,92 @@ import { Sequencer } from '../sequencer/index.js';
33
38
  * @param prover - An instance of a block prover
34
39
  * @returns A new running instance.
35
40
  */ static async new(config, deps) {
36
- const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, blockBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
41
+ const { validatorClient, p2pClient, worldStateSynchronizer, slasherClient, checkpointsBuilder, l2BlockSource, l1ToL2MessageSource, telemetry: telemetryClient } = deps;
37
42
  const { l1RpcUrls: rpcUrls, l1ChainId: chainId } = config;
38
- const log = createLogger('sequencer-client');
43
+ const log = createLogger('sequencer');
39
44
  const publicClient = getPublicClient(config);
40
45
  const l1TxUtils = deps.l1TxUtils;
41
46
  const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
42
- const publisherManager = new PublisherManager(l1TxUtils);
47
+ const publisherManager = new PublisherManager(l1TxUtils, config);
43
48
  const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
44
- const [l1GenesisTime, slotDuration] = await Promise.all([
49
+ const [l1GenesisTime, slotDuration, rollupVersion, rollupManaLimit] = await Promise.all([
45
50
  rollupContract.getL1GenesisTime(),
46
- rollupContract.getSlotDuration()
51
+ rollupContract.getSlotDuration(),
52
+ rollupContract.getVersion(),
53
+ rollupContract.getManaLimit().then(Number)
47
54
  ]);
48
55
  const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
49
56
  const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
50
57
  l1RpcUrls: rpcUrls,
51
58
  l1ChainId: chainId,
52
59
  viemPollingIntervalMS: config.viemPollingIntervalMS,
53
- aztecSlotDuration: config.aztecSlotDuration,
54
- ethereumSlotDuration: config.ethereumSlotDuration,
55
- aztecEpochDuration: config.aztecEpochDuration
60
+ ethereumSlotDuration: config.ethereumSlotDuration
56
61
  }, {
57
62
  dateProvider: deps.dateProvider
58
63
  });
59
64
  const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
60
65
  const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
61
66
  telemetry: telemetryClient,
62
- blobSinkClient: deps.blobSinkClient,
67
+ blobClient: deps.blobClient,
63
68
  epochCache,
64
69
  governanceProposerContract,
65
70
  slashFactoryContract,
66
71
  rollupContract,
67
72
  dateProvider: deps.dateProvider,
68
73
  publisherManager,
69
- nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore)
74
+ nodeKeyStore: NodeKeystoreAdapter.fromKeyStoreManager(deps.nodeKeyStore),
75
+ logger: log
70
76
  });
71
- const globalsBuilder = new GlobalVariableBuilder(config);
72
77
  const ethereumSlotDuration = config.ethereumSlotDuration;
73
- const rollupManaLimit = Number(await rollupContract.getManaLimit());
78
+ const l1Constants = {
79
+ l1GenesisTime,
80
+ slotDuration: Number(slotDuration),
81
+ ethereumSlotDuration
82
+ };
83
+ const globalsBuilder = new GlobalVariableBuilder({
84
+ ...config,
85
+ ...l1Constants,
86
+ rollupVersion
87
+ });
74
88
  let sequencerManaLimit = config.maxL2BlockGas ?? rollupManaLimit;
75
89
  if (sequencerManaLimit > rollupManaLimit) {
76
- log.warn(`Provided maxL2BlockGas of ${sequencerManaLimit} is greater than the maximum allowed by the L1 (${rollupManaLimit}), setting limit to ${rollupManaLimit}`);
90
+ log.warn(`Provided maxL2BlockGas ${sequencerManaLimit} is greater than the max allowed by L1. Setting limit to ${rollupManaLimit}.`);
77
91
  sequencerManaLimit = rollupManaLimit;
78
92
  }
79
93
  // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
80
- // Otherwise, assume we must have broadcasted the tx before the slot started (we use a default
81
- // maxL1TxInclusionTimeIntoSlot of zero) to get the tx into that L1 slot.
94
+ // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
82
95
  // In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
83
- // make it with a propagation time into slot equal to 4s. However, we prefer being conservative.
96
+ // reduce the publishing time allowance. However, we prefer being conservative.
84
97
  // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
85
- const maxL1TxInclusionTimeIntoSlot = config.maxL1TxInclusionTimeIntoSlot ?? isAnvilTestChain(config.l1ChainId) ? ethereumSlotDuration - 1 : 0;
86
- const l1Constants = {
87
- l1GenesisTime,
88
- slotDuration: Number(slotDuration),
89
- ethereumSlotDuration
90
- };
91
- const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
98
+ const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
99
+ const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
100
+ const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
92
101
  ...config,
93
- maxL1TxInclusionTimeIntoSlot,
102
+ l1PublishingTime,
94
103
  maxL2BlockGas: sequencerManaLimit
95
- }, telemetryClient);
104
+ }, telemetryClient, log);
96
105
  await sequencer.init();
97
- return new SequencerClient(publisherManager, sequencer, validatorClient, l1Metrics);
106
+ return new SequencerClient(publisherManager, sequencer, checkpointsBuilder, validatorClient, l1Metrics);
98
107
  }
99
108
  /**
100
109
  * Updates sequencer and validator client config.
101
110
  * @param config - New parameters.
102
111
  */ updateConfig(config) {
103
112
  this.sequencer.updateConfig(config);
113
+ this.checkpointsBuilder.updateConfig(config);
104
114
  this.validatorClient?.updateConfig(config);
105
115
  }
106
116
  /** Starts the sequencer. */ async start() {
107
117
  await this.validatorClient?.start();
108
118
  this.sequencer.start();
109
119
  this.l1Metrics?.start();
120
+ await this.publisherManager.loadState();
110
121
  }
111
122
  /**
112
123
  * Stops the sequencer from processing new txs.
113
124
  */ async stop() {
114
125
  await this.sequencer.stop();
126
+ await this.validatorClient?.stop();
115
127
  this.publisherManager.interrupt();
116
128
  this.l1Metrics?.stop();
117
129
  }
package/dest/config.d.ts CHANGED
@@ -1,20 +1,28 @@
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 P2PConfig } from '@aztec/p2p';
4
+ import { type KeyStoreConfig } from '@aztec/node-keystore/config';
5
+ import { type P2PConfig } from '@aztec/p2p/config';
4
6
  import { type ChainConfig, type SequencerConfig } from '@aztec/stdlib/config';
5
- import { type ValidatorClientConfig } from '@aztec/validator-client';
7
+ import type { ResolvedSequencerConfig } from '@aztec/stdlib/interfaces/server';
8
+ import { type ValidatorClientConfig } from '@aztec/validator-client/config';
6
9
  import { type PublisherConfig, type TxSenderConfig } from './publisher/config.js';
7
10
  export * from './publisher/config.js';
8
11
  export type { SequencerConfig };
9
12
  export declare const DEFAULT_ATTESTATION_PROPAGATION_TIME = 2;
13
+ /**
14
+ * Default values for SequencerConfig.
15
+ * Centralized location for all sequencer configuration defaults.
16
+ */
17
+ export declare const DefaultSequencerConfig: ResolvedSequencerConfig;
10
18
  /**
11
19
  * Configuration settings for the SequencerClient.
12
20
  */
13
- export type SequencerClientConfig = PublisherConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
21
+ export type SequencerClientConfig = PublisherConfig & KeyStoreConfig & ValidatorClientConfig & TxSenderConfig & SequencerConfig & L1ReaderConfig & ChainConfig & Pick<P2PConfig, 'txPublicSetupAllowList'> & Pick<L1ContractsConfig, 'ethereumSlotDuration' | 'aztecSlotDuration' | 'aztecEpochDuration'>;
14
22
  export declare const sequencerConfigMappings: ConfigMappingsType<SequencerConfig>;
15
23
  export declare const sequencerClientConfigMappings: ConfigMappingsType<SequencerClientConfig>;
16
24
  /**
17
25
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
18
26
  */
19
27
  export declare function getConfigEnvVars(): SequencerClientConfig;
20
- //# sourceMappingURL=config.d.ts.map
28
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxLQUFLLGVBQWUsRUFBdUIsTUFBTSxzQkFBc0IsQ0FBQztBQUNuRyxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxLQUFLLHFCQUFxQixFQUFpQyxNQUFNLGdDQUFnQyxDQUFDO0FBRTNHLE9BQU8sRUFDTCxLQUFLLGVBQWUsRUFDcEIsS0FBSyxjQUFjLEVBR3BCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxZQUFZLEVBQUUsZUFBZSxFQUFFLENBQUM7QUFFaEMsZUFBTyxNQUFNLG9DQUFvQyxJQUFJLENBQUM7QUFFdEQ7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQixFQUFFLHVCQW1CcEMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixHQUFHLGVBQWUsR0FDakQsY0FBYyxHQUNkLHFCQUFxQixHQUNyQixjQUFjLEdBQ2QsZUFBZSxHQUNmLGNBQWMsR0FDZCxXQUFXLEdBQ1gsSUFBSSxDQUFDLFNBQVMsRUFBRSx3QkFBd0IsQ0FBQyxHQUN6QyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQTBJdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FTbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9
@@ -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,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,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,CAuGvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CAQnF,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,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAuB,MAAM,sBAAsB,CAAC;AACnG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,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;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,uBAmBpC,CAAC;AAEF;;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,CA0IvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
package/dest/config.js CHANGED
@@ -1,43 +1,71 @@
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 { p2pConfigMappings } from '@aztec/p2p';
5
+ import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
6
+ import { p2pConfigMappings } from '@aztec/p2p/config';
5
7
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
6
8
  import { chainConfigMappings } from '@aztec/stdlib/config';
7
- import { validatorClientConfigMappings } from '@aztec/validator-client';
9
+ import { validatorClientConfigMappings } from '@aztec/validator-client/config';
8
10
  import { getPublisherConfigMappings, getTxSenderConfigMappings } from './publisher/config.js';
9
11
  export * from './publisher/config.js';
10
12
  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
+ maxTxsPerBlock: 32,
19
+ minTxsPerBlock: 1,
20
+ buildCheckpointIfEmpty: false,
21
+ publishTxsWithProposals: false,
22
+ maxL2BlockGas: 10e9,
23
+ maxDABlockGas: 10e9,
24
+ maxBlockSizeInBytes: 1024 * 1024,
25
+ enforceTimeTable: true,
26
+ attestationPropagationTime: DEFAULT_ATTESTATION_PROPAGATION_TIME,
27
+ secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
28
+ secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
29
+ skipCollectingAttestations: false,
30
+ skipInvalidateBlockAsProposer: false,
31
+ broadcastInvalidBlockProposal: false,
32
+ injectFakeAttestation: false,
33
+ fishermanMode: false,
34
+ shuffleAttestationOrdering: false
35
+ };
11
36
  export const sequencerConfigMappings = {
12
- transactionPollingIntervalMS: {
13
- env: 'SEQ_TX_POLLING_INTERVAL_MS',
14
- description: 'The number of ms to wait between polling for pending txs.',
15
- ...numberConfigHelper(500)
37
+ sequencerPollingIntervalMS: {
38
+ env: 'SEQ_POLLING_INTERVAL_MS',
39
+ description: 'The number of ms to wait between polling for checking to build on the next slot.',
40
+ ...numberConfigHelper(DefaultSequencerConfig.sequencerPollingIntervalMS)
16
41
  },
17
42
  maxTxsPerBlock: {
18
43
  env: 'SEQ_MAX_TX_PER_BLOCK',
19
44
  description: 'The maximum number of txs to include in a block.',
20
- ...numberConfigHelper(32)
45
+ ...numberConfigHelper(DefaultSequencerConfig.maxTxsPerBlock)
21
46
  },
22
47
  minTxsPerBlock: {
23
48
  env: 'SEQ_MIN_TX_PER_BLOCK',
24
49
  description: 'The minimum number of txs to include in a block.',
25
- ...numberConfigHelper(1)
50
+ ...numberConfigHelper(DefaultSequencerConfig.minTxsPerBlock)
51
+ },
52
+ minValidTxsPerBlock: {
53
+ description: 'The minimum number of valid txs (after execution) to include in a block. If not set, falls back to minTxsPerBlock.'
26
54
  },
27
55
  publishTxsWithProposals: {
28
56
  env: 'SEQ_PUBLISH_TXS_WITH_PROPOSALS',
29
57
  description: 'Whether to publish txs with proposals.',
30
- ...booleanConfigHelper(false)
58
+ ...booleanConfigHelper(DefaultSequencerConfig.publishTxsWithProposals)
31
59
  },
32
60
  maxL2BlockGas: {
33
61
  env: 'SEQ_MAX_L2_BLOCK_GAS',
34
62
  description: 'The maximum L2 block gas.',
35
- ...numberConfigHelper(10e9)
63
+ ...numberConfigHelper(DefaultSequencerConfig.maxL2BlockGas)
36
64
  },
37
65
  maxDABlockGas: {
38
66
  env: 'SEQ_MAX_DA_BLOCK_GAS',
39
67
  description: 'The maximum DA block gas.',
40
- ...numberConfigHelper(10e9)
68
+ ...numberConfigHelper(DefaultSequencerConfig.maxDABlockGas)
41
69
  },
42
70
  coinbase: {
43
71
  env: 'COINBASE',
@@ -60,50 +88,78 @@ export const sequencerConfigMappings = {
60
88
  maxBlockSizeInBytes: {
61
89
  env: 'SEQ_MAX_BLOCK_SIZE_IN_BYTES',
62
90
  description: 'Max block size',
63
- ...numberConfigHelper(1024 * 1024)
91
+ ...numberConfigHelper(DefaultSequencerConfig.maxBlockSizeInBytes)
64
92
  },
65
93
  enforceTimeTable: {
66
94
  env: 'SEQ_ENFORCE_TIME_TABLE',
67
95
  description: 'Whether to enforce the time table when building blocks',
68
- ...booleanConfigHelper(),
69
- defaultValue: true
96
+ ...booleanConfigHelper(DefaultSequencerConfig.enforceTimeTable)
70
97
  },
71
98
  governanceProposerPayload: {
72
99
  env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',
73
100
  description: 'The address of the payload for the governanceProposer',
74
- parseEnv: (val)=>EthAddress.fromString(val),
75
- defaultValue: EthAddress.ZERO
101
+ parseEnv: (val)=>EthAddress.fromString(val)
76
102
  },
77
- maxL1TxInclusionTimeIntoSlot: {
78
- env: 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT',
79
- description: 'How many seconds into an L1 slot we can still send a tx and get it mined.',
103
+ l1PublishingTime: {
104
+ env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
105
+ description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
80
106
  parseEnv: (val)=>val ? parseInt(val, 10) : undefined
81
107
  },
82
108
  attestationPropagationTime: {
83
109
  env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
84
110
  description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
85
- ...numberConfigHelper(DEFAULT_ATTESTATION_PROPAGATION_TIME)
111
+ ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
86
112
  },
87
113
  fakeProcessingDelayPerTxMs: {
88
114
  description: 'Used for testing to introduce a fake delay after processing each tx'
89
115
  },
116
+ fakeThrowAfterProcessingTxCount: {
117
+ description: 'Used for testing to throw an error after processing N txs'
118
+ },
90
119
  secondsBeforeInvalidatingBlockAsCommitteeMember: {
91
120
  env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER',
92
121
  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.',
93
- ...numberConfigHelper(144)
122
+ ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsCommitteeMember)
94
123
  },
95
124
  secondsBeforeInvalidatingBlockAsNonCommitteeMember: {
96
125
  env: 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER',
97
126
  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.',
98
- ...numberConfigHelper(432)
127
+ ...numberConfigHelper(DefaultSequencerConfig.secondsBeforeInvalidatingBlockAsNonCommitteeMember)
99
128
  },
100
129
  skipCollectingAttestations: {
101
130
  description: 'Whether to skip collecting attestations from validators and only use self-attestations (for testing only)',
102
- ...booleanConfigHelper(false)
131
+ ...booleanConfigHelper(DefaultSequencerConfig.skipCollectingAttestations)
103
132
  },
104
133
  skipInvalidateBlockAsProposer: {
105
134
  description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
106
- ...booleanConfigHelper(false)
135
+ ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
136
+ },
137
+ broadcastInvalidBlockProposal: {
138
+ description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
139
+ ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
140
+ },
141
+ injectFakeAttestation: {
142
+ description: 'Inject a fake attestation (for testing only)',
143
+ ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
144
+ },
145
+ fishermanMode: {
146
+ env: 'FISHERMAN_MODE',
147
+ description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
148
+ ...booleanConfigHelper(DefaultSequencerConfig.fishermanMode)
149
+ },
150
+ shuffleAttestationOrdering: {
151
+ description: 'Shuffle attestation ordering to create invalid ordering (for testing only)',
152
+ ...booleanConfigHelper(DefaultSequencerConfig.shuffleAttestationOrdering)
153
+ },
154
+ blockDurationMs: {
155
+ env: 'SEQ_BLOCK_DURATION_MS',
156
+ description: 'Duration per block in milliseconds when building multiple blocks per slot. ' + 'If undefined (default), builds a single block per slot using the full slot duration.',
157
+ parseEnv: (val)=>val ? parseInt(val, 10) : undefined
158
+ },
159
+ buildCheckpointIfEmpty: {
160
+ env: 'SEQ_BUILD_CHECKPOINT_IF_EMPTY',
161
+ description: 'Have sequencer build and publish an empty checkpoint if there are no txs',
162
+ ...booleanConfigHelper(DefaultSequencerConfig.buildCheckpointIfEmpty)
107
163
  },
108
164
  ...pickConfigMappings(p2pConfigMappings, [
109
165
  'txPublicSetupAllowList'
@@ -112,6 +168,7 @@ export const sequencerConfigMappings = {
112
168
  export const sequencerClientConfigMappings = {
113
169
  ...validatorClientConfigMappings,
114
170
  ...sequencerConfigMappings,
171
+ ...keyStoreConfigMappings,
115
172
  ...l1ReaderConfigMappings,
116
173
  ...getTxSenderConfigMappings('SEQ'),
117
174
  ...getPublisherConfigMappings('SEQ'),
@@ -1,37 +1,43 @@
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';
3
+ import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
2
4
  import type { EthAddress } from '@aztec/foundation/eth-address';
3
5
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
6
+ import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
4
7
  import { GasFees } from '@aztec/stdlib/gas';
5
- import type { GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
8
+ import type { CheckpointGlobalVariables, GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
6
9
  import { GlobalVariables } from '@aztec/stdlib/tx';
7
10
  /**
8
11
  * Simple global variables builder.
9
12
  */
10
13
  export declare class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
11
14
  private log;
12
- private currentBaseFees;
15
+ private currentMinFees;
13
16
  private currentL1BlockNumber;
14
17
  private readonly rollupContract;
15
18
  private readonly publicClient;
16
19
  private readonly ethereumSlotDuration;
17
- private chainId?;
18
- private version?;
19
- constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'>);
20
+ private readonly aztecSlotDuration;
21
+ private readonly l1GenesisTime;
22
+ private chainId;
23
+ private version;
24
+ constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'> & Pick<L1RollupConstants, 'slotDuration' | 'l1GenesisTime'> & {
25
+ rollupVersion: bigint;
26
+ });
27
+ private computeCurrentMinFees;
28
+ getCurrentMinFees(): Promise<GasFees>;
20
29
  /**
21
- * Computes the "current" base fees, e.g., the price that you currently should pay to get include in the next block
22
- * @returns Base fees for the next block
23
- */
24
- private computeCurrentBaseFees;
25
- getCurrentBaseFees(): Promise<GasFees>;
26
- getGlobalConstantVariables(): Promise<Pick<GlobalVariables, 'chainId' | 'version'>>;
27
- /**
28
- * Simple builder of global variables that use the minimum time possible.
30
+ * Simple builder of global variables.
29
31
  * @param blockNumber - The block number to build global variables for.
30
32
  * @param coinbase - The address to receive block reward.
31
33
  * @param feeRecipient - The address to receive fees.
32
34
  * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
33
35
  * @returns The global variables for the given block number.
34
36
  */
35
- buildGlobalVariables(blockNumber: number, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: bigint): Promise<GlobalVariables>;
37
+ buildGlobalVariables(blockNumber: BlockNumber, coinbase: EthAddress, feeRecipient: AztecAddress, maybeSlot?: SlotNumber): Promise<GlobalVariables>;
38
+ /** Builds global variables that are constant throughout a checkpoint. */
39
+ buildCheckpointGlobalVariables(coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber: SlotNumber): Promise<CheckpointGlobalVariables & {
40
+ timestamp: bigint;
41
+ }>;
36
42
  }
37
- //# sourceMappingURL=global_builder.d.ts.map
43
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQXVCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUNWLHlCQUF5QixFQUN6QixxQkFBcUIsSUFBSSw4QkFBOEIsRUFDeEQsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJbkQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsWUFBVyw4QkFBOEI7SUFDMUUsT0FBTyxDQUFDLEdBQUcsQ0FBcUQ7SUFDaEUsT0FBTyxDQUFDLGNBQWMsQ0FBd0Q7SUFDOUUsT0FBTyxDQUFDLG9CQUFvQixDQUFpQztJQUU3RCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBaUI7SUFDaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQW1CO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBUztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBUztJQUV2QyxPQUFPLENBQUMsT0FBTyxDQUFLO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFFcEIsWUFDRSxNQUFNLEVBQUUsY0FBYyxHQUNwQixJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUMsR0FBRztRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUE7S0FBRSxFQW9CeEY7WUFNYSxxQkFBcUI7SUFldEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVVqRDtJQUVEOzs7Ozs7O09BT0c7SUFDVSxvQkFBb0IsQ0FDL0IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsU0FBUyxDQUFDLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMsZUFBZSxDQUFDLENBUzFCO0lBRUQseUVBQXlFO0lBQzVELDhCQUE4QixDQUN6QyxRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixVQUFVLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMseUJBQXlCLEdBQUc7UUFBRSxTQUFTLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQyxDQWE1RDtDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EAAE,qBAAqB,IAAI,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,OAAO,CAAC,GAAG,CAAqD;IAChE,OAAO,CAAC,eAAe,CAAwD;IAC/E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAmB;IAChD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,OAAO,CAAC,OAAO,CAAC,CAAK;IACrB,OAAO,CAAC,OAAO,CAAC,CAAK;gBAET,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC;IAgBpF;;;OAGG;YACW,sBAAsB;IAavB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAYtC,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;IAUhG;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,CAAC;CA4B5B"}
1
+ {"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,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,6BAA6B,CAAC;AAChE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,IAAI,8BAA8B,EACxD,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAInD;;GAEG;AACH,qBAAa,qBAAsB,YAAW,8BAA8B;IAC1E,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,YAAY,CAAmB;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,YACE,MAAM,EAAE,cAAc,GACpB,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,cAAc,GAAG,eAAe,CAAC,GAAG;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAoBxF;YAMa,qBAAqB;IAetB,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,CAS1B;IAED,yEAAyE;IAC5D,8BAA8B,CACzC,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,yBAAyB,GAAG;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAa5D;CACF"}