@aztec/sequencer-client 0.0.1-commit.b33fc05d0 → 0.0.1-commit.b3d3157a

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 (105) hide show
  1. package/README.md +281 -21
  2. package/dest/client/sequencer-client.d.ts +8 -14
  3. package/dest/client/sequencer-client.d.ts.map +1 -1
  4. package/dest/client/sequencer-client.js +33 -83
  5. package/dest/config.d.ts +5 -1
  6. package/dest/config.d.ts.map +1 -1
  7. package/dest/config.js +42 -15
  8. package/dest/global_variable_builder/fee_predictor.d.ts +37 -0
  9. package/dest/global_variable_builder/fee_predictor.d.ts.map +1 -0
  10. package/dest/global_variable_builder/fee_predictor.js +128 -0
  11. package/dest/global_variable_builder/fee_provider.d.ts +21 -0
  12. package/dest/global_variable_builder/fee_provider.d.ts.map +1 -0
  13. package/dest/global_variable_builder/fee_provider.js +58 -0
  14. package/dest/global_variable_builder/global_builder.d.ts +14 -14
  15. package/dest/global_variable_builder/global_builder.d.ts.map +1 -1
  16. package/dest/global_variable_builder/global_builder.js +16 -50
  17. package/dest/global_variable_builder/index.d.ts +4 -2
  18. package/dest/global_variable_builder/index.d.ts.map +1 -1
  19. package/dest/global_variable_builder/index.js +2 -0
  20. package/dest/index.d.ts +2 -2
  21. package/dest/index.d.ts.map +1 -1
  22. package/dest/index.js +1 -1
  23. package/dest/publisher/config.d.ts +15 -3
  24. package/dest/publisher/config.d.ts.map +1 -1
  25. package/dest/publisher/config.js +19 -4
  26. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts +3 -4
  27. package/dest/publisher/l1_tx_failed_store/failed_tx_store.d.ts.map +1 -1
  28. package/dest/publisher/sequencer-bundle-simulator.d.ts +96 -0
  29. package/dest/publisher/sequencer-bundle-simulator.d.ts.map +1 -0
  30. package/dest/publisher/sequencer-bundle-simulator.js +198 -0
  31. package/dest/publisher/sequencer-publisher-factory.d.ts +3 -5
  32. package/dest/publisher/sequencer-publisher-factory.d.ts.map +1 -1
  33. package/dest/publisher/sequencer-publisher-factory.js +2 -3
  34. package/dest/publisher/sequencer-publisher.d.ts +73 -65
  35. package/dest/publisher/sequencer-publisher.d.ts.map +1 -1
  36. package/dest/publisher/sequencer-publisher.js +318 -523
  37. package/dest/sequencer/automine/automine_factory.d.ts +54 -0
  38. package/dest/sequencer/automine/automine_factory.d.ts.map +1 -0
  39. package/dest/sequencer/automine/automine_factory.js +84 -0
  40. package/dest/sequencer/automine/automine_sequencer.d.ts +151 -0
  41. package/dest/sequencer/automine/automine_sequencer.d.ts.map +1 -0
  42. package/dest/sequencer/automine/automine_sequencer.js +509 -0
  43. package/dest/sequencer/chain_state_overrides.d.ts +61 -0
  44. package/dest/sequencer/chain_state_overrides.d.ts.map +1 -0
  45. package/dest/sequencer/chain_state_overrides.js +98 -0
  46. package/dest/sequencer/checkpoint_proposal_job.d.ts +60 -10
  47. package/dest/sequencer/checkpoint_proposal_job.d.ts.map +1 -1
  48. package/dest/sequencer/checkpoint_proposal_job.js +748 -200
  49. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts +34 -0
  50. package/dest/sequencer/checkpoint_proposal_job_metrics.d.ts.map +1 -0
  51. package/dest/sequencer/checkpoint_proposal_job_metrics.js +72 -0
  52. package/dest/sequencer/checkpoint_voter.d.ts +1 -2
  53. package/dest/sequencer/checkpoint_voter.d.ts.map +1 -1
  54. package/dest/sequencer/checkpoint_voter.js +2 -5
  55. package/dest/sequencer/events.d.ts +48 -2
  56. package/dest/sequencer/events.d.ts.map +1 -1
  57. package/dest/sequencer/index.d.ts +3 -1
  58. package/dest/sequencer/index.d.ts.map +1 -1
  59. package/dest/sequencer/index.js +2 -0
  60. package/dest/sequencer/metrics.d.ts +13 -10
  61. package/dest/sequencer/metrics.d.ts.map +1 -1
  62. package/dest/sequencer/metrics.js +45 -20
  63. package/dest/sequencer/sequencer.d.ts +63 -13
  64. package/dest/sequencer/sequencer.d.ts.map +1 -1
  65. package/dest/sequencer/sequencer.js +349 -107
  66. package/dest/sequencer/timetable.d.ts +11 -1
  67. package/dest/sequencer/timetable.d.ts.map +1 -1
  68. package/dest/sequencer/timetable.js +41 -36
  69. package/dest/sequencer/types.d.ts +2 -2
  70. package/dest/sequencer/types.d.ts.map +1 -1
  71. package/dest/test/mock_checkpoint_builder.d.ts +4 -4
  72. package/dest/test/mock_checkpoint_builder.d.ts.map +1 -1
  73. package/dest/test/utils.d.ts +1 -1
  74. package/dest/test/utils.d.ts.map +1 -1
  75. package/dest/test/utils.js +7 -6
  76. package/package.json +27 -28
  77. package/src/client/sequencer-client.ts +53 -114
  78. package/src/config.ts +48 -12
  79. package/src/global_variable_builder/README.md +44 -0
  80. package/src/global_variable_builder/fee_predictor.ts +172 -0
  81. package/src/global_variable_builder/fee_provider.ts +75 -0
  82. package/src/global_variable_builder/global_builder.ts +25 -62
  83. package/src/global_variable_builder/index.ts +3 -1
  84. package/src/index.ts +10 -1
  85. package/src/publisher/config.ts +40 -6
  86. package/src/publisher/l1_tx_failed_store/failed_tx_store.ts +3 -1
  87. package/src/publisher/sequencer-bundle-simulator.ts +254 -0
  88. package/src/publisher/sequencer-publisher-factory.ts +3 -6
  89. package/src/publisher/sequencer-publisher.ts +377 -568
  90. package/src/sequencer/README.md +162 -450
  91. package/src/sequencer/automine/README.md +46 -0
  92. package/src/sequencer/automine/automine_factory.ts +145 -0
  93. package/src/sequencer/automine/automine_sequencer.ts +595 -0
  94. package/src/sequencer/chain_state_overrides.ts +162 -0
  95. package/src/sequencer/checkpoint_proposal_job.ts +894 -220
  96. package/src/sequencer/checkpoint_proposal_job_metrics.ts +128 -0
  97. package/src/sequencer/checkpoint_voter.ts +1 -12
  98. package/src/sequencer/events.ts +51 -2
  99. package/src/sequencer/index.ts +2 -0
  100. package/src/sequencer/metrics.ts +57 -24
  101. package/src/sequencer/sequencer.ts +429 -121
  102. package/src/sequencer/timetable.ts +49 -44
  103. package/src/sequencer/types.ts +1 -1
  104. package/src/test/mock_checkpoint_builder.ts +3 -3
  105. package/src/test/utils.ts +28 -10
@@ -4,16 +4,12 @@ import { isAnvilTestChain } from '@aztec/ethereum/chain';
4
4
  import { getPublicClient } from '@aztec/ethereum/client';
5
5
  import { GovernanceProposerContract, RollupContract } from '@aztec/ethereum/contracts';
6
6
  import { PublisherManager } from '@aztec/ethereum/publisher-manager';
7
- import { EthAddress } from '@aztec/foundation/eth-address';
8
7
  import { createLogger } from '@aztec/foundation/log';
9
- import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
10
8
  import { L1Metrics } from '@aztec/telemetry-client';
11
9
  import { NodeKeystoreAdapter } from '@aztec/validator-client';
12
- import { DefaultSequencerConfig, getPublisherConfigFromSequencerConfig } from '../config.js';
13
- import { GlobalVariableBuilder } from '../global_variable_builder/index.js';
10
+ import { getPublisherConfigFromSequencerConfig } from '../config.js';
14
11
  import { SequencerPublisherFactory } from '../publisher/sequencer-publisher-factory.js';
15
12
  import { Sequencer } from '../sequencer/index.js';
16
- import { SequencerTimetable } from '../sequencer/timetable.js';
17
13
  /**
18
14
  * Encapsulates the full sequencer and publisher.
19
15
  */ export class SequencerClient {
@@ -49,16 +45,18 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
49
45
  const publicClient = getPublicClient(config);
50
46
  const l1TxUtils = deps.l1TxUtils;
51
47
  const l1Metrics = new L1Metrics(telemetryClient.getMeter('L1PublisherMetrics'), publicClient, l1TxUtils.map((x)=>x.getSenderAddress()));
52
- const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), log.getBindings());
53
- const rollupContract = new RollupContract(publicClient, config.l1Contracts.rollupAddress.toString());
54
- const [l1GenesisTime, slotDuration, rollupVersion, rollupManaLimit] = await Promise.all([
48
+ const publisherManager = new PublisherManager(l1TxUtils, getPublisherConfigFromSequencerConfig(config), {
49
+ bindings: log.getBindings(),
50
+ funder: deps.funderL1TxUtils
51
+ });
52
+ const rollupContract = new RollupContract(publicClient, config.rollupAddress.toString());
53
+ const [l1GenesisTime, slotDuration, rollupManaLimit] = await Promise.all([
55
54
  rollupContract.getL1GenesisTime(),
56
55
  rollupContract.getSlotDuration(),
57
- rollupContract.getVersion(),
58
56
  rollupContract.getManaLimit().then(Number)
59
57
  ]);
60
- const governanceProposerContract = new GovernanceProposerContract(publicClient, config.l1Contracts.governanceProposerAddress.toString());
61
- const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, {
58
+ const governanceProposerContract = new GovernanceProposerContract(publicClient, config.governanceProposerAddress.toString());
59
+ const epochCache = deps.epochCache ?? await EpochCache.create(config.rollupAddress, {
62
60
  l1RpcUrls: rpcUrls,
63
61
  l1ChainId: chainId,
64
62
  viemPollingIntervalMS: config.viemPollingIntervalMS,
@@ -66,13 +64,11 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
66
64
  }, {
67
65
  dateProvider: deps.dateProvider
68
66
  });
69
- const slashFactoryContract = new SlashFactoryContract(publicClient, config.l1Contracts.slashFactoryAddress?.toString() ?? EthAddress.ZERO.toString());
70
67
  const publisherFactory = deps.publisherFactory ?? new SequencerPublisherFactory(config, {
71
68
  telemetry: telemetryClient,
72
69
  blobClient: deps.blobClient,
73
70
  epochCache,
74
71
  governanceProposerContract,
75
- slashFactoryContract,
76
72
  rollupContract,
77
73
  dateProvider: deps.dateProvider,
78
74
  publisherManager,
@@ -80,13 +76,7 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
80
76
  logger: log
81
77
  });
82
78
  const ethereumSlotDuration = config.ethereumSlotDuration;
83
- const globalsBuilder = new GlobalVariableBuilder({
84
- ...config,
85
- l1GenesisTime,
86
- slotDuration: Number(slotDuration),
87
- ethereumSlotDuration,
88
- rollupVersion
89
- });
79
+ const globalsBuilder = deps.globalVariableBuilder;
90
80
  // When running in anvil, assume we can post a tx up until one second before the end of an L1 slot.
91
81
  // Otherwise, we need the full L1 slot duration for publishing to ensure inclusion.
92
82
  // In theory, the L1 slot has an initial 4s phase where the block is propagated, so we could
@@ -94,12 +84,13 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
94
84
  // See https://www.blocknative.com/blog/anatomy-of-a-slot#7 for more info.
95
85
  const l1PublishingTimeBasedOnChain = isAnvilTestChain(config.l1ChainId) ? 1 : ethereumSlotDuration;
96
86
  const l1PublishingTime = config.l1PublishingTime ?? l1PublishingTimeBasedOnChain;
97
- const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = computeBlockLimits(config, rollupManaLimit, l1PublishingTime, log);
87
+ const { maxL2BlockGas, maxDABlockGas, maxTxsPerBlock } = capPerBlockLimits(config, rollupManaLimit, log);
98
88
  const l1Constants = {
99
89
  l1GenesisTime,
100
90
  slotDuration: Number(slotDuration),
101
91
  ethereumSlotDuration,
102
- rollupManaLimit
92
+ rollupManaLimit,
93
+ epochDuration: config.aztecEpochDuration
103
94
  };
104
95
  const sequencer = new Sequencer(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldStateSynchronizer, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, deps.dateProvider, epochCache, rollupContract, {
105
96
  ...config,
@@ -125,16 +116,19 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
125
116
  await this.validatorClient?.start();
126
117
  this.sequencer.start();
127
118
  this.l1Metrics?.start();
128
- await this.publisherManager.loadState();
119
+ await this.publisherManager.start();
129
120
  }
130
121
  /**
131
122
  * Stops the sequencer from processing new txs.
132
123
  */ async stop() {
133
124
  await this.sequencer.stop();
134
125
  await this.validatorClient?.stop();
135
- this.publisherManager.interrupt();
126
+ await this.publisherManager.stop();
136
127
  this.l1Metrics?.stop();
137
128
  }
129
+ /** Triggers an immediate run of the sequencer, bypassing the polling interval. */ trigger() {
130
+ return this.sequencer.trigger();
131
+ }
138
132
  getSequencer() {
139
133
  return this.sequencer;
140
134
  }
@@ -152,68 +146,24 @@ import { SequencerTimetable } from '../sequencer/timetable.js';
152
146
  }
153
147
  }
154
148
  /**
155
- * Computes per-block L2 gas, DA gas, and TX count budgets based on the L1 rollup limits and the timetable.
156
- * If the user explicitly set a limit, it is capped at the corresponding checkpoint limit.
157
- * Otherwise, derives it as (checkpointLimit / maxBlocks) * multiplier, capped at the checkpoint limit.
158
- */ export function computeBlockLimits(config, rollupManaLimit, l1PublishingTime, log) {
159
- const maxNumberOfBlocks = new SequencerTimetable({
160
- ethereumSlotDuration: config.ethereumSlotDuration,
161
- aztecSlotDuration: config.aztecSlotDuration,
162
- l1PublishingTime,
163
- p2pPropagationTime: config.attestationPropagationTime,
164
- blockDurationMs: config.blockDurationMs,
165
- enforce: config.enforceTimeTable ?? DefaultSequencerConfig.enforceTimeTable
166
- }).maxNumberOfBlocks;
167
- const multiplier = config.perBlockAllocationMultiplier ?? DefaultSequencerConfig.perBlockAllocationMultiplier;
168
- // Compute maxL2BlockGas
169
- let maxL2BlockGas;
170
- if (config.maxL2BlockGas !== undefined) {
171
- if (config.maxL2BlockGas > rollupManaLimit) {
172
- log.warn(`Provided MAX_L2_BLOCK_GAS ${config.maxL2BlockGas} exceeds L1 rollup mana limit ${rollupManaLimit} (capping)`);
173
- maxL2BlockGas = rollupManaLimit;
174
- } else {
175
- maxL2BlockGas = config.maxL2BlockGas;
176
- }
177
- } else {
178
- maxL2BlockGas = Math.min(rollupManaLimit, Math.ceil(rollupManaLimit / maxNumberOfBlocks * multiplier));
149
+ * Caps operator-provided per-block limits at checkpoint-level limits.
150
+ * Returns undefined for any limit the operator didn't set the checkpoint builder handles redistribution.
151
+ */ function capPerBlockLimits(config, rollupManaLimit, log) {
152
+ let maxL2BlockGas = config.maxL2BlockGas;
153
+ if (maxL2BlockGas !== undefined && maxL2BlockGas > rollupManaLimit) {
154
+ log.warn(`Provided MAX_L2_BLOCK_GAS ${maxL2BlockGas} exceeds rollup mana limit ${rollupManaLimit} (capping)`);
155
+ maxL2BlockGas = rollupManaLimit;
179
156
  }
180
- // Compute maxDABlockGas
181
- const daCheckpointLimit = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
182
- let maxDABlockGas;
183
- if (config.maxDABlockGas !== undefined) {
184
- if (config.maxDABlockGas > daCheckpointLimit) {
185
- log.warn(`Provided MAX_DA_BLOCK_GAS ${config.maxDABlockGas} exceeds DA checkpoint limit ${daCheckpointLimit} (capping)`);
186
- maxDABlockGas = daCheckpointLimit;
187
- } else {
188
- maxDABlockGas = config.maxDABlockGas;
189
- }
190
- } else {
191
- maxDABlockGas = Math.min(daCheckpointLimit, Math.ceil(daCheckpointLimit / maxNumberOfBlocks * multiplier));
157
+ let maxDABlockGas = config.maxDABlockGas;
158
+ if (maxDABlockGas !== undefined && maxDABlockGas > MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT) {
159
+ log.warn(`Provided MAX_DA_BLOCK_GAS ${maxDABlockGas} exceeds DA checkpoint limit ${MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT} (capping)`);
160
+ maxDABlockGas = MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT;
192
161
  }
193
- // Compute maxTxsPerBlock
194
- const defaultMaxTxsPerBlock = 32;
195
- let maxTxsPerBlock;
196
- if (config.maxTxsPerBlock !== undefined) {
197
- if (config.maxTxsPerCheckpoint !== undefined && config.maxTxsPerBlock > config.maxTxsPerCheckpoint) {
198
- log.warn(`Provided MAX_TX_PER_BLOCK ${config.maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
199
- maxTxsPerBlock = config.maxTxsPerCheckpoint;
200
- } else {
201
- maxTxsPerBlock = config.maxTxsPerBlock;
202
- }
203
- } else if (config.maxTxsPerCheckpoint !== undefined) {
204
- maxTxsPerBlock = Math.min(config.maxTxsPerCheckpoint, Math.ceil(config.maxTxsPerCheckpoint / maxNumberOfBlocks * multiplier));
205
- } else {
206
- maxTxsPerBlock = defaultMaxTxsPerBlock;
162
+ let maxTxsPerBlock = config.maxTxsPerBlock;
163
+ if (maxTxsPerBlock !== undefined && config.maxTxsPerCheckpoint !== undefined && maxTxsPerBlock > config.maxTxsPerCheckpoint) {
164
+ log.warn(`Provided MAX_TX_PER_BLOCK ${maxTxsPerBlock} exceeds MAX_TX_PER_CHECKPOINT ${config.maxTxsPerCheckpoint} (capping)`);
165
+ maxTxsPerBlock = config.maxTxsPerCheckpoint;
207
166
  }
208
- log.info(`Computed block limits L2=${maxL2BlockGas} DA=${maxDABlockGas} maxTxs=${maxTxsPerBlock}`, {
209
- maxL2BlockGas,
210
- maxDABlockGas,
211
- maxTxsPerBlock,
212
- rollupManaLimit,
213
- daCheckpointLimit,
214
- maxNumberOfBlocks,
215
- multiplier
216
- });
217
167
  return {
218
168
  maxL2BlockGas,
219
169
  maxDABlockGas,
package/dest/config.d.ts CHANGED
@@ -18,13 +18,16 @@ export declare const DefaultSequencerConfig: {
18
18
  buildCheckpointIfEmpty: false;
19
19
  publishTxsWithProposals: false;
20
20
  perBlockAllocationMultiplier: number;
21
+ redistributeCheckpointBudget: true;
21
22
  enforceTimeTable: true;
22
23
  attestationPropagationTime: number;
23
24
  secondsBeforeInvalidatingBlockAsCommitteeMember: number;
24
25
  secondsBeforeInvalidatingBlockAsNonCommitteeMember: number;
25
26
  skipCollectingAttestations: false;
26
27
  skipInvalidateBlockAsProposer: false;
28
+ skipWaitForValidParentCheckpointOnL1: false;
27
29
  broadcastInvalidBlockProposal: false;
30
+ broadcastInvalidCheckpointProposalOnly: false;
28
31
  injectFakeAttestation: false;
29
32
  injectHighSValueAttestation: false;
30
33
  injectUnrecoverableSignatureAttestation: false;
@@ -32,6 +35,7 @@ export declare const DefaultSequencerConfig: {
32
35
  shuffleAttestationOrdering: false;
33
36
  skipPushProposedBlocksToArchiver: false;
34
37
  skipPublishingCheckpointsPercent: number;
38
+ maxBlocksPerCheckpoint: number;
35
39
  };
36
40
  /**
37
41
  * Configuration settings for the SequencerClient.
@@ -43,4 +47,4 @@ export declare const sequencerClientConfigMappings: ConfigMappingsType<Sequencer
43
47
  * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
44
48
  */
45
49
  export declare function getConfigEnvVars(): SequencerClientConfig;
46
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFDaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFHOUIsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQWlDLE1BQU0sZ0NBQWdDLENBQUM7QUFFM0csT0FBTyxFQUNMLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssdUJBQXVCLEVBRzdCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxZQUFZLEVBQUUsZUFBZSxFQUFFLENBQUM7QUFFaEM7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FvQkEsQ0FBQztBQUVwQzs7R0FFRztBQUNILE1BQU0sTUFBTSxxQkFBcUIsR0FBRyx3QkFBd0IsR0FDMUQsY0FBYyxHQUNkLHFCQUFxQixHQUNyQix1QkFBdUIsR0FDdkIsZUFBZSxHQUNmLGNBQWMsR0FDZCxXQUFXLEdBQ1gsSUFBSSxDQUFDLFNBQVMsRUFBRSw4QkFBOEIsQ0FBQyxHQUMvQyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEdBQUcsbUJBQW1CLEdBQUcsb0JBQW9CLENBQUMsQ0FBQztBQUUvRixlQUFPLE1BQU0sdUJBQXVCLEVBQUUsa0JBQWtCLENBQUMsZUFBZSxDQTBKdkUsQ0FBQztBQUVGLGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FBQyxxQkFBcUIsQ0FTbkYsQ0FBQztBQUVGOztHQUVHO0FBQ0gsd0JBQWdCLGdCQUFnQixJQUFJLHFCQUFxQixDQUV4RCJ9
50
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBQzNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFNeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQyxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQTBCLE1BQU0sNkJBQTZCLENBQUM7QUFDMUYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFxQixNQUFNLG1CQUFtQixDQUFDO0FBRXRFLE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsS0FBSyxlQUFlLEVBR3JCLE1BQU0sc0JBQXNCLENBQUM7QUFHOUIsT0FBTyxFQUFFLEtBQUsscUJBQXFCLEVBQWlDLE1BQU0sZ0NBQWdDLENBQUM7QUFFM0csT0FBTyxFQUNMLEtBQUssd0JBQXdCLEVBQzdCLEtBQUssdUJBQXVCLEVBRzdCLE1BQU0sdUJBQXVCLENBQUM7QUFFL0IsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxZQUFZLEVBQUUsZUFBZSxFQUFFLENBQUM7QUFFaEM7OztHQUdHO0FBQ0gsZUFBTyxNQUFNLHNCQUFzQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBd0JBLENBQUM7QUFFcEM7O0dBRUc7QUFDSCxNQUFNLE1BQU0scUJBQXFCLEdBQUcsd0JBQXdCLEdBQzFELGNBQWMsR0FDZCxxQkFBcUIsR0FDckIsdUJBQXVCLEdBQ3ZCLGVBQWUsR0FDZixjQUFjLEdBQ2QsV0FBVyxHQUNYLElBQUksQ0FBQyxTQUFTLEVBQUUsOEJBQThCLENBQUMsR0FDL0MsSUFBSSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixHQUFHLG1CQUFtQixHQUFHLG9CQUFvQixDQUFDLENBQUM7QUFFL0YsZUFBTyxNQUFNLHVCQUF1QixFQUFFLGtCQUFrQixDQUFDLGVBQWUsQ0F3THZFLENBQUM7QUFFRixlQUFPLE1BQU0sNkJBQTZCLEVBQUUsa0JBQWtCLENBQUMscUJBQXFCLENBU25GLENBQUM7QUFFRjs7R0FFRztBQUNILHdCQUFnQixnQkFBZ0IsSUFBSSxxQkFBcUIsQ0FFeEQifQ==
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,eAAe,EAGrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAG7B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;CAoBA,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAC1D,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CA0JvE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAAC,qBAAqB,CASnF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAExD"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,eAAe,EAGrB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,KAAK,qBAAqB,EAAiC,MAAM,gCAAgC,CAAC;AAE3G,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,uBAAuB,EAG7B,MAAM,uBAAuB,CAAC;AAE/B,cAAc,uBAAuB,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;CAwBA,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,wBAAwB,GAC1D,cAAc,GACd,qBAAqB,GACrB,uBAAuB,GACvB,eAAe,GACf,cAAc,GACd,WAAW,GACX,IAAI,CAAC,SAAS,EAAE,8BAA8B,CAAC,GAC/C,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,mBAAmB,GAAG,oBAAoB,CAAC,CAAC;AAE/F,eAAO,MAAM,uBAAuB,EAAE,kBAAkB,CAAC,eAAe,CAwLvE,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,11 +1,11 @@
1
1
  import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
2
2
  import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
3
- import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
3
+ import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper, optionalNumberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
4
4
  import { EthAddress } from '@aztec/foundation/eth-address';
5
5
  import { keyStoreConfigMappings } from '@aztec/node-keystore/config';
6
6
  import { p2pConfigMappings } from '@aztec/p2p/config';
7
7
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
8
- import { chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
8
+ import { DEFAULT_MAX_BLOCKS_PER_CHECKPOINT, chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
9
9
  import { DEFAULT_P2P_PROPAGATION_TIME } from '@aztec/stdlib/timetable';
10
10
  import { validatorClientConfigMappings } from '@aztec/validator-client/config';
11
11
  import { sequencerPublisherConfigMappings, sequencerTxSenderConfigMappings } from './publisher/config.js';
@@ -18,21 +18,25 @@ export * from './publisher/config.js';
18
18
  minTxsPerBlock: 1,
19
19
  buildCheckpointIfEmpty: false,
20
20
  publishTxsWithProposals: false,
21
- perBlockAllocationMultiplier: 2,
21
+ perBlockAllocationMultiplier: 1.2,
22
+ redistributeCheckpointBudget: true,
22
23
  enforceTimeTable: true,
23
24
  attestationPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
24
25
  secondsBeforeInvalidatingBlockAsCommitteeMember: 144,
25
26
  secondsBeforeInvalidatingBlockAsNonCommitteeMember: 432,
26
27
  skipCollectingAttestations: false,
27
28
  skipInvalidateBlockAsProposer: false,
29
+ skipWaitForValidParentCheckpointOnL1: false,
28
30
  broadcastInvalidBlockProposal: false,
31
+ broadcastInvalidCheckpointProposalOnly: false,
29
32
  injectFakeAttestation: false,
30
33
  injectHighSValueAttestation: false,
31
34
  injectUnrecoverableSignatureAttestation: false,
32
35
  fishermanMode: false,
33
36
  shuffleAttestationOrdering: false,
34
37
  skipPushProposedBlocksToArchiver: false,
35
- skipPublishingCheckpointsPercent: 0
38
+ skipPublishingCheckpointsPercent: 0,
39
+ maxBlocksPerCheckpoint: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT
36
40
  };
37
41
  export const sequencerConfigMappings = {
38
42
  sequencerPollingIntervalMS: {
@@ -43,7 +47,7 @@ export const sequencerConfigMappings = {
43
47
  maxTxsPerCheckpoint: {
44
48
  env: 'SEQ_MAX_TX_PER_CHECKPOINT',
45
49
  description: 'The maximum number of txs across all blocks in a checkpoint.',
46
- parseEnv: (val)=>val ? parseInt(val, 10) : undefined
50
+ ...optionalNumberConfigHelper()
47
51
  },
48
52
  minTxsPerBlock: {
49
53
  env: 'SEQ_MIN_TX_PER_BLOCK',
@@ -61,21 +65,26 @@ export const sequencerConfigMappings = {
61
65
  maxL2BlockGas: {
62
66
  env: 'SEQ_MAX_L2_BLOCK_GAS',
63
67
  description: 'The maximum L2 block gas.',
64
- parseEnv: (val)=>val ? parseInt(val, 10) : undefined
68
+ ...optionalNumberConfigHelper()
65
69
  },
66
70
  maxDABlockGas: {
67
71
  env: 'SEQ_MAX_DA_BLOCK_GAS',
68
72
  description: 'The maximum DA block gas.',
69
- parseEnv: (val)=>val ? parseInt(val, 10) : undefined
73
+ ...optionalNumberConfigHelper()
70
74
  },
71
75
  perBlockAllocationMultiplier: {
72
76
  env: 'SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER',
73
77
  description: 'Per-block gas budget multiplier for both L2 and DA gas. Budget per block is (checkpointLimit / maxBlocks) * multiplier.' + ' Values greater than one allow early blocks to use more than their even share, relying on checkpoint-level capping for later blocks.',
74
78
  ...numberConfigHelper(DefaultSequencerConfig.perBlockAllocationMultiplier)
75
79
  },
80
+ redistributeCheckpointBudget: {
81
+ env: 'SEQ_REDISTRIBUTE_CHECKPOINT_BUDGET',
82
+ description: 'Redistribute remaining checkpoint budget evenly across remaining blocks instead of allowing a single block to consume the entire remaining budget.',
83
+ ...booleanConfigHelper(DefaultSequencerConfig.redistributeCheckpointBudget)
84
+ },
76
85
  coinbase: {
77
86
  env: 'COINBASE',
78
- parseEnv: (val)=>val ? EthAddress.fromString(val) : undefined,
87
+ parseEnv: (val)=>EthAddress.fromString(val),
79
88
  description: 'Recipient of block reward.'
80
89
  },
81
90
  feeRecipient: {
@@ -104,12 +113,7 @@ export const sequencerConfigMappings = {
104
113
  l1PublishingTime: {
105
114
  env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
106
115
  description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
107
- parseEnv: (val)=>val ? parseInt(val, 10) : undefined
108
- },
109
- attestationPropagationTime: {
110
- env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
111
- description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way)',
112
- ...numberConfigHelper(DefaultSequencerConfig.attestationPropagationTime)
116
+ ...optionalNumberConfigHelper()
113
117
  },
114
118
  fakeProcessingDelayPerTxMs: {
115
119
  description: 'Used for testing to introduce a fake delay after processing each tx'
@@ -135,10 +139,22 @@ export const sequencerConfigMappings = {
135
139
  description: 'Do not invalidate the previous block if invalid when we are the proposer (for testing only)',
136
140
  ...booleanConfigHelper(DefaultSequencerConfig.skipInvalidateBlockAsProposer)
137
141
  },
142
+ skipWaitForValidParentCheckpointOnL1: {
143
+ description: 'Bypass the parent checkpoint validity check before submitting a pipelined checkpoint, ' + 'allowing the proposer to publish even when the parent landed on L1 with invalid attestations (for testing only)',
144
+ ...booleanConfigHelper(DefaultSequencerConfig.skipWaitForValidParentCheckpointOnL1)
145
+ },
138
146
  broadcastInvalidBlockProposal: {
139
147
  description: 'Broadcast invalid block proposals with corrupted state (for testing only)',
140
148
  ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidBlockProposal)
141
149
  },
150
+ invalidBlockProposalIndexWithinCheckpoint: {
151
+ description: 'Broadcast an invalid block proposal only at this indexWithinCheckpoint (for testing only)',
152
+ ...optionalNumberConfigHelper()
153
+ },
154
+ broadcastInvalidCheckpointProposalOnly: {
155
+ description: 'Broadcast invalid checkpoint proposals while keeping the underlying block proposals valid (for testing only). When unset, the checkpoint follows broadcastInvalidBlockProposal.',
156
+ ...booleanConfigHelper(DefaultSequencerConfig.broadcastInvalidCheckpointProposalOnly)
157
+ },
142
158
  injectFakeAttestation: {
143
159
  description: 'Inject a fake attestation (for testing only)',
144
160
  ...booleanConfigHelper(DefaultSequencerConfig.injectFakeAttestation)
@@ -178,18 +194,29 @@ export const sequencerConfigMappings = {
178
194
  description: 'Percent probability (0 - 100) of sequencer skipping checkpoint publishing (testing only)',
179
195
  ...numberConfigHelper(DefaultSequencerConfig.skipPublishingCheckpointsPercent)
180
196
  },
197
+ skipBroadcastProposals: {
198
+ description: 'Skip broadcasting checkpoint and block proposals via gossipsub when proposer (for testing only)',
199
+ ...booleanConfigHelper(false)
200
+ },
201
+ skipBroadcastCheckpointProposal: {
202
+ description: 'Skip broadcasting only the CheckpointProposal via gossipsub when proposer; the held last block is broadcast ' + 'standalone instead so peers still receive it as a proposed-but-uncheckpointed tip (for testing only)',
203
+ ...booleanConfigHelper(false)
204
+ },
205
+ pauseProposingForSlots: {
206
+ description: 'List of slots for which the sequencer will not produce a proposal (for testing only). Attestation paths are unaffected.'
207
+ },
181
208
  ...pickConfigMappings(p2pConfigMappings, [
182
209
  'txPublicSetupAllowListExtend'
183
210
  ])
184
211
  };
185
212
  export const sequencerClientConfigMappings = {
213
+ ...chainConfigMappings,
186
214
  ...validatorClientConfigMappings,
187
215
  ...sequencerConfigMappings,
188
216
  ...keyStoreConfigMappings,
189
217
  ...l1ReaderConfigMappings,
190
218
  ...sequencerTxSenderConfigMappings,
191
219
  ...sequencerPublisherConfigMappings,
192
- ...chainConfigMappings,
193
220
  ...pickConfigMappings(l1ContractsConfigMappings, [
194
221
  'ethereumSlotDuration',
195
222
  'aztecSlotDuration',
@@ -0,0 +1,37 @@
1
+ import { type RollupContract } from '@aztec/ethereum/contracts';
2
+ import type { DateProvider } from '@aztec/foundation/timer';
3
+ import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
4
+ /**
5
+ * Predicts min fees for LAG upcoming slots based on the L1 oracle state.
6
+ * A new oracle update can activate at startSlot + LAG, so only the first LAG entries
7
+ * are guaranteed stable. Caches L1 queries per L1 block and recomputes predictions
8
+ * for each mana usage estimate.
9
+ */
10
+ export declare class FeePredictor {
11
+ private readonly rollupContract;
12
+ private readonly publicClient;
13
+ private readonly dateProvider;
14
+ private cachedState;
15
+ private cachedL1BlockNumber;
16
+ private readonly slotDuration;
17
+ private readonly l1GenesisTime;
18
+ private readonly ethereumSlotDuration;
19
+ constructor(rollupContract: RollupContract, publicClient: {
20
+ getBlockNumber: (opts?: {
21
+ cacheTime?: number;
22
+ }) => Promise<bigint>;
23
+ }, dateProvider: DateProvider, config: {
24
+ slotDuration: number;
25
+ l1GenesisTime: bigint;
26
+ ethereumSlotDuration: number;
27
+ });
28
+ /** Returns predicted min fees for each slot in the prediction window. */
29
+ getPredictedMinFees(manaUsage: ManaUsageEstimate): Promise<GasFees[]>;
30
+ private getState;
31
+ private fetchState;
32
+ /** Computes per-slot fee predictions given cached state and a mana usage assumption. */
33
+ private computePredictions;
34
+ private getAssumedManaUsed;
35
+ private computeGasFees;
36
+ }
37
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3ByZWRpY3Rvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dsb2JhbF92YXJpYWJsZV9idWlsZGVyL2ZlZV9wcmVkaWN0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFvRCxLQUFLLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBR2xILE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTVELE9BQU8sRUFFTCxPQUFPLEVBRVAsaUJBQWlCLEVBR2xCLE1BQU0sbUJBQW1CLENBQUM7QUFlM0I7Ozs7O0dBS0c7QUFDSCxxQkFBYSxZQUFZO0lBU3JCLE9BQU8sQ0FBQyxRQUFRLENBQUMsY0FBYztJQUMvQixPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxXQUFXLENBQXNDO0lBQ3pELE9BQU8sQ0FBQyxtQkFBbUIsQ0FBcUI7SUFFaEQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQVM7SUFDdEMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFDdkMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBUztJQUU5QyxZQUNtQixjQUFjLEVBQUUsY0FBYyxFQUM5QixZQUFZLEVBQUU7UUFBRSxjQUFjLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUFFLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtTQUFFLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0tBQUUsRUFDcEYsWUFBWSxFQUFFLFlBQVksRUFDM0MsTUFBTSxFQUFFO1FBQUUsWUFBWSxFQUFFLE1BQU0sQ0FBQztRQUFDLGFBQWEsRUFBRSxNQUFNLENBQUM7UUFBQyxvQkFBb0IsRUFBRSxNQUFNLENBQUE7S0FBRSxFQUt0RjtJQUVELHlFQUF5RTtJQUNuRSxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRzFFO1lBR2EsUUFBUTtZQVNSLFVBQVU7SUFpRHhCLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsa0JBQWtCO0lBdUIxQixPQUFPLENBQUMsa0JBQWtCO0lBVzFCLE9BQU8sQ0FBQyxjQUFjO0NBbUJ2QiJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fee_predictor.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_predictor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoD,KAAK,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAGlH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAEL,OAAO,EAEP,iBAAiB,EAGlB,MAAM,mBAAmB,CAAC;AAe3B;;;;;GAKG;AACH,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAE9C,YACmB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE;QAAE,cAAc,EAAE,CAAC,IAAI,CAAC,EAAE;YAAE,SAAS,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,EACpF,YAAY,EAAE,YAAY,EAC3C,MAAM,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EAKtF;IAED,yEAAyE;IACnE,mBAAmB,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAG1E;YAGa,QAAQ;YASR,UAAU;IAiDxB,wFAAwF;IACxF,OAAO,CAAC,kBAAkB;IAuB1B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;CAmBvB"}
@@ -0,0 +1,128 @@
1
+ import { MAX_FEE_ASSET_PRICE_MODIFIER_BPS } from '@aztec/ethereum/contracts';
2
+ import { SlotNumber } from '@aztec/foundation/branded-types';
3
+ import { times } from '@aztec/foundation/collection';
4
+ import { getSlotAtNextL1Block, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
5
+ import { FEE_ORACLE_LAG, GasFees, MIN_ETH_PER_FEE_ASSET, ManaUsageEstimate, computeExcessMana, computeManaMinFee } from '@aztec/stdlib/gas';
6
+ /**
7
+ * Predicts min fees for LAG upcoming slots based on the L1 oracle state.
8
+ * A new oracle update can activate at startSlot + LAG, so only the first LAG entries
9
+ * are guaranteed stable. Caches L1 queries per L1 block and recomputes predictions
10
+ * for each mana usage estimate.
11
+ */ export class FeePredictor {
12
+ rollupContract;
13
+ publicClient;
14
+ dateProvider;
15
+ cachedState;
16
+ cachedL1BlockNumber;
17
+ slotDuration;
18
+ l1GenesisTime;
19
+ ethereumSlotDuration;
20
+ constructor(rollupContract, publicClient, dateProvider, config){
21
+ this.rollupContract = rollupContract;
22
+ this.publicClient = publicClient;
23
+ this.dateProvider = dateProvider;
24
+ this.slotDuration = config.slotDuration;
25
+ this.l1GenesisTime = config.l1GenesisTime;
26
+ this.ethereumSlotDuration = config.ethereumSlotDuration;
27
+ }
28
+ /** Returns predicted min fees for each slot in the prediction window. */ async getPredictedMinFees(manaUsage) {
29
+ const state = await this.getState();
30
+ return this.computePredictions(state, manaUsage);
31
+ }
32
+ /** Fetches and caches rollup state. Refreshes when L1 block number advances. */ async getState() {
33
+ const blockNumber = await this.publicClient.getBlockNumber({
34
+ cacheTime: 0
35
+ });
36
+ if (this.cachedL1BlockNumber === undefined || blockNumber > this.cachedL1BlockNumber) {
37
+ this.cachedL1BlockNumber = blockNumber;
38
+ this.cachedState = this.fetchState(blockNumber);
39
+ }
40
+ return this.cachedState;
41
+ }
42
+ async fetchState(blockNumber) {
43
+ // Pin all non-constant queries to this L1 block number for a consistent snapshot.
44
+ const opts = {
45
+ blockNumber
46
+ };
47
+ // Cached constants don't need pinning
48
+ const [manaTarget, manaLimit, provingCostPerManaEth, epochDuration] = await Promise.all([
49
+ this.rollupContract.getManaTarget(),
50
+ this.rollupContract.getManaLimit(),
51
+ this.rollupContract.getProvingCostPerMana(),
52
+ this.rollupContract.getEpochDuration()
53
+ ]);
54
+ // First, compute the earliest possible nextSlot independently of the checkpoint, so we can
55
+ // evaluate pruneability at the prediction start timestamp instead of the current L1 block time.
56
+ // This avoids an epoch-boundary edge case where the effective parent differs between now and nextSlot.
57
+ const slotConfig = {
58
+ slotDuration: this.slotDuration,
59
+ l1GenesisTime: this.l1GenesisTime
60
+ };
61
+ const currentSlot = await this.rollupContract.getSlotNumber(opts);
62
+ const slotAtNextL1Block = getSlotAtNextL1Block(BigInt(this.dateProvider.nowInSeconds()), {
63
+ l1GenesisTime: this.l1GenesisTime,
64
+ slotDuration: this.slotDuration,
65
+ ethereumSlotDuration: this.ethereumSlotDuration
66
+ });
67
+ const preliminaryNextSlot = SlotNumber(Math.max(currentSlot, slotAtNextL1Block));
68
+ const nextSlotTimestamp = getTimestampForSlot(preliminaryNextSlot, slotConfig);
69
+ // Resolve the effective checkpoint at the prediction start timestamp
70
+ const lastCheckpoint = await this.rollupContract.getEffectivePendingCheckpoint(nextSlotTimestamp, opts);
71
+ const lastSlot = lastCheckpoint.slotNumber;
72
+ // Refine nextSlot: also account for the slot after the last checkpoint
73
+ const nextSlot = SlotNumber(Math.max(SlotNumber.add(lastSlot, 1), preliminaryNextSlot));
74
+ const feeHeader = lastCheckpoint.feeHeader;
75
+ const slotCount = FEE_ORACLE_LAG;
76
+ const timestamps = times(slotCount, (i)=>getTimestampForSlot(SlotNumber.add(nextSlot, i), slotConfig));
77
+ const l1FeesBySlot = await Promise.all(timestamps.map((ts)=>this.rollupContract.getL1FeesAt(ts, opts)));
78
+ return {
79
+ lastSlot,
80
+ excessMana: computeExcessMana(feeHeader.excessMana, feeHeader.manaUsed, manaTarget),
81
+ ethPerFeeAsset: feeHeader.ethPerFeeAsset,
82
+ manaTarget,
83
+ manaLimit,
84
+ provingCostPerManaEth,
85
+ epochDuration: BigInt(epochDuration),
86
+ l1FeesBySlot
87
+ };
88
+ }
89
+ /** Computes per-slot fee predictions given cached state and a mana usage assumption. */ computePredictions(state, manaUsage) {
90
+ const assumedManaUsed = this.getAssumedManaUsed(state, manaUsage);
91
+ const result = [];
92
+ let { excessMana } = state;
93
+ let { ethPerFeeAsset } = state;
94
+ // Slot 0: current state (next available slot after last checkpoint)
95
+ result.push(this.computeGasFees(state, excessMana, ethPerFeeAsset, state.l1FeesBySlot[0]));
96
+ // Slots 1..LAG-1: advance excessMana with the assumed mana usage per checkpoint,
97
+ // and decay ethPerFeeAsset by MAX_FEE_ASSET_PRICE_MODIFIER_BPS per slot for conservative estimates.
98
+ // Lower ethPerFeeAsset means higher fees in fee asset terms.
99
+ for(let i = 1; i < state.l1FeesBySlot.length; i++){
100
+ excessMana = computeExcessMana(excessMana, assumedManaUsed, state.manaTarget);
101
+ const decayed = ethPerFeeAsset * (10000n - MAX_FEE_ASSET_PRICE_MODIFIER_BPS) / 10000n;
102
+ ethPerFeeAsset = decayed < MIN_ETH_PER_FEE_ASSET ? MIN_ETH_PER_FEE_ASSET : decayed;
103
+ result.push(this.computeGasFees(state, excessMana, ethPerFeeAsset, state.l1FeesBySlot[i]));
104
+ }
105
+ return result;
106
+ }
107
+ getAssumedManaUsed(state, manaUsage) {
108
+ switch(manaUsage){
109
+ case ManaUsageEstimate.None:
110
+ return 0n;
111
+ case ManaUsageEstimate.Target:
112
+ return state.manaTarget;
113
+ case ManaUsageEstimate.Limit:
114
+ return state.manaLimit;
115
+ }
116
+ }
117
+ computeGasFees(state, excessMana, ethPerFeeAsset, l1Fees) {
118
+ return new GasFees(0, computeManaMinFee({
119
+ l1BaseFee: l1Fees.baseFee,
120
+ l1BlobFee: l1Fees.blobFee,
121
+ manaTarget: state.manaTarget,
122
+ epochDuration: state.epochDuration,
123
+ provingCostPerManaEth: state.provingCostPerManaEth,
124
+ excessMana,
125
+ ethPerFeeAsset
126
+ }));
127
+ }
128
+ }
@@ -0,0 +1,21 @@
1
+ import type { ViemPublicClient } from '@aztec/ethereum/types';
2
+ import type { DateProvider } from '@aztec/foundation/timer';
3
+ import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
4
+ import type { FeeProvider } from '@aztec/stdlib/tx';
5
+ import type { GlobalVariableBuilderConfig } from './global_builder.js';
6
+ /** Provides current and predicted fee information based on on-chain state. */
7
+ export declare class FeeProviderImpl implements FeeProvider {
8
+ private readonly dateProvider;
9
+ private readonly publicClient;
10
+ private currentMinFees;
11
+ private currentL1BlockNumber;
12
+ private readonly rollupContract;
13
+ private readonly feePredictor;
14
+ private readonly ethereumSlotDuration;
15
+ private readonly l1GenesisTime;
16
+ constructor(dateProvider: DateProvider, publicClient: ViemPublicClient, config: GlobalVariableBuilderConfig);
17
+ private computeCurrentMinFees;
18
+ getCurrentMinFees(): Promise<GasFees>;
19
+ getPredictedMinFees(manaUsage?: ManaUsageEstimate): Promise<GasFees[]>;
20
+ }
21
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIvZmVlX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFNUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFdkUsOEVBQThFO0FBQzlFLHFCQUFhLGVBQWdCLFlBQVcsV0FBVztJQVUvQyxPQUFPLENBQUMsUUFBUSxDQUFDLFlBQVk7SUFDN0IsT0FBTyxDQUFDLFFBQVEsQ0FBQyxZQUFZO0lBVi9CLE9BQU8sQ0FBQyxjQUFjLENBQXdEO0lBQzlFLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBaUM7SUFFN0QsT0FBTyxDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQWlCO0lBQ2hELE9BQU8sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFlO0lBQzVDLE9BQU8sQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQVM7SUFDOUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQVM7SUFFdkMsWUFDbUIsWUFBWSxFQUFFLFlBQVksRUFDMUIsWUFBWSxFQUFFLGdCQUFnQixFQUMvQyxNQUFNLEVBQUUsMkJBQTJCLEVBV3BDO1lBTWEscUJBQXFCO0lBa0J0QixpQkFBaUIsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLENBVWpEO0lBRU0sbUJBQW1CLENBQUMsU0FBUyxDQUFDLEVBQUUsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBRTVFO0NBQ0YifQ==
@@ -0,0 +1 @@
1
+ {"version":3,"file":"fee_provider.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/fee_provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAEvE,8EAA8E;AAC9E,qBAAa,eAAgB,YAAW,WAAW;IAU/C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAV/B,OAAO,CAAC,cAAc,CAAwD;IAC9E,OAAO,CAAC,oBAAoB,CAAiC;IAE7D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAS;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IAEvC,YACmB,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,gBAAgB,EAC/C,MAAM,EAAE,2BAA2B,EAWpC;YAMa,qBAAqB;IAkBtB,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUjD;IAEM,mBAAmB,CAAC,SAAS,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAE5E;CACF"}
@@ -0,0 +1,58 @@
1
+ import { RollupContract } from '@aztec/ethereum/contracts';
2
+ import { SlotNumber } from '@aztec/foundation/branded-types';
3
+ import { getNextL1SlotTimestamp } from '@aztec/stdlib/epoch-helpers';
4
+ import { GasFees, ManaUsageEstimate } from '@aztec/stdlib/gas';
5
+ import { FeePredictor } from './fee_predictor.js';
6
+ /** Provides current and predicted fee information based on on-chain state. */ export class FeeProviderImpl {
7
+ dateProvider;
8
+ publicClient;
9
+ currentMinFees;
10
+ currentL1BlockNumber;
11
+ rollupContract;
12
+ feePredictor;
13
+ ethereumSlotDuration;
14
+ l1GenesisTime;
15
+ constructor(dateProvider, publicClient, config){
16
+ this.dateProvider = dateProvider;
17
+ this.publicClient = publicClient;
18
+ this.currentMinFees = Promise.resolve(new GasFees(0, 0));
19
+ this.currentL1BlockNumber = undefined;
20
+ this.ethereumSlotDuration = config.ethereumSlotDuration;
21
+ this.l1GenesisTime = config.l1GenesisTime;
22
+ this.rollupContract = new RollupContract(this.publicClient, config.rollupAddress);
23
+ this.feePredictor = new FeePredictor(this.rollupContract, this.publicClient, this.dateProvider, {
24
+ slotDuration: config.slotDuration,
25
+ l1GenesisTime: config.l1GenesisTime,
26
+ ethereumSlotDuration: config.ethereumSlotDuration
27
+ });
28
+ }
29
+ /**
30
+ * Computes the "current" min fees, e.g., the price that you currently should pay to get include in the next block
31
+ * @returns Min fees for the next block
32
+ */ async computeCurrentMinFees() {
33
+ // Since this might be called in the middle of a slot where a block might have been published,
34
+ // we need to fetch the last block written, and estimate the earliest timestamp for the next block.
35
+ // The timestamp of that last block will act as a lower bound for the next block.
36
+ const lastCheckpoint = await this.rollupContract.getPendingCheckpoint();
37
+ const earliestTimestamp = await this.rollupContract.getTimestampForSlot(SlotNumber.fromBigInt(BigInt(lastCheckpoint.slotNumber) + 1n));
38
+ const nextEthTimestamp = getNextL1SlotTimestamp(this.dateProvider.nowInSeconds(), {
39
+ l1GenesisTime: this.l1GenesisTime,
40
+ ethereumSlotDuration: this.ethereumSlotDuration
41
+ });
42
+ const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
43
+ return new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
44
+ }
45
+ async getCurrentMinFees() {
46
+ // Get the current block number
47
+ const blockNumber = await this.publicClient.getBlockNumber();
48
+ // If the L1 block number has changed then chain a new promise to get the current min fees
49
+ if (this.currentL1BlockNumber === undefined || blockNumber > this.currentL1BlockNumber) {
50
+ this.currentL1BlockNumber = blockNumber;
51
+ this.currentMinFees = this.currentMinFees.then(()=>this.computeCurrentMinFees());
52
+ }
53
+ return this.currentMinFees;
54
+ }
55
+ getPredictedMinFees(manaUsage) {
56
+ return this.feePredictor.getPredictedMinFees(manaUsage ?? ManaUsageEstimate.Target);
57
+ }
58
+ }