@aztec/sequencer-client 3.0.3 → 3.9.9-nightly.20260312

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 (93) hide show
  1. package/dest/client/sequencer-client.d.ts +32 -15
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +116 -27
  4. package/dest/config.d.ts +29 -4
  5. package/dest/config.d.ts.map +1 -1
  6. package/dest/config.js +103 -40
  7. package/dest/global_variable_builder/global_builder.d.ts +17 -11
  8. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  9. package/dest/global_variable_builder/global_builder.js +48 -39
  10. package/dest/index.d.ts +2 -3
  11. package/dest/index.d.ts.map +1 -1
  12. package/dest/index.js +1 -2
  13. package/dest/publisher/config.d.ts +33 -19
  14. package/dest/publisher/config.d.ts.map +1 -1
  15. package/dest/publisher/config.js +102 -43
  16. package/dest/publisher/sequencer-publisher-factory.d.ts +13 -5
  17. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  18. package/dest/publisher/sequencer-publisher-factory.js +14 -3
  19. package/dest/publisher/sequencer-publisher-metrics.d.ts +3 -3
  20. package/dest/publisher/sequencer-publisher-metrics.d.ts.map +1 -1
  21. package/dest/publisher/sequencer-publisher-metrics.js +23 -86
  22. package/dest/publisher/sequencer-publisher.d.ts +58 -45
  23. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  24. package/dest/publisher/sequencer-publisher.js +628 -139
  25. package/dest/sequencer/checkpoint_proposal_job.d.ts +100 -0
  26. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -0
  27. package/dest/sequencer/checkpoint_proposal_job.js +1234 -0
  28. package/dest/sequencer/checkpoint_voter.d.ts +35 -0
  29. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -0
  30. package/dest/sequencer/checkpoint_voter.js +109 -0
  31. package/dest/sequencer/events.d.ts +46 -0
  32. package/dest/sequencer/events.d.ts.map +1 -0
  33. package/dest/sequencer/events.js +1 -0
  34. package/dest/sequencer/index.d.ts +4 -2
  35. package/dest/sequencer/index.d.ts.map +1 -1
  36. package/dest/sequencer/index.js +3 -1
  37. package/dest/sequencer/metrics.d.ts +37 -5
  38. package/dest/sequencer/metrics.d.ts.map +1 -1
  39. package/dest/sequencer/metrics.js +216 -72
  40. package/dest/sequencer/sequencer.d.ts +122 -131
  41. package/dest/sequencer/sequencer.d.ts.map +1 -1
  42. package/dest/sequencer/sequencer.js +705 -635
  43. package/dest/sequencer/timetable.d.ts +54 -16
  44. package/dest/sequencer/timetable.d.ts.map +1 -1
  45. package/dest/sequencer/timetable.js +147 -62
  46. package/dest/sequencer/types.d.ts +3 -0
  47. package/dest/sequencer/types.d.ts.map +1 -0
  48. package/dest/sequencer/types.js +1 -0
  49. package/dest/sequencer/utils.d.ts +14 -8
  50. package/dest/sequencer/utils.d.ts.map +1 -1
  51. package/dest/sequencer/utils.js +7 -4
  52. package/dest/test/index.d.ts +5 -6
  53. package/dest/test/index.d.ts.map +1 -1
  54. package/dest/test/mock_checkpoint_builder.d.ts +95 -0
  55. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -0
  56. package/dest/test/mock_checkpoint_builder.js +233 -0
  57. package/dest/test/utils.d.ts +53 -0
  58. package/dest/test/utils.d.ts.map +1 -0
  59. package/dest/test/utils.js +104 -0
  60. package/package.json +30 -28
  61. package/src/client/sequencer-client.ts +154 -45
  62. package/src/config.ts +119 -45
  63. package/src/global_variable_builder/global_builder.ts +57 -51
  64. package/src/index.ts +1 -7
  65. package/src/publisher/config.ts +115 -46
  66. package/src/publisher/sequencer-publisher-factory.ts +26 -9
  67. package/src/publisher/sequencer-publisher-metrics.ts +19 -71
  68. package/src/publisher/sequencer-publisher.ts +334 -176
  69. package/src/sequencer/README.md +531 -0
  70. package/src/sequencer/checkpoint_proposal_job.ts +950 -0
  71. package/src/sequencer/checkpoint_voter.ts +130 -0
  72. package/src/sequencer/events.ts +27 -0
  73. package/src/sequencer/index.ts +3 -1
  74. package/src/sequencer/metrics.ts +267 -81
  75. package/src/sequencer/sequencer.ts +444 -834
  76. package/src/sequencer/timetable.ts +178 -83
  77. package/src/sequencer/types.ts +6 -0
  78. package/src/sequencer/utils.ts +18 -9
  79. package/src/test/index.ts +4 -5
  80. package/src/test/mock_checkpoint_builder.ts +325 -0
  81. package/src/test/utils.ts +167 -0
  82. package/dest/sequencer/block_builder.d.ts +0 -28
  83. package/dest/sequencer/block_builder.d.ts.map +0 -1
  84. package/dest/sequencer/block_builder.js +0 -127
  85. package/dest/tx_validator/nullifier_cache.d.ts +0 -14
  86. package/dest/tx_validator/nullifier_cache.d.ts.map +0 -1
  87. package/dest/tx_validator/nullifier_cache.js +0 -24
  88. package/dest/tx_validator/tx_validator_factory.d.ts +0 -18
  89. package/dest/tx_validator/tx_validator_factory.d.ts.map +0 -1
  90. package/dest/tx_validator/tx_validator_factory.js +0 -53
  91. package/src/sequencer/block_builder.ts +0 -214
  92. package/src/tx_validator/nullifier_cache.ts +0 -30
  93. package/src/tx_validator/tx_validator_factory.ts +0 -133
@@ -3,33 +3,39 @@ import type { L1ReaderConfig } from '@aztec/ethereum/l1-reader';
3
3
  import { BlockNumber, SlotNumber } from '@aztec/foundation/branded-types';
4
4
  import type { EthAddress } from '@aztec/foundation/eth-address';
5
5
  import type { AztecAddress } from '@aztec/stdlib/aztec-address';
6
+ import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
6
7
  import { GasFees } from '@aztec/stdlib/gas';
7
- import type { GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
8
+ import type { CheckpointGlobalVariables, GlobalVariableBuilder as GlobalVariableBuilderInterface } from '@aztec/stdlib/tx';
8
9
  import { GlobalVariables } from '@aztec/stdlib/tx';
9
10
  /**
10
11
  * Simple global variables builder.
11
12
  */
12
13
  export declare class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
13
14
  private log;
14
- private currentBaseFees;
15
+ private currentMinFees;
15
16
  private currentL1BlockNumber;
16
17
  private readonly rollupContract;
17
18
  private readonly publicClient;
18
19
  private readonly ethereumSlotDuration;
19
- private chainId?;
20
- private version?;
21
- constructor(config: L1ReaderConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'>);
22
- private computeCurrentBaseFees;
23
- getCurrentBaseFees(): Promise<GasFees>;
24
- getGlobalConstantVariables(): Promise<Pick<GlobalVariables, 'chainId' | 'version'>>;
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>;
25
29
  /**
26
- * Simple builder of global variables that use the minimum time possible.
30
+ * Simple builder of global variables.
27
31
  * @param blockNumber - The block number to build global variables for.
28
32
  * @param coinbase - The address to receive block reward.
29
33
  * @param feeRecipient - The address to receive fees.
30
34
  * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
31
35
  * @returns The global variables for the given block number.
32
36
  */
33
- buildGlobalVariables(blockNumber: BlockNumber, coinbase: EthAddress, feeRecipient: AztecAddress, slotNumber?: SlotNumber): 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>;
34
40
  }
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixJQUFJLDhCQUE4QixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEcsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBSW5EOztHQUVHO0FBQ0gscUJBQWEscUJBQXNCLFlBQVcsOEJBQThCO0lBQzFFLE9BQU8sQ0FBQyxHQUFHLENBQXFEO0lBQ2hFLE9BQU8sQ0FBQyxlQUFlLENBQXdEO0lBQy9FLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBaUM7SUFFN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFtQjtJQUNoRCxPQUFPLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFTO0lBRTlDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBSztJQUNyQixPQUFPLENBQUMsT0FBTyxDQUFDLENBQUs7SUFFckIsWUFBWSxNQUFNLEVBQUUsY0FBYyxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxzQkFBc0IsQ0FBQyxFQWNuRjtZQU1hLHNCQUFzQjtJQWV2QixrQkFBa0IsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBVWxEO0lBRVksMEJBQTBCLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsU0FBUyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBUS9GO0lBRUQ7Ozs7Ozs7T0FPRztJQUNVLG9CQUFvQixDQUMvQixXQUFXLEVBQUUsV0FBVyxFQUN4QixRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixVQUFVLENBQUMsRUFBRSxVQUFVLEdBQ3RCLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0E0QjFCO0NBQ0YifQ==
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9nbG9iYWxfdmFyaWFibGVfYnVpbGRlci9nbG9iYWxfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWhFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWhFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFMUUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFaEUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxFQUFFLEtBQUssaUJBQWlCLEVBQXVCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUNWLHlCQUF5QixFQUN6QixxQkFBcUIsSUFBSSw4QkFBOEIsRUFDeEQsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJbkQ7O0dBRUc7QUFDSCxxQkFBYSxxQkFBc0IsWUFBVyw4QkFBOEI7SUFDMUUsT0FBTyxDQUFDLEdBQUcsQ0FBcUQ7SUFDaEUsT0FBTyxDQUFDLGNBQWMsQ0FBd0Q7SUFDOUUsT0FBTyxDQUFDLG9CQUFvQixDQUFpQztJQUU3RCxPQUFPLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBaUI7SUFDaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQW1CO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBUztJQUMzQyxPQUFPLENBQUMsUUFBUSxDQUFDLGFBQWEsQ0FBUztJQUV2QyxPQUFPLENBQUMsT0FBTyxDQUFLO0lBQ3BCLE9BQU8sQ0FBQyxPQUFPLENBQUs7SUFFcEIsWUFDRSxNQUFNLEVBQUUsY0FBYyxHQUNwQixJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUMsR0FBRztRQUFFLGFBQWEsRUFBRSxNQUFNLENBQUE7S0FBRSxFQW9CeEY7WUFNYSxxQkFBcUI7SUFldEIsaUJBQWlCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQVVqRDtJQUVEOzs7Ozs7O09BT0c7SUFDVSxvQkFBb0IsQ0FDL0IsV0FBVyxFQUFFLFdBQVcsRUFDeEIsUUFBUSxFQUFFLFVBQVUsRUFDcEIsWUFBWSxFQUFFLFlBQVksRUFDMUIsU0FBUyxDQUFDLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMsZUFBZSxDQUFDLENBUzFCO0lBRUQseUVBQXlFO0lBQzVELDhCQUE4QixDQUN6QyxRQUFRLEVBQUUsVUFBVSxFQUNwQixZQUFZLEVBQUUsWUFBWSxFQUMxQixVQUFVLEVBQUUsVUFBVSxHQUNyQixPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FhcEM7Q0FDRiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,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,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;IAErB,YAAY,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,EAcnF;YAMa,sBAAsB;IAevB,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUlD;IAEY,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC,CAQ/F;IAED;;;;;;;OAOG;IACU,oBAAoB,CAC/B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,UAAU,EACpB,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,eAAe,CAAC,CA4B1B;CACF"}
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,CAAC,CAapC;CACF"}
@@ -3,6 +3,7 @@ import { RollupContract } from '@aztec/ethereum/contracts';
3
3
  import { SlotNumber } from '@aztec/foundation/branded-types';
4
4
  import { Fr } from '@aztec/foundation/curves/bn254';
5
5
  import { createLogger } from '@aztec/foundation/log';
6
+ import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
6
7
  import { GasFees } from '@aztec/stdlib/gas';
7
8
  import { GlobalVariables } from '@aztec/stdlib/tx';
8
9
  import { createPublicClient, fallback, http } from 'viem';
@@ -10,79 +11,87 @@ import { createPublicClient, fallback, http } from 'viem';
10
11
  * Simple global variables builder.
11
12
  */ export class GlobalVariableBuilder {
12
13
  log = createLogger('sequencer:global_variable_builder');
13
- currentBaseFees = Promise.resolve(new GasFees(0, 0));
14
+ currentMinFees = Promise.resolve(new GasFees(0, 0));
14
15
  currentL1BlockNumber = undefined;
15
16
  rollupContract;
16
17
  publicClient;
17
18
  ethereumSlotDuration;
19
+ aztecSlotDuration;
20
+ l1GenesisTime;
18
21
  chainId;
19
22
  version;
20
23
  constructor(config){
21
24
  const { l1RpcUrls, l1ChainId: chainId, l1Contracts } = config;
22
25
  const chain = createEthereumChain(l1RpcUrls, chainId);
26
+ this.version = new Fr(config.rollupVersion);
27
+ this.chainId = new Fr(chainId);
23
28
  this.ethereumSlotDuration = config.ethereumSlotDuration;
29
+ this.aztecSlotDuration = config.slotDuration;
30
+ this.l1GenesisTime = config.l1GenesisTime;
24
31
  this.publicClient = createPublicClient({
25
32
  chain: chain.chainInfo,
26
- transport: fallback(chain.rpcUrls.map((url)=>http(url))),
33
+ transport: fallback(chain.rpcUrls.map((url)=>http(url, {
34
+ batch: false
35
+ }))),
27
36
  pollingInterval: config.viemPollingIntervalMS
28
37
  });
29
38
  this.rollupContract = new RollupContract(this.publicClient, l1Contracts.rollupAddress);
30
39
  }
31
40
  /**
32
- * Computes the "current" base fees, e.g., the price that you currently should pay to get include in the next block
33
- * @returns Base fees for the next block
34
- */ async computeCurrentBaseFees() {
41
+ * Computes the "current" min fees, e.g., the price that you currently should pay to get include in the next block
42
+ * @returns Min fees for the next block
43
+ */ async computeCurrentMinFees() {
35
44
  // Since this might be called in the middle of a slot where a block might have been published,
36
45
  // we need to fetch the last block written, and estimate the earliest timestamp for the next block.
37
46
  // The timestamp of that last block will act as a lower bound for the next block.
38
- const lastBlock = await this.rollupContract.getCheckpoint(await this.rollupContract.getCheckpointNumber());
39
- const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(lastBlock.slotNumber + 1n));
47
+ const lastCheckpoint = await this.rollupContract.getPendingCheckpoint();
48
+ const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(BigInt(lastCheckpoint.slotNumber) + 1n));
40
49
  const nextEthTimestamp = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
41
50
  const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
42
- return new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
51
+ return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
43
52
  }
44
- async getCurrentBaseFees() {
53
+ async getCurrentMinFees() {
45
54
  // Get the current block number
46
55
  const blockNumber = await this.publicClient.getBlockNumber();
47
- // If the L1 block number has changed then chain a new promise to get the current base fees
56
+ // If the L1 block number has changed then chain a new promise to get the current min fees
48
57
  if (this.currentL1BlockNumber === undefined || blockNumber > this.currentL1BlockNumber) {
49
58
  this.currentL1BlockNumber = blockNumber;
50
- this.currentBaseFees = this.currentBaseFees.then(()=>this.computeCurrentBaseFees());
59
+ this.currentMinFees = this.currentMinFees.then(()=>this.computeCurrentMinFees());
51
60
  }
52
- return this.currentBaseFees;
53
- }
54
- async getGlobalConstantVariables() {
55
- if (!this.chainId) {
56
- this.chainId = new Fr(this.publicClient.chain.id);
57
- }
58
- if (!this.version) {
59
- this.version = new Fr(await this.rollupContract.getVersion());
60
- }
61
- return {
62
- chainId: this.chainId,
63
- version: this.version
64
- };
61
+ return this.currentMinFees;
65
62
  }
66
63
  /**
67
- * Simple builder of global variables that use the minimum time possible.
64
+ * Simple builder of global variables.
68
65
  * @param blockNumber - The block number to build global variables for.
69
66
  * @param coinbase - The address to receive block reward.
70
67
  * @param feeRecipient - The address to receive fees.
71
68
  * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
72
69
  * @returns The global variables for the given block number.
73
- */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, slotNumber) {
74
- const { chainId, version } = await this.getGlobalConstantVariables();
75
- let slot;
76
- if (slotNumber === undefined) {
77
- const ts = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
78
- slot = await this.rollupContract.getSlotAt(ts);
79
- } else {
80
- slot = slotNumber;
81
- }
82
- const timestamp = await this.rollupContract.getTimestampForSlot(slot);
83
- // We can skip much of the logic in getCurrentBaseFees since it we already check that we are not within a slot elsewhere.
84
- const gasFees = new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
85
- const globalVariables = new GlobalVariables(chainId, version, blockNumber, slot, timestamp, coinbase, feeRecipient, gasFees);
86
- return globalVariables;
70
+ */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, maybeSlot) {
71
+ const slot = maybeSlot ?? await this.rollupContract.getSlotAt(BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration)));
72
+ const checkpointGlobalVariables = await this.buildCheckpointGlobalVariables(coinbase, feeRecipient, slot);
73
+ return GlobalVariables.from({
74
+ blockNumber,
75
+ ...checkpointGlobalVariables
76
+ });
77
+ }
78
+ /** Builds global variables that are constant throughout a checkpoint. */ async buildCheckpointGlobalVariables(coinbase, feeRecipient, slotNumber) {
79
+ const { chainId, version } = this;
80
+ const timestamp = getTimestampForSlot(slotNumber, {
81
+ slotDuration: this.aztecSlotDuration,
82
+ l1GenesisTime: this.l1GenesisTime
83
+ });
84
+ // We can skip much of the logic in getCurrentMinFees since it we already check that we are not within a slot elsewhere.
85
+ // TODO(palla/mbps): Can we use a cached value here?
86
+ const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
87
+ return {
88
+ chainId,
89
+ version,
90
+ slotNumber,
91
+ timestamp,
92
+ coinbase,
93
+ feeRecipient,
94
+ gasFees
95
+ };
87
96
  }
88
97
  }
package/dest/index.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  export * from './client/index.js';
2
2
  export * from './config.js';
3
3
  export * from './publisher/index.js';
4
- export { FullNodeBlockBuilder as BlockBuilder, Sequencer, SequencerState, type SequencerEvents, } from './sequencer/index.js';
5
- export * from './tx_validator/tx_validator_factory.js';
4
+ export { Sequencer, SequencerState, type SequencerEvents } from './sequencer/index.js';
6
5
  export * from './global_variable_builder/index.js';
7
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsT0FBTyxFQUNMLG9CQUFvQixJQUFJLFlBQVksRUFDcEMsU0FBUyxFQUNULGNBQWMsRUFDZCxLQUFLLGVBQWUsR0FDckIsTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixjQUFjLHdDQUF3QyxDQUFDO0FBSXZELGNBQWMsb0NBQW9DLENBQUMifQ==
6
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsYUFBYSxDQUFDO0FBQzVCLGNBQWMsc0JBQXNCLENBQUM7QUFDckMsT0FBTyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUl2RixjQUFjLG9DQUFvQyxDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EACL,oBAAoB,IAAI,YAAY,EACpC,SAAS,EACT,cAAc,EACd,KAAK,eAAe,GACrB,MAAM,sBAAsB,CAAC;AAC9B,cAAc,wCAAwC,CAAC;AAIvD,cAAc,oCAAoC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAIvF,cAAc,oCAAoC,CAAC"}
package/dest/index.js CHANGED
@@ -1,8 +1,7 @@
1
1
  export * from './client/index.js';
2
2
  export * from './config.js';
3
3
  export * from './publisher/index.js';
4
- export { FullNodeBlockBuilder as BlockBuilder, Sequencer, SequencerState } from './sequencer/index.js';
5
- export * from './tx_validator/tx_validator_factory.js';
4
+ export { Sequencer, SequencerState } from './sequencer/index.js';
6
5
  // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
7
6
  // ISSUE(#9832)
8
7
  export * from './global_variable_builder/index.js';
@@ -1,25 +1,27 @@
1
- import { type BlobSinkConfig } from '@aztec/blob-sink/client/config';
1
+ import { type BlobClientConfig } from '@aztec/blob-client/client/config';
2
2
  import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
3
3
  import { type L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils/config';
4
4
  import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
5
5
  import { EthAddress } from '@aztec/foundation/eth-address';
6
- /**
7
- * The configuration of the rollup transaction publisher.
8
- */
6
+ /** Configuration of the transaction publisher. */
9
7
  export type TxSenderConfig = L1ReaderConfig & {
10
- /**
11
- * The private key to be used by the publisher.
12
- */
8
+ /** The private key to be used by the publisher. */
13
9
  publisherPrivateKeys?: SecretValue<`0x${string}`>[];
14
- /**
15
- * Publisher addresses to be used with a remote signer
16
- */
10
+ /** Publisher addresses to be used with a remote signer */
17
11
  publisherAddresses?: EthAddress[];
18
12
  };
19
- /**
20
- * Configuration of the L1Publisher.
21
- */
22
- export type PublisherConfig = L1TxUtilsConfig & BlobSinkConfig & {
13
+ export type ProverTxSenderConfig = L1ReaderConfig & {
14
+ proverPublisherPrivateKeys?: SecretValue<`0x${string}`>[];
15
+ proverPublisherAddresses?: EthAddress[];
16
+ };
17
+ export type SequencerTxSenderConfig = L1ReaderConfig & {
18
+ sequencerPublisherPrivateKeys?: SecretValue<`0x${string}`>[];
19
+ sequencerPublisherAddresses?: EthAddress[];
20
+ };
21
+ export declare function getTxSenderConfigFromProverConfig(config: ProverTxSenderConfig): TxSenderConfig;
22
+ export declare function getTxSenderConfigFromSequencerConfig(config: SequencerTxSenderConfig): TxSenderConfig;
23
+ /** Configuration of the L1Publisher. */
24
+ export type PublisherConfig = L1TxUtilsConfig & BlobClientConfig & {
23
25
  /** True to use publishers in invalid states (timed out, cancelled, etc) if no other is available */
24
26
  publisherAllowInvalidStates?: boolean;
25
27
  /** Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1 */
@@ -27,8 +29,20 @@ export type PublisherConfig = L1TxUtilsConfig & BlobSinkConfig & {
27
29
  /** Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only) */
28
30
  publisherForwarderAddress?: EthAddress;
29
31
  };
30
- export declare const getTxSenderConfigMappings: (scope: 'PROVER' | 'SEQ') => ConfigMappingsType<Omit<TxSenderConfig, 'l1Contracts'>>;
31
- export declare function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSenderConfig, 'l1Contracts'>;
32
- export declare const getPublisherConfigMappings: (scope: 'PROVER' | 'SEQ') => ConfigMappingsType<PublisherConfig & L1TxUtilsConfig>;
33
- export declare function getPublisherConfigFromEnv(scope: 'PROVER' | 'SEQ'): PublisherConfig;
34
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQXlCLE1BQU0sZ0NBQWdDLENBQUM7QUFDNUYsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUEwQixNQUFNLDJCQUEyQixDQUFDO0FBQ3hGLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBMkIsTUFBTSxvQ0FBb0MsQ0FBQztBQUNuRyxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFDdkIsV0FBVyxFQUdaLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRyxjQUFjLEdBQUc7SUFDNUM7O09BRUc7SUFDSCxvQkFBb0IsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUVwRDs7T0FFRztJQUNILGtCQUFrQixDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUM7Q0FDbkMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGVBQWUsR0FBRyxlQUFlLEdBQzNDLGNBQWMsR0FBRztJQUNmLG9HQUFvRztJQUNwRywyQkFBMkIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN0Qyw0R0FBNEc7SUFDNUcsYUFBYSxDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3hCLHdHQUF3RztJQUN4Ryx5QkFBeUIsQ0FBQyxFQUFFLFVBQVUsQ0FBQztDQUN4QyxDQUFDO0FBRUosZUFBTyxNQUFNLHlCQUF5QixFQUFFLENBQ3RDLEtBQUssRUFBRSxRQUFRLEdBQUcsS0FBSyxLQUNwQixrQkFBa0IsQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLGFBQWEsQ0FBQyxDQWV6RCxDQUFDO0FBRUgsd0JBQWdCLHdCQUF3QixDQUFDLEtBQUssRUFBRSxRQUFRLEdBQUcsS0FBSyxHQUFHLElBQUksQ0FBQyxjQUFjLEVBQUUsYUFBYSxDQUFDLENBRXJHO0FBRUQsZUFBTyxNQUFNLDBCQUEwQixFQUFFLENBQ3ZDLEtBQUssRUFBRSxRQUFRLEdBQUcsS0FBSyxLQUNwQixrQkFBa0IsQ0FBQyxlQUFlLEdBQUcsZUFBZSxDQW1CdkQsQ0FBQztBQUVILHdCQUFnQix5QkFBeUIsQ0FBQyxLQUFLLEVBQUUsUUFBUSxHQUFHLEtBQUssR0FBRyxlQUFlLENBRWxGIn0=
32
+ export type ProverPublisherConfig = L1TxUtilsConfig & BlobClientConfig & {
33
+ fishermanMode?: boolean;
34
+ proverPublisherAllowInvalidStates?: boolean;
35
+ proverPublisherForwarderAddress?: EthAddress;
36
+ };
37
+ export type SequencerPublisherConfig = L1TxUtilsConfig & BlobClientConfig & {
38
+ fishermanMode?: boolean;
39
+ sequencerPublisherAllowInvalidStates?: boolean;
40
+ sequencerPublisherForwarderAddress?: EthAddress;
41
+ };
42
+ export declare function getPublisherConfigFromProverConfig(config: ProverPublisherConfig): PublisherConfig;
43
+ export declare function getPublisherConfigFromSequencerConfig(config: SequencerPublisherConfig): PublisherConfig;
44
+ export declare const proverTxSenderConfigMappings: ConfigMappingsType<Omit<ProverTxSenderConfig, 'l1Contracts'>>;
45
+ export declare const sequencerTxSenderConfigMappings: ConfigMappingsType<Omit<SequencerTxSenderConfig, 'l1Contracts'>>;
46
+ export declare const sequencerPublisherConfigMappings: ConfigMappingsType<SequencerPublisherConfig & L1TxUtilsConfig>;
47
+ export declare const proverPublisherConfigMappings: ConfigMappingsType<ProverPublisherConfig & L1TxUtilsConfig>;
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBMkIsTUFBTSxrQ0FBa0MsQ0FBQztBQUNsRyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sMkJBQTJCLENBQUM7QUFDeEYsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUEyQixNQUFNLG9DQUFvQyxDQUFDO0FBQ25HLE9BQU8sRUFBRSxLQUFLLGtCQUFrQixFQUFFLFdBQVcsRUFBdUIsTUFBTSwwQkFBMEIsQ0FBQztBQUNyRyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFM0Qsa0RBQWtEO0FBQ2xELE1BQU0sTUFBTSxjQUFjLEdBQUcsY0FBYyxHQUFHO0lBQzVDLG1EQUFtRDtJQUNuRCxvQkFBb0IsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUVwRCwwREFBMEQ7SUFDMUQsa0JBQWtCLENBQUMsRUFBRSxVQUFVLEVBQUUsQ0FBQztDQUNuQyxDQUFDO0FBRUYsTUFBTSxNQUFNLG9CQUFvQixHQUFHLGNBQWMsR0FBRztJQUNsRCwwQkFBMEIsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxLQUFLLE1BQU0sRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUMxRCx3QkFBd0IsQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUFDO0NBQ3pDLENBQUM7QUFFRixNQUFNLE1BQU0sdUJBQXVCLEdBQUcsY0FBYyxHQUFHO0lBQ3JELDZCQUE2QixDQUFDLEVBQUUsV0FBVyxDQUFDLEtBQUssTUFBTSxFQUFFLENBQUMsRUFBRSxDQUFDO0lBQzdELDJCQUEyQixDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUM7Q0FDNUMsQ0FBQztBQUVGLHdCQUFnQixpQ0FBaUMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLEdBQUcsY0FBYyxDQU05RjtBQUVELHdCQUFnQixvQ0FBb0MsQ0FBQyxNQUFNLEVBQUUsdUJBQXVCLEdBQUcsY0FBYyxDQU1wRztBQUVELHdDQUF3QztBQUN4QyxNQUFNLE1BQU0sZUFBZSxHQUFHLGVBQWUsR0FDM0MsZ0JBQWdCLEdBQUc7SUFDakIsb0dBQW9HO0lBQ3BHLDJCQUEyQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ3RDLDRHQUE0RztJQUM1RyxhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDeEIsd0dBQXdHO0lBQ3hHLHlCQUF5QixDQUFDLEVBQUUsVUFBVSxDQUFDO0NBQ3hDLENBQUM7QUFFSixNQUFNLE1BQU0scUJBQXFCLEdBQUcsZUFBZSxHQUNqRCxnQkFBZ0IsR0FBRztJQUNqQixhQUFhLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDeEIsaUNBQWlDLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDNUMsK0JBQStCLENBQUMsRUFBRSxVQUFVLENBQUM7Q0FDOUMsQ0FBQztBQUVKLE1BQU0sTUFBTSx3QkFBd0IsR0FBRyxlQUFlLEdBQ3BELGdCQUFnQixHQUFHO0lBQ2pCLGFBQWEsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN4QixvQ0FBb0MsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUMvQyxrQ0FBa0MsQ0FBQyxFQUFFLFVBQVUsQ0FBQztDQUNqRCxDQUFDO0FBRUosd0JBQWdCLGtDQUFrQyxDQUFDLE1BQU0sRUFBRSxxQkFBcUIsR0FBRyxlQUFlLENBTWpHO0FBRUQsd0JBQWdCLHFDQUFxQyxDQUFDLE1BQU0sRUFBRSx3QkFBd0IsR0FBRyxlQUFlLENBTXZHO0FBRUQsZUFBTyxNQUFNLDRCQUE0QixFQUFFLGtCQUFrQixDQUFDLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxhQUFhLENBQUMsQ0FldEcsQ0FBQztBQUVGLGVBQU8sTUFBTSwrQkFBK0IsRUFBRSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLEVBQUUsYUFBYSxDQUFDLENBZTVHLENBQUM7QUFFRixlQUFPLE1BQU0sZ0NBQWdDLEVBQUUsa0JBQWtCLENBQUMsd0JBQXdCLEdBQUcsZUFBZSxDQW1CM0csQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsR0FBRyxlQUFlLENBbUJyRyxDQUFDIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,gCAAgC,CAAC;AAC5F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,oCAAoC,CAAC;AACnG,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C;;OAEG;IACH,oBAAoB,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC;IAEpD;;OAEG;IACH,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAC3C,cAAc,GAAG;IACf,oGAAoG;IACpG,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,4GAA4G;IAC5G,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wGAAwG;IACxG,yBAAyB,CAAC,EAAE,UAAU,CAAC;CACxC,CAAC;AAEJ,eAAO,MAAM,yBAAyB,EAAE,CACtC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAezD,CAAC;AAEH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAErG;AAED,eAAO,MAAM,0BAA0B,EAAE,CACvC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,eAAe,GAAG,eAAe,CAmBvD,CAAC;AAEH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,eAAe,CAElF"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,oCAAoC,CAAC;AACnG,OAAO,EAAE,KAAK,kBAAkB,EAAE,WAAW,EAAuB,MAAM,0BAA0B,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC;IAEpD,0DAA0D;IAC1D,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG;IAClD,0BAA0B,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC;IAC1D,wBAAwB,CAAC,EAAE,UAAU,EAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG;IACrD,6BAA6B,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC;IAC7D,2BAA2B,CAAC,EAAE,UAAU,EAAE,CAAC;CAC5C,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,MAAM,EAAE,oBAAoB,GAAG,cAAc,CAM9F;AAED,wBAAgB,oCAAoC,CAAC,MAAM,EAAE,uBAAuB,GAAG,cAAc,CAMpG;AAED,wCAAwC;AACxC,MAAM,MAAM,eAAe,GAAG,eAAe,GAC3C,gBAAgB,GAAG;IACjB,oGAAoG;IACpG,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,4GAA4G;IAC5G,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,wGAAwG;IACxG,yBAAyB,CAAC,EAAE,UAAU,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,qBAAqB,GAAG,eAAe,GACjD,gBAAgB,GAAG;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,+BAA+B,CAAC,EAAE,UAAU,CAAC;CAC9C,CAAC;AAEJ,MAAM,MAAM,wBAAwB,GAAG,eAAe,GACpD,gBAAgB,GAAG;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,kCAAkC,CAAC,EAAE,UAAU,CAAC;CACjD,CAAC;AAEJ,wBAAgB,kCAAkC,CAAC,MAAM,EAAE,qBAAqB,GAAG,eAAe,CAMjG;AAED,wBAAgB,qCAAqC,CAAC,MAAM,EAAE,wBAAwB,GAAG,eAAe,CAMvG;AAED,eAAO,MAAM,4BAA4B,EAAE,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAetG,CAAC;AAEF,eAAO,MAAM,+BAA+B,EAAE,kBAAkB,CAAC,IAAI,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAe5G,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,kBAAkB,CAAC,wBAAwB,GAAG,eAAe,CAmB3G,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,GAAG,eAAe,CAmBrG,CAAC"}
@@ -1,48 +1,107 @@
1
- import { blobSinkConfigMapping } from '@aztec/blob-sink/client/config';
1
+ import { blobClientConfigMapping } from '@aztec/blob-client/client/config';
2
2
  import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
3
3
  import { l1TxUtilsConfigMappings } from '@aztec/ethereum/l1-tx-utils/config';
4
- import { SecretValue, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
4
+ import { SecretValue, booleanConfigHelper } from '@aztec/foundation/config';
5
5
  import { EthAddress } from '@aztec/foundation/eth-address';
6
- export const getTxSenderConfigMappings = (scope)=>({
7
- ...l1ReaderConfigMappings,
8
- publisherPrivateKeys: {
9
- env: scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEYS` : `SEQ_PUBLISHER_PRIVATE_KEYS`,
10
- description: 'The private keys to be used by the publisher.',
11
- parseEnv: (val)=>val.split(',').map((key)=>new SecretValue(`0x${key.replace('0x', '')}`)),
12
- defaultValue: [],
13
- fallback: [
14
- scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEY` : `SEQ_PUBLISHER_PRIVATE_KEY`
15
- ]
16
- },
17
- publisherAddresses: {
18
- env: scope === 'PROVER' ? `PROVER_PUBLISHER_ADDRESSES` : `SEQ_PUBLISHER_ADDRESSES`,
19
- description: 'The addresses of the publishers to use with remote signers',
20
- parseEnv: (val)=>val.split(',').map((address)=>EthAddress.fromString(address)),
21
- defaultValue: []
22
- }
23
- });
24
- export function getTxSenderConfigFromEnv(scope) {
25
- return getConfigFromMappings(getTxSenderConfigMappings(scope));
6
+ export function getTxSenderConfigFromProverConfig(config) {
7
+ return {
8
+ ...config,
9
+ publisherPrivateKeys: config.proverPublisherPrivateKeys,
10
+ publisherAddresses: config.proverPublisherAddresses
11
+ };
26
12
  }
27
- export const getPublisherConfigMappings = (scope)=>({
28
- publisherAllowInvalidStates: {
29
- description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
30
- env: scope === `PROVER` ? `PROVER_PUBLISHER_ALLOW_INVALID_STATES` : `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
31
- ...booleanConfigHelper(true)
32
- },
33
- fishermanMode: {
34
- env: 'FISHERMAN_MODE',
35
- description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
36
- ...booleanConfigHelper(false)
37
- },
38
- publisherForwarderAddress: {
39
- env: scope === `PROVER` ? `PROVER_PUBLISHER_FORWARDER_ADDRESS` : `SEQ_PUBLISHER_FORWARDER_ADDRESS`,
40
- description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
41
- parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined
42
- },
43
- ...l1TxUtilsConfigMappings,
44
- ...blobSinkConfigMapping
45
- });
46
- export function getPublisherConfigFromEnv(scope) {
47
- return getConfigFromMappings(getPublisherConfigMappings(scope));
13
+ export function getTxSenderConfigFromSequencerConfig(config) {
14
+ return {
15
+ ...config,
16
+ publisherPrivateKeys: config.sequencerPublisherPrivateKeys,
17
+ publisherAddresses: config.sequencerPublisherAddresses
18
+ };
48
19
  }
20
+ export function getPublisherConfigFromProverConfig(config) {
21
+ return {
22
+ ...config,
23
+ publisherAllowInvalidStates: config.proverPublisherAllowInvalidStates,
24
+ publisherForwarderAddress: config.proverPublisherForwarderAddress
25
+ };
26
+ }
27
+ export function getPublisherConfigFromSequencerConfig(config) {
28
+ return {
29
+ ...config,
30
+ publisherAllowInvalidStates: config.sequencerPublisherAllowInvalidStates,
31
+ publisherForwarderAddress: config.sequencerPublisherForwarderAddress
32
+ };
33
+ }
34
+ export const proverTxSenderConfigMappings = {
35
+ ...l1ReaderConfigMappings,
36
+ proverPublisherPrivateKeys: {
37
+ env: `PROVER_PUBLISHER_PRIVATE_KEYS`,
38
+ description: 'The private keys to be used by the prover publisher.',
39
+ parseEnv: (val)=>val.split(',').map((key)=>new SecretValue(`0x${key.replace('0x', '')}`)),
40
+ defaultValue: [],
41
+ fallback: [
42
+ `PROVER_PUBLISHER_PRIVATE_KEY`
43
+ ]
44
+ },
45
+ proverPublisherAddresses: {
46
+ env: `PROVER_PUBLISHER_ADDRESSES`,
47
+ description: 'The addresses of the publishers to use with remote signers',
48
+ parseEnv: (val)=>val.split(',').map((address)=>EthAddress.fromString(address)),
49
+ defaultValue: []
50
+ }
51
+ };
52
+ export const sequencerTxSenderConfigMappings = {
53
+ ...l1ReaderConfigMappings,
54
+ sequencerPublisherPrivateKeys: {
55
+ env: `SEQ_PUBLISHER_PRIVATE_KEYS`,
56
+ description: 'The private keys to be used by the sequencer publisher.',
57
+ parseEnv: (val)=>val.split(',').map((key)=>new SecretValue(`0x${key.replace('0x', '')}`)),
58
+ defaultValue: [],
59
+ fallback: [
60
+ `SEQ_PUBLISHER_PRIVATE_KEY`
61
+ ]
62
+ },
63
+ sequencerPublisherAddresses: {
64
+ env: `SEQ_PUBLISHER_ADDRESSES`,
65
+ description: 'The addresses of the publishers to use with remote signers',
66
+ parseEnv: (val)=>val.split(',').map((address)=>EthAddress.fromString(address)),
67
+ defaultValue: []
68
+ }
69
+ };
70
+ export const sequencerPublisherConfigMappings = {
71
+ ...l1TxUtilsConfigMappings,
72
+ ...blobClientConfigMapping,
73
+ sequencerPublisherAllowInvalidStates: {
74
+ env: `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
75
+ description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
76
+ ...booleanConfigHelper(true)
77
+ },
78
+ fishermanMode: {
79
+ env: 'FISHERMAN_MODE',
80
+ description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
81
+ ...booleanConfigHelper(false)
82
+ },
83
+ sequencerPublisherForwarderAddress: {
84
+ env: `SEQ_PUBLISHER_FORWARDER_ADDRESS`,
85
+ description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
86
+ parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined
87
+ }
88
+ };
89
+ export const proverPublisherConfigMappings = {
90
+ ...l1TxUtilsConfigMappings,
91
+ ...blobClientConfigMapping,
92
+ proverPublisherAllowInvalidStates: {
93
+ env: `PROVER_PUBLISHER_ALLOW_INVALID_STATES`,
94
+ description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
95
+ ...booleanConfigHelper(true)
96
+ },
97
+ fishermanMode: {
98
+ env: 'FISHERMAN_MODE',
99
+ description: 'Whether to run in fisherman mode: builds blocks on every slot for validation without publishing to L1',
100
+ ...booleanConfigHelper(false)
101
+ },
102
+ proverPublisherForwarderAddress: {
103
+ env: `PROVER_PUBLISHER_FORWARDER_ADDRESS`,
104
+ description: 'Address of the forwarder contract to wrap all L1 transactions through (for testing purposes only)',
105
+ parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined
106
+ }
107
+ };
@@ -1,9 +1,9 @@
1
1
  import { EthAddress } from '@aztec/aztec.js/addresses';
2
2
  import { type Logger } from '@aztec/aztec.js/log';
3
- import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
3
+ import type { BlobClientInterface } from '@aztec/blob-client/client';
4
4
  import type { EpochCache } from '@aztec/epoch-cache';
5
5
  import type { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
6
- import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
6
+ import type { L1TxUtils } from '@aztec/ethereum/l1-tx-utils';
7
7
  import type { PublisherManager } from '@aztec/ethereum/publisher-manager';
8
8
  import type { DateProvider } from '@aztec/foundation/timer';
9
9
  import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
@@ -21,11 +21,12 @@ export declare class SequencerPublisherFactory {
21
21
  private publisherMetrics;
22
22
  /** Stores the last slot in which every action was carried out by a publisher */
23
23
  private lastActions;
24
+ private nodeKeyStore;
24
25
  private logger;
25
26
  constructor(sequencerConfig: SequencerClientConfig, deps: {
26
27
  telemetry: TelemetryClient;
27
- publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
28
- blobSinkClient?: BlobSinkClientInterface;
28
+ publisherManager: PublisherManager<L1TxUtils>;
29
+ blobClient: BlobClientInterface;
29
30
  dateProvider: DateProvider;
30
31
  epochCache: EpochCache;
31
32
  rollupContract: RollupContract;
@@ -34,11 +35,18 @@ export declare class SequencerPublisherFactory {
34
35
  nodeKeyStore: NodeKeystoreAdapter;
35
36
  logger?: Logger;
36
37
  });
38
+ /**
39
+ * Updates the node keystore adapter used for publisher lookups.
40
+ * Called when the keystore is reloaded at runtime to reflect new validator-publisher mappings.
41
+ */
42
+ updateNodeKeyStore(adapter: NodeKeystoreAdapter): void;
37
43
  /**
38
44
  * Creates a new SequencerPublisher instance.
39
45
  * @param _validatorAddress - The address of the validator that will be using the publisher.
40
46
  * @returns A new SequencerPublisher instance.
41
47
  */
42
48
  create(validatorAddress?: EthAddress): Promise<AttestorPublisherPair>;
49
+ /** Interrupts all publishers managed by this factory. Used during sequencer shutdown. */
50
+ interruptAll(): void;
43
51
  }
44
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3NlcXVlbmNlci1wdWJsaXNoZXItZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDNUYsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBbUIsZ0JBQWdCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUUzRixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQ3ZFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRTFELE9BQU8sRUFBZSxrQkFBa0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTNFLE1BQU0sTUFBTSxxQkFBcUIsR0FBRztJQUNsQyxlQUFlLEVBQUUsVUFBVSxDQUFDO0lBQzVCLFNBQVMsRUFBRSxrQkFBa0IsQ0FBQztDQUMvQixDQUFDO0FBRUYscUJBQWEseUJBQXlCO0lBU2xDLE9BQU8sQ0FBQyxlQUFlO0lBQ3ZCLE9BQU8sQ0FBQyxJQUFJO0lBVGQsT0FBTyxDQUFDLGdCQUFnQixDQUE0QjtJQUVwRCxnRkFBZ0Y7SUFDaEYsT0FBTyxDQUFDLFdBQVcsQ0FBMkM7SUFFOUQsT0FBTyxDQUFDLE1BQU0sQ0FBUztJQUV2QixZQUNVLGVBQWUsRUFBRSxxQkFBcUIsRUFDdEMsSUFBSSxFQUFFO1FBQ1osU0FBUyxFQUFFLGVBQWUsQ0FBQztRQUMzQixnQkFBZ0IsRUFBRSxnQkFBZ0IsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1FBQ3ZELGNBQWMsQ0FBQyxFQUFFLHVCQUF1QixDQUFDO1FBQ3pDLFlBQVksRUFBRSxZQUFZLENBQUM7UUFDM0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUN2QixjQUFjLEVBQUUsY0FBYyxDQUFDO1FBQy9CLDBCQUEwQixFQUFFLDBCQUEwQixDQUFDO1FBQ3ZELG9CQUFvQixFQUFFLG9CQUFvQixDQUFDO1FBQzNDLFlBQVksRUFBRSxtQkFBbUIsQ0FBQztRQUNsQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDakIsRUFJRjtJQUNEOzs7O09BSUc7SUFDVSxNQUFNLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBcUNqRjtDQUNGIn0=
52
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLXB1Ymxpc2hlci1mYWN0b3J5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3NlcXVlbmNlci1wdWJsaXNoZXItZmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFnQixNQUFNLHFCQUFxQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDckUsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDNUYsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQW1CLGdCQUFnQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFM0YsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDNUQsT0FBTyxLQUFLLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUxRCxPQUFPLEVBQWUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUUzRSxNQUFNLE1BQU0scUJBQXFCLEdBQUc7SUFDbEMsZUFBZSxFQUFFLFVBQVUsQ0FBQztJQUM1QixTQUFTLEVBQUUsa0JBQWtCLENBQUM7Q0FDL0IsQ0FBQztBQUVGLHFCQUFhLHlCQUF5QjtJQVdsQyxPQUFPLENBQUMsZUFBZTtJQUN2QixPQUFPLENBQUMsSUFBSTtJQVhkLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBNEI7SUFFcEQsZ0ZBQWdGO0lBQ2hGLE9BQU8sQ0FBQyxXQUFXLENBQTJDO0lBRTlELE9BQU8sQ0FBQyxZQUFZLENBQXNCO0lBRTFDLE9BQU8sQ0FBQyxNQUFNLENBQVM7SUFFdkIsWUFDVSxlQUFlLEVBQUUscUJBQXFCLEVBQ3RDLElBQUksRUFBRTtRQUNaLFNBQVMsRUFBRSxlQUFlLENBQUM7UUFDM0IsZ0JBQWdCLEVBQUUsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDOUMsVUFBVSxFQUFFLG1CQUFtQixDQUFDO1FBQ2hDLFlBQVksRUFBRSxZQUFZLENBQUM7UUFDM0IsVUFBVSxFQUFFLFVBQVUsQ0FBQztRQUN2QixjQUFjLEVBQUUsY0FBYyxDQUFDO1FBQy9CLDBCQUEwQixFQUFFLDBCQUEwQixDQUFDO1FBQ3ZELG9CQUFvQixFQUFFLG9CQUFvQixDQUFDO1FBQzNDLFlBQVksRUFBRSxtQkFBbUIsQ0FBQztRQUNsQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDakIsRUFLRjtJQUVEOzs7T0FHRztJQUNJLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxtQkFBbUIsR0FBRyxJQUFJLENBRTVEO0lBRUQ7Ozs7T0FJRztJQUNVLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FxQ2pGO0lBRUQseUZBQXlGO0lBQ2xGLFlBQVksSUFBSSxJQUFJLENBRTFCO0NBQ0YifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"sequencer-publisher-factory.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,0BAA0B,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAmB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAe,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEF,qBAAa,yBAAyB;IASlC,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,IAAI;IATd,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,gFAAgF;IAChF,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,MAAM,CAAS;IAEvB,YACU,eAAe,EAAE,qBAAqB,EACtC,IAAI,EAAE;QACZ,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QACvD,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,cAAc,CAAC;QAC/B,0BAA0B,EAAE,0BAA0B,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC;QAC3C,YAAY,EAAE,mBAAmB,CAAC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAIF;IACD;;;;OAIG;IACU,MAAM,CAAC,gBAAgB,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAqCjF;CACF"}
1
+ {"version":3,"file":"sequencer-publisher-factory.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,0BAA0B,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAmB,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAe,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEF,qBAAa,yBAAyB;IAWlC,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,IAAI;IAXd,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,gFAAgF;IAChF,OAAO,CAAC,WAAW,CAA2C;IAE9D,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,MAAM,CAAS;IAEvB,YACU,eAAe,EAAE,qBAAqB,EACtC,IAAI,EAAE;QACZ,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC9C,UAAU,EAAE,mBAAmB,CAAC;QAChC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,cAAc,CAAC;QAC/B,0BAA0B,EAAE,0BAA0B,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC;QAC3C,YAAY,EAAE,mBAAmB,CAAC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAKF;IAED;;;OAGG;IACI,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAE5D;IAED;;;;OAIG;IACU,MAAM,CAAC,gBAAgB,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAqCjF;IAED,yFAAyF;IAClF,YAAY,IAAI,IAAI,CAE1B;CACF"}
@@ -6,6 +6,7 @@ export class SequencerPublisherFactory {
6
6
  deps;
7
7
  publisherMetrics;
8
8
  /** Stores the last slot in which every action was carried out by a publisher */ lastActions;
9
+ nodeKeyStore;
9
10
  logger;
10
11
  constructor(sequencerConfig, deps){
11
12
  this.sequencerConfig = sequencerConfig;
@@ -13,6 +14,13 @@ export class SequencerPublisherFactory {
13
14
  this.lastActions = {};
14
15
  this.publisherMetrics = new SequencerPublisherMetrics(deps.telemetry, 'SequencerPublisher');
15
16
  this.logger = deps.logger ?? createLogger('sequencer');
17
+ this.nodeKeyStore = this.deps.nodeKeyStore;
18
+ }
19
+ /**
20
+ * Updates the node keystore adapter used for publisher lookups.
21
+ * Called when the keystore is reloaded at runtime to reflect new validator-publisher mappings.
22
+ */ updateNodeKeyStore(adapter) {
23
+ this.nodeKeyStore = adapter;
16
24
  }
17
25
  /**
18
26
  * Creates a new SequencerPublisher instance.
@@ -20,19 +28,19 @@ export class SequencerPublisherFactory {
20
28
  * @returns A new SequencerPublisher instance.
21
29
  */ async create(validatorAddress) {
22
30
  // If we have been given an attestor address we must only allow publishers permitted for that attestor
23
- const allowedPublishers = !validatorAddress ? [] : this.deps.nodeKeyStore.getPublisherAddresses(validatorAddress);
31
+ const allowedPublishers = !validatorAddress ? [] : this.nodeKeyStore.getPublisherAddresses(validatorAddress);
24
32
  const filter = !validatorAddress ? ()=>true : (utils)=>{
25
33
  const publisherAddress = utils.getSenderAddress();
26
34
  return allowedPublishers.some((allowedPublisher)=>allowedPublisher.equals(publisherAddress));
27
35
  };
28
36
  const l1Publisher = await this.deps.publisherManager.getAvailablePublisher(filter);
29
- const attestorAddress = validatorAddress ?? this.deps.nodeKeyStore.getAttestorForPublisher(l1Publisher.getSenderAddress());
37
+ const attestorAddress = validatorAddress ?? this.nodeKeyStore.getAttestorForPublisher(l1Publisher.getSenderAddress());
30
38
  const rollup = this.deps.rollupContract;
31
39
  const slashingProposerContract = await rollup.getSlashingProposer();
32
40
  const publisher = new SequencerPublisher(this.sequencerConfig, {
33
41
  l1TxUtils: l1Publisher,
34
42
  telemetry: this.deps.telemetry,
35
- blobSinkClient: this.deps.blobSinkClient,
43
+ blobClient: this.deps.blobClient,
36
44
  rollupContract: this.deps.rollupContract,
37
45
  epochCache: this.deps.epochCache,
38
46
  governanceProposerContract: this.deps.governanceProposerContract,
@@ -48,4 +56,7 @@ export class SequencerPublisherFactory {
48
56
  publisher
49
57
  };
50
58
  }
59
+ /** Interrupts all publishers managed by this factory. Used during sequencer shutdown. */ interruptAll() {
60
+ this.deps.publisherManager.interrupt();
61
+ }
51
62
  }
@@ -1,4 +1,4 @@
1
- import type { L1PublishBlockStats } from '@aztec/stdlib/stats';
1
+ import type { L1PublishCheckpointStats } from '@aztec/stdlib/stats';
2
2
  import { type TelemetryClient } from '@aztec/telemetry-client';
3
3
  export type L1TxType = 'process';
4
4
  export declare class SequencerPublisherMetrics {
@@ -19,8 +19,8 @@ export declare class SequencerPublisherMetrics {
19
19
  private senderBalance;
20
20
  constructor(client: TelemetryClient, name?: string, logger?: import("@aztec/aztec.js/log").Logger);
21
21
  recordFailedTx(txType: L1TxType): void;
22
- recordProcessBlockTx(durationMs: number, stats: L1PublishBlockStats): void;
22
+ recordProcessBlockTx(durationMs: number, stats: L1PublishCheckpointStats): void;
23
23
  recordSenderBalance(wei: bigint, senderAddress: string): void;
24
24
  private recordTx;
25
25
  }
26
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLXB1Ymxpc2hlci1tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3NlcXVlbmNlci1wdWJsaXNoZXItbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBa0IsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRSxPQUFPLEVBS0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFJakMsTUFBTSxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUM7QUFFakMscUJBQWEseUJBQXlCO0lBc0JsQyxPQUFPLENBQUMsTUFBTTtJQXJCaEIsT0FBTyxDQUFDLFFBQVEsQ0FBWTtJQUU1QixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsVUFBVSxDQUFZO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQVk7SUFDekIsT0FBTyxDQUFDLGNBQWMsQ0FBWTtJQUNsQyxPQUFPLENBQUMsYUFBYSxDQUFZO0lBQ2pDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBWTtJQUNyQyxPQUFPLENBQUMsaUJBQWlCLENBQVk7SUFDckMsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUU5QixPQUFPLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFZO0lBQy9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsNEJBQTRCLENBQVk7SUFDekQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBZ0I7SUFDckQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBZ0I7SUFFckQsT0FBTyxDQUFDLGFBQWEsQ0FBUTtJQUU3QixZQUNFLE1BQU0sRUFBRSxlQUFlLEVBQ3ZCLElBQUksU0FBdUIsRUFDbkIsTUFBTSx1Q0FBOEMsRUFzRjdEO0lBRUQsY0FBYyxDQUFDLE1BQU0sRUFBRSxRQUFRLFFBUzlCO0lBRUQsb0JBQW9CLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsbUJBQW1CLFFBWWxFO0lBRUQsbUJBQW1CLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsTUFBTSxRQUtyRDtJQUVELE9BQU8sQ0FBQyxRQUFRO0NBdUNqQiJ9
26
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLXB1Ymxpc2hlci1tZXRyaWNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3NlcXVlbmNlci1wdWJsaXNoZXItbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSx3QkFBd0IsRUFBa0IsTUFBTSxxQkFBcUIsQ0FBQztBQUNwRixPQUFPLEVBS0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFJakMsTUFBTSxNQUFNLFFBQVEsR0FBRyxTQUFTLENBQUM7QUFFakMscUJBQWEseUJBQXlCO0lBc0JsQyxPQUFPLENBQUMsTUFBTTtJQXJCaEIsT0FBTyxDQUFDLFFBQVEsQ0FBWTtJQUU1QixPQUFPLENBQUMsT0FBTyxDQUFnQjtJQUMvQixPQUFPLENBQUMsVUFBVSxDQUFZO0lBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQVk7SUFDekIsT0FBTyxDQUFDLGNBQWMsQ0FBWTtJQUNsQyxPQUFPLENBQUMsYUFBYSxDQUFZO0lBQ2pDLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBWTtJQUNyQyxPQUFPLENBQUMsaUJBQWlCLENBQVk7SUFDckMsT0FBTyxDQUFDLFVBQVUsQ0FBWTtJQUU5QixPQUFPLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFZO0lBQy9DLE9BQU8sQ0FBQyxRQUFRLENBQUMsNEJBQTRCLENBQVk7SUFDekQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBZ0I7SUFDckQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBZ0I7SUFFckQsT0FBTyxDQUFDLGFBQWEsQ0FBUTtJQUU3QixZQUNFLE1BQU0sRUFBRSxlQUFlLEVBQ3ZCLElBQUksU0FBdUIsRUFDbkIsTUFBTSx1Q0FBOEMsRUFrQzdEO0lBRUQsY0FBYyxDQUFDLE1BQU0sRUFBRSxRQUFRLFFBUzlCO0lBRUQsb0JBQW9CLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsd0JBQXdCLFFBWXZFO0lBRUQsbUJBQW1CLENBQUMsR0FBRyxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsTUFBTSxRQUtyRDtJQUVELE9BQU8sQ0FBQyxRQUFRO0NBdUNqQiJ9
@@ -1 +1 @@
1
- {"version":3,"file":"sequencer-publisher-metrics.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-metrics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAKL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEjC,qBAAa,yBAAyB;IAsBlC,OAAO,CAAC,MAAM;IArBhB,OAAO,CAAC,QAAQ,CAAY;IAE5B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IAErD,OAAO,CAAC,aAAa,CAAQ;IAE7B,YACE,MAAM,EAAE,eAAe,EACvB,IAAI,SAAuB,EACnB,MAAM,uCAA8C,EAsF7D;IAED,cAAc,CAAC,MAAM,EAAE,QAAQ,QAS9B;IAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,QAYlE;IAED,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAKrD;IAED,OAAO,CAAC,QAAQ;CAuCjB"}
1
+ {"version":3,"file":"sequencer-publisher-metrics.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-metrics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,wBAAwB,EAAkB,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAKL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEjC,qBAAa,yBAAyB;IAsBlC,OAAO,CAAC,MAAM;IArBhB,OAAO,CAAC,QAAQ,CAAY;IAE5B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IAErD,OAAO,CAAC,aAAa,CAAQ;IAE7B,YACE,MAAM,EAAE,eAAe,EACvB,IAAI,SAAuB,EACnB,MAAM,uCAA8C,EAkC7D;IAED,cAAc,CAAC,MAAM,EAAE,QAAQ,QAS9B;IAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,wBAAwB,QAYvE;IAED,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAKrD;IAED,OAAO,CAAC,QAAQ;CAuCjB"}