@aztec/prover-client 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

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 (113) hide show
  1. package/dest/config.d.ts +1 -1
  2. package/dest/config.d.ts.map +1 -1
  3. package/dest/config.js +16 -2
  4. package/dest/light/lightweight_checkpoint_builder.d.ts +10 -5
  5. package/dest/light/lightweight_checkpoint_builder.d.ts.map +1 -1
  6. package/dest/light/lightweight_checkpoint_builder.js +56 -23
  7. package/dest/mocks/test_context.d.ts +11 -11
  8. package/dest/mocks/test_context.d.ts.map +1 -1
  9. package/dest/mocks/test_context.js +30 -30
  10. package/dest/orchestrator/block-building-helpers.d.ts +4 -4
  11. package/dest/orchestrator/block-building-helpers.d.ts.map +1 -1
  12. package/dest/orchestrator/block-building-helpers.js +2 -2
  13. package/dest/orchestrator/block-proving-state.d.ts +4 -1
  14. package/dest/orchestrator/block-proving-state.d.ts.map +1 -1
  15. package/dest/orchestrator/block-proving-state.js +7 -0
  16. package/dest/orchestrator/checkpoint-proving-state.d.ts +20 -36
  17. package/dest/orchestrator/checkpoint-proving-state.d.ts.map +1 -1
  18. package/dest/orchestrator/checkpoint-proving-state.js +22 -120
  19. package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts +161 -0
  20. package/dest/orchestrator/checkpoint-sub-tree-orchestrator.d.ts.map +1 -0
  21. package/dest/orchestrator/{orchestrator.js → checkpoint-sub-tree-orchestrator.js} +285 -462
  22. package/dest/orchestrator/chonk-cache.d.ts +39 -0
  23. package/dest/orchestrator/chonk-cache.d.ts.map +1 -0
  24. package/dest/orchestrator/chonk-cache.js +80 -0
  25. package/dest/orchestrator/index.d.ts +4 -2
  26. package/dest/orchestrator/index.d.ts.map +1 -1
  27. package/dest/orchestrator/index.js +3 -1
  28. package/dest/orchestrator/proving-scheduler.d.ts +81 -0
  29. package/dest/orchestrator/proving-scheduler.d.ts.map +1 -0
  30. package/dest/orchestrator/proving-scheduler.js +120 -0
  31. package/dest/orchestrator/top-tree-orchestrator.d.ts +88 -0
  32. package/dest/orchestrator/top-tree-orchestrator.d.ts.map +1 -0
  33. package/dest/orchestrator/top-tree-orchestrator.js +232 -0
  34. package/dest/orchestrator/top-tree-proving-state.d.ts +61 -0
  35. package/dest/orchestrator/top-tree-proving-state.d.ts.map +1 -0
  36. package/dest/orchestrator/top-tree-proving-state.js +185 -0
  37. package/dest/orchestrator/tx-proving-state.d.ts +3 -3
  38. package/dest/orchestrator/tx-proving-state.d.ts.map +1 -1
  39. package/dest/prover-client/prover-client.d.ts +62 -5
  40. package/dest/prover-client/prover-client.d.ts.map +1 -1
  41. package/dest/prover-client/prover-client.js +54 -7
  42. package/dest/proving_broker/broker_prover_facade.d.ts +3 -3
  43. package/dest/proving_broker/broker_prover_facade.d.ts.map +1 -1
  44. package/dest/proving_broker/broker_prover_facade.js +26 -20
  45. package/dest/proving_broker/config.d.ts +9 -73
  46. package/dest/proving_broker/config.d.ts.map +1 -1
  47. package/dest/proving_broker/config.js +3 -3
  48. package/dest/proving_broker/index.d.ts +2 -1
  49. package/dest/proving_broker/index.d.ts.map +1 -1
  50. package/dest/proving_broker/index.js +1 -0
  51. package/dest/proving_broker/proving_broker.d.ts +3 -2
  52. package/dest/proving_broker/proving_broker.d.ts.map +1 -1
  53. package/dest/proving_broker/proving_broker.js +217 -70
  54. package/dest/proving_broker/proving_broker_database/memory.d.ts +5 -2
  55. package/dest/proving_broker/proving_broker_database/memory.d.ts.map +1 -1
  56. package/dest/proving_broker/proving_broker_database/memory.js +14 -1
  57. package/dest/proving_broker/proving_broker_database/persisted.d.ts +15 -2
  58. package/dest/proving_broker/proving_broker_database/persisted.d.ts.map +1 -1
  59. package/dest/proving_broker/proving_broker_database/persisted.js +57 -6
  60. package/dest/proving_broker/proving_broker_database.d.ts +27 -1
  61. package/dest/proving_broker/proving_broker_database.d.ts.map +1 -1
  62. package/dest/proving_broker/proving_broker_instrumentation.d.ts +3 -1
  63. package/dest/proving_broker/proving_broker_instrumentation.d.ts.map +1 -1
  64. package/dest/proving_broker/proving_broker_instrumentation.js +7 -0
  65. package/dest/proving_broker/rpc.d.ts +3 -1
  66. package/dest/proving_broker/rpc.d.ts.map +1 -1
  67. package/dest/proving_broker/rpc.js +80 -24
  68. package/dest/test/epoch_settlement.d.ts +36 -0
  69. package/dest/test/epoch_settlement.d.ts.map +1 -0
  70. package/dest/test/epoch_settlement.js +52 -0
  71. package/dest/test/index.d.ts +2 -0
  72. package/dest/test/index.d.ts.map +1 -0
  73. package/dest/test/index.js +1 -0
  74. package/dest/test/mock_prover.d.ts +4 -4
  75. package/dest/test/mock_prover.js +2 -2
  76. package/package.json +20 -20
  77. package/src/config.ts +18 -2
  78. package/src/light/lightweight_checkpoint_builder.ts +58 -25
  79. package/src/mocks/test_context.ts +26 -43
  80. package/src/orchestrator/block-building-helpers.ts +2 -2
  81. package/src/orchestrator/block-proving-state.ts +9 -0
  82. package/src/orchestrator/checkpoint-proving-state.ts +21 -162
  83. package/src/orchestrator/checkpoint-sub-tree-orchestrator.ts +1044 -0
  84. package/src/orchestrator/chonk-cache.ts +99 -0
  85. package/src/orchestrator/index.ts +8 -1
  86. package/src/orchestrator/proving-scheduler.ts +160 -0
  87. package/src/orchestrator/top-tree-orchestrator.ts +384 -0
  88. package/src/orchestrator/top-tree-proving-state.ts +219 -0
  89. package/src/orchestrator/tx-proving-state.ts +3 -3
  90. package/src/prover-client/prover-client.ts +129 -18
  91. package/src/proving_broker/broker_prover_facade.ts +29 -23
  92. package/src/proving_broker/config.ts +3 -2
  93. package/src/proving_broker/index.ts +1 -0
  94. package/src/proving_broker/proving_broker.ts +208 -72
  95. package/src/proving_broker/proving_broker_database/memory.ts +16 -2
  96. package/src/proving_broker/proving_broker_database/persisted.ts +71 -8
  97. package/src/proving_broker/proving_broker_database.ts +30 -0
  98. package/src/proving_broker/proving_broker_instrumentation.ts +9 -0
  99. package/src/proving_broker/rpc.ts +36 -24
  100. package/src/test/epoch_settlement.ts +82 -0
  101. package/src/test/index.ts +1 -0
  102. package/src/test/mock_prover.ts +2 -2
  103. package/dest/orchestrator/epoch-proving-state.d.ts +0 -75
  104. package/dest/orchestrator/epoch-proving-state.d.ts.map +0 -1
  105. package/dest/orchestrator/epoch-proving-state.js +0 -267
  106. package/dest/orchestrator/orchestrator.d.ts +0 -128
  107. package/dest/orchestrator/orchestrator.d.ts.map +0 -1
  108. package/dest/prover-client/server-epoch-prover.d.ts +0 -32
  109. package/dest/prover-client/server-epoch-prover.d.ts.map +0 -1
  110. package/dest/prover-client/server-epoch-prover.js +0 -40
  111. package/src/orchestrator/epoch-proving-state.ts +0 -378
  112. package/src/orchestrator/orchestrator.ts +0 -1281
  113. package/src/prover-client/server-epoch-prover.ts +0 -69
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/prover-client",
3
- "version": "0.0.1-commit.f2ce05ee",
3
+ "version": "0.0.1-commit.f5a9928",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -9,7 +9,8 @@
9
9
  "./orchestrator": "./dest/orchestrator/index.js",
10
10
  "./helpers": "./dest/orchestrator/block-building-helpers.js",
11
11
  "./light": "./dest/light/index.js",
12
- "./config": "./dest/config.js"
12
+ "./config": "./dest/config.js",
13
+ "./test": "./dest/test/index.js"
13
14
  },
14
15
  "typedocOptions": {
15
16
  "entryPoints": [
@@ -27,8 +28,8 @@
27
28
  "build:dev": "../scripts/tsc.sh --watch",
28
29
  "clean": "rm -rf ./dest .tsbuildinfo",
29
30
  "bb": "node --no-warnings ./dest/bb/index.js",
30
- "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=3500000 --forceExit",
31
- "test:debug": "LOG_LEVEL=debug NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=1500000 --forceExit --testNamePattern prover/bb_prover/parity"
31
+ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=3500000",
32
+ "test:debug": "LOG_LEVEL=\"debug; info: json-rpc, simulator\" NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=1500000 --testNamePattern prover/bb_prover/parity"
32
33
  },
33
34
  "jest": {
34
35
  "moduleNameMapper": {
@@ -68,29 +69,28 @@
68
69
  ]
69
70
  },
70
71
  "dependencies": {
71
- "@aztec/bb-prover": "0.0.1-commit.f2ce05ee",
72
- "@aztec/blob-lib": "0.0.1-commit.f2ce05ee",
73
- "@aztec/constants": "0.0.1-commit.f2ce05ee",
74
- "@aztec/ethereum": "0.0.1-commit.f2ce05ee",
75
- "@aztec/foundation": "0.0.1-commit.f2ce05ee",
76
- "@aztec/kv-store": "0.0.1-commit.f2ce05ee",
77
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f2ce05ee",
78
- "@aztec/noir-types": "0.0.1-commit.f2ce05ee",
79
- "@aztec/protocol-contracts": "0.0.1-commit.f2ce05ee",
80
- "@aztec/simulator": "0.0.1-commit.f2ce05ee",
81
- "@aztec/stdlib": "0.0.1-commit.f2ce05ee",
82
- "@aztec/telemetry-client": "0.0.1-commit.f2ce05ee",
83
- "@aztec/world-state": "0.0.1-commit.f2ce05ee",
84
- "@google-cloud/storage": "^7.15.0",
72
+ "@aztec/bb-prover": "0.0.1-commit.f5a9928",
73
+ "@aztec/blob-lib": "0.0.1-commit.f5a9928",
74
+ "@aztec/constants": "0.0.1-commit.f5a9928",
75
+ "@aztec/ethereum": "0.0.1-commit.f5a9928",
76
+ "@aztec/foundation": "0.0.1-commit.f5a9928",
77
+ "@aztec/kv-store": "0.0.1-commit.f5a9928",
78
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f5a9928",
79
+ "@aztec/noir-types": "0.0.1-commit.f5a9928",
80
+ "@aztec/protocol-contracts": "0.0.1-commit.f5a9928",
81
+ "@aztec/simulator": "0.0.1-commit.f5a9928",
82
+ "@aztec/stdlib": "0.0.1-commit.f5a9928",
83
+ "@aztec/telemetry-client": "0.0.1-commit.f5a9928",
84
+ "@aztec/world-state": "0.0.1-commit.f5a9928",
85
85
  "@iarna/toml": "^2.2.5",
86
86
  "commander": "^12.1.0",
87
87
  "lodash.chunk": "^4.2.0",
88
88
  "source-map-support": "^0.5.21",
89
89
  "tslib": "^2.4.0",
90
- "zod": "^3.23.8"
90
+ "zod": "^4"
91
91
  },
92
92
  "devDependencies": {
93
- "@aztec/noir-contracts.js": "0.0.1-commit.f2ce05ee",
93
+ "@aztec/noir-contracts.js": "0.0.1-commit.f5a9928",
94
94
  "@jest/globals": "^30.0.0",
95
95
  "@types/jest": "^30.0.0",
96
96
  "@types/node": "^22.15.17",
package/src/config.ts CHANGED
@@ -44,14 +44,30 @@ export const bbConfigMappings: ConfigMappingsType<BBConfig & ACVMConfig> = {
44
44
  },
45
45
  numConcurrentIVCVerifiers: {
46
46
  env: 'BB_NUM_IVC_VERIFIERS',
47
- description: 'Max number of chonk verifiers to run concurrently',
47
+ description: 'Max concurrent verifications for the RPC verifier (QueuedIVCVerifier).',
48
48
  ...numberConfigHelper(8),
49
49
  },
50
50
  bbIVCConcurrency: {
51
51
  env: 'BB_IVC_CONCURRENCY',
52
- description: 'Number of threads to use for IVC verification',
52
+ description: 'Thread count for the RPC IVC verifier.',
53
53
  ...numberConfigHelper(1),
54
54
  },
55
+ bbChonkVerifyMaxBatch: {
56
+ env: 'BB_CHONK_VERIFY_MAX_BATCH',
57
+ description:
58
+ 'Upper bound on proofs per batch for the peer chonk batch verifier. Proofs are verified immediately as they arrive; this only caps how many can accumulate while a batch is already being processed.',
59
+ ...numberConfigHelper(16),
60
+ },
61
+ bbChonkVerifyConcurrency: {
62
+ env: 'BB_CHONK_VERIFY_BATCH_CONCURRENCY',
63
+ description: 'Thread count for the peer batch verifier parallel reduce. 0 = auto.',
64
+ ...numberConfigHelper(6),
65
+ },
66
+ bbDebugOutputDir: {
67
+ env: 'BB_DEBUG_OUTPUT_DIR',
68
+ description:
69
+ 'When set, bb.js operations write input/output files and log equivalent CLI commands to this directory',
70
+ },
55
71
  };
56
72
 
57
73
  export const proverClientConfigMappings: ConfigMappingsType<ProverClientUserConfig> = {
@@ -1,14 +1,14 @@
1
1
  import { SpongeBlob, computeBlobsHashFromBlobs, encodeCheckpointEndMarker, getBlobsPerL1Block } from '@aztec/blob-lib';
2
- import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/constants';
3
2
  import { type CheckpointNumber, IndexWithinCheckpoint } from '@aztec/foundation/branded-types';
4
- import { padArrayEnd } from '@aztec/foundation/collection';
5
3
  import { Fr } from '@aztec/foundation/curves/bn254';
6
4
  import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
5
+ import { elapsed } from '@aztec/foundation/timer';
7
6
  import { L2Block } from '@aztec/stdlib/block';
8
7
  import { Checkpoint } from '@aztec/stdlib/checkpoint';
9
8
  import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
10
9
  import {
11
10
  accumulateCheckpointOutHashes,
11
+ appendL1ToL2MessagesToTree,
12
12
  computeCheckpointOutHash,
13
13
  computeInHashFromL1ToL2Messages,
14
14
  } from '@aztec/stdlib/messaging';
@@ -44,6 +44,7 @@ export class LightweightCheckpointBuilder {
44
44
  constructor(
45
45
  public readonly checkpointNumber: CheckpointNumber,
46
46
  public readonly constants: CheckpointGlobalVariables,
47
+ public feeAssetPriceModifier: bigint,
47
48
  public readonly l1ToL2Messages: Fr[],
48
49
  private readonly previousCheckpointOutHashes: Fr[],
49
50
  public readonly db: MerkleTreeWriteOperations,
@@ -54,7 +55,7 @@ export class LightweightCheckpointBuilder {
54
55
  instanceId: `checkpoint-${checkpointNumber}`,
55
56
  });
56
57
  this.spongeBlob = SpongeBlob.init();
57
- this.logger.debug('Starting new checkpoint', { constants, l1ToL2Messages });
58
+ this.logger.debug('Starting new checkpoint', { constants, l1ToL2Messages, feeAssetPriceModifier });
58
59
  }
59
60
 
60
61
  static async startNewCheckpoint(
@@ -64,16 +65,15 @@ export class LightweightCheckpointBuilder {
64
65
  previousCheckpointOutHashes: Fr[],
65
66
  db: MerkleTreeWriteOperations,
66
67
  bindings?: LoggerBindings,
68
+ feeAssetPriceModifier: bigint = 0n,
67
69
  ): Promise<LightweightCheckpointBuilder> {
68
70
  // Insert l1-to-l2 messages into the tree.
69
- await db.appendLeaves(
70
- MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
71
- padArrayEnd<Fr, number>(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP),
72
- );
71
+ await appendL1ToL2MessagesToTree(db, l1ToL2Messages);
73
72
 
74
73
  return new LightweightCheckpointBuilder(
75
74
  checkpointNumber,
76
75
  constants,
76
+ feeAssetPriceModifier,
77
77
  l1ToL2Messages,
78
78
  previousCheckpointOutHashes,
79
79
  db,
@@ -90,6 +90,7 @@ export class LightweightCheckpointBuilder {
90
90
  static async resumeCheckpoint(
91
91
  checkpointNumber: CheckpointNumber,
92
92
  constants: CheckpointGlobalVariables,
93
+ feeAssetPriceModifier: bigint,
93
94
  l1ToL2Messages: Fr[],
94
95
  previousCheckpointOutHashes: Fr[],
95
96
  db: MerkleTreeWriteOperations,
@@ -99,6 +100,7 @@ export class LightweightCheckpointBuilder {
99
100
  const builder = new LightweightCheckpointBuilder(
100
101
  checkpointNumber,
101
102
  constants,
103
+ feeAssetPriceModifier,
102
104
  l1ToL2Messages,
103
105
  previousCheckpointOutHashes,
104
106
  db,
@@ -111,6 +113,10 @@ export class LightweightCheckpointBuilder {
111
113
  blockNumbers: existingBlocks.map(b => b.header.getBlockNumber()),
112
114
  });
113
115
 
116
+ if (existingBlocks.length === 0) {
117
+ throw new Error(`Cannot resume checkpoint ${checkpointNumber} with no existing blocks`);
118
+ }
119
+
114
120
  // Validate block order and consistency
115
121
  for (let i = 1; i < existingBlocks.length; i++) {
116
122
  const prev = existingBlocks[i - 1];
@@ -148,6 +154,10 @@ export class LightweightCheckpointBuilder {
148
154
  return this.blocks.length;
149
155
  }
150
156
 
157
+ public getBlocks() {
158
+ return this.blocks;
159
+ }
160
+
151
161
  /**
152
162
  * Adds a new block to the checkpoint. The tx effects must have already been inserted into the db if
153
163
  * this is called after tx processing, if that's not the case, then set `insertTxsEffects` to true.
@@ -156,7 +166,8 @@ export class LightweightCheckpointBuilder {
156
166
  globalVariables: GlobalVariables,
157
167
  txs: ProcessedTx[],
158
168
  opts: { insertTxsEffects?: boolean; expectedEndState?: StateReference } = {},
159
- ): Promise<L2Block> {
169
+ ): Promise<{ block: L2Block; timings: Record<string, number> }> {
170
+ const timings: Record<string, number> = {};
160
171
  const isFirstBlock = this.blocks.length === 0;
161
172
 
162
173
  // Empty blocks are only allowed as the first block in a checkpoint
@@ -165,7 +176,9 @@ export class LightweightCheckpointBuilder {
165
176
  }
166
177
 
167
178
  if (isFirstBlock) {
168
- this.lastArchives.push(await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
179
+ const [msGetInitialArchive, initialArchive] = await elapsed(() => getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
180
+ this.lastArchives.push(initialArchive);
181
+ timings.getInitialArchive = msGetInitialArchive;
169
182
  }
170
183
 
171
184
  const lastArchive = this.lastArchives.at(-1)!;
@@ -175,12 +188,17 @@ export class LightweightCheckpointBuilder {
175
188
  `Inserting side effects for ${txs.length} txs for block ${globalVariables.blockNumber} into db`,
176
189
  { txs: txs.map(tx => tx.hash.toString()) },
177
190
  );
191
+ let msInsertSideEffects = 0;
178
192
  for (const tx of txs) {
179
- await insertSideEffects(tx, this.db);
193
+ const [ms] = await elapsed(() => insertSideEffects(tx, this.db));
194
+ msInsertSideEffects += ms;
180
195
  }
196
+ timings.insertSideEffects = msInsertSideEffects;
181
197
  }
182
198
 
183
- const endState = await this.db.getStateReference();
199
+ const [msGetEndState, endState] = await elapsed(() => this.db.getStateReference());
200
+ timings.getEndState = msGetEndState;
201
+
184
202
  if (opts.expectedEndState && !endState.equals(opts.expectedEndState)) {
185
203
  this.logger.error('End state after processing txs does not match expected end state', {
186
204
  globalVariables: globalVariables.toInspect(),
@@ -190,26 +208,31 @@ export class LightweightCheckpointBuilder {
190
208
  throw new Error(`End state does not match expected end state when building block ${globalVariables.blockNumber}`);
191
209
  }
192
210
 
193
- const { header, body, blockBlobFields } = await buildHeaderAndBodyFromTxs(
194
- txs,
195
- lastArchive,
196
- endState,
197
- globalVariables,
198
- this.spongeBlob,
199
- isFirstBlock,
211
+ const [msBuildHeaderAndBody, { header, body, blockBlobFields }] = await elapsed(() =>
212
+ buildHeaderAndBodyFromTxs(txs, lastArchive, endState, globalVariables, this.spongeBlob, isFirstBlock),
200
213
  );
214
+ timings.buildHeaderAndBody = msBuildHeaderAndBody;
201
215
 
202
216
  header.state.validate();
203
217
 
204
218
  await this.db.updateArchive(header);
205
- const newArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db);
219
+ const [msUpdateArchive, newArchive] = await elapsed(() => getTreeSnapshot(MerkleTreeId.ARCHIVE, this.db));
220
+ timings.updateArchive = msUpdateArchive;
206
221
  this.lastArchives.push(newArchive);
207
222
 
223
+ const expectedNextLeafIndex = Number(globalVariables.blockNumber) + 1;
224
+ if (newArchive.nextAvailableLeafIndex !== expectedNextLeafIndex) {
225
+ throw new Error(
226
+ `Archive tree next leaf index mismatch after building block ${globalVariables.blockNumber} (expected ${expectedNextLeafIndex} but got ${newArchive.nextAvailableLeafIndex})`,
227
+ );
228
+ }
229
+
208
230
  const indexWithinCheckpoint = IndexWithinCheckpoint(this.blocks.length);
209
231
  const block = new L2Block(newArchive, header, body, this.checkpointNumber, indexWithinCheckpoint);
210
232
  this.blocks.push(block);
211
233
 
212
- await this.spongeBlob.absorb(blockBlobFields);
234
+ const [msSpongeAbsorb] = await elapsed(() => this.spongeBlob.absorb(blockBlobFields));
235
+ timings.spongeAbsorb = msSpongeAbsorb;
213
236
  this.blobFields.push(...blockBlobFields);
214
237
 
215
238
  this.logger.debug(`Built block ${header.getBlockNumber()}`, {
@@ -220,7 +243,7 @@ export class LightweightCheckpointBuilder {
220
243
  txs: block.body.txEffects.map(tx => tx.txHash.toString()),
221
244
  });
222
245
 
223
- return block;
246
+ return { block, timings };
224
247
  }
225
248
 
226
249
  async completeCheckpoint(): Promise<Checkpoint> {
@@ -237,7 +260,7 @@ export class LightweightCheckpointBuilder {
237
260
 
238
261
  const newArchive = this.lastArchives[this.lastArchives.length - 1];
239
262
 
240
- const blobs = getBlobsPerL1Block(this.blobFields);
263
+ const blobs = await getBlobsPerL1Block(this.blobFields);
241
264
  const blobsHash = computeBlobsHashFromBlobs(blobs);
242
265
 
243
266
  const inHash = computeInHashFromL1ToL2Messages(this.l1ToL2Messages);
@@ -248,11 +271,11 @@ export class LightweightCheckpointBuilder {
248
271
  );
249
272
  const epochOutHash = accumulateCheckpointOutHashes([...this.previousCheckpointOutHashes, checkpointOutHash]);
250
273
 
251
- // TODO(palla/mbps): Should we source this from the constants instead?
252
- // timestamp of a checkpoint is the timestamp of the last block in the checkpoint.
274
+ // All blocks in the checkpoint have the same timestamp
253
275
  const timestamp = blocks[blocks.length - 1].timestamp;
254
276
 
255
277
  const totalManaUsed = blocks.reduce((acc, block) => acc.add(block.header.totalManaUsed), Fr.ZERO);
278
+ const accumulatedFees = blocks.reduce((acc, block) => acc.add(block.header.totalFees), Fr.ZERO);
256
279
 
257
280
  const header = CheckpointHeader.from({
258
281
  lastArchiveRoot: this.lastArchives[0].root,
@@ -266,15 +289,25 @@ export class LightweightCheckpointBuilder {
266
289
  feeRecipient,
267
290
  gasFees,
268
291
  totalManaUsed,
292
+ accumulatedFees,
293
+ });
294
+
295
+ this.logger.debug(`Completed checkpoint ${this.checkpointNumber}`, {
296
+ checkpointNumber: this.checkpointNumber,
297
+ headerHash: header.hash().toString(),
298
+ checkpointOutHash: checkpointOutHash.toString(),
299
+ numPreviousCheckpointOutHashes: this.previousCheckpointOutHashes.length,
300
+ ...header.toInspect(),
269
301
  });
270
302
 
271
- return new Checkpoint(newArchive, header, blocks, this.checkpointNumber);
303
+ return new Checkpoint(newArchive, header, blocks, this.checkpointNumber, this.feeAssetPriceModifier);
272
304
  }
273
305
 
274
306
  clone() {
275
307
  const clone = new LightweightCheckpointBuilder(
276
308
  this.checkpointNumber,
277
309
  this.constants,
310
+ this.feeAssetPriceModifier,
278
311
  [...this.l1ToL2Messages],
279
312
  [...this.previousCheckpointOutHashes],
280
313
  this.db,
@@ -5,13 +5,13 @@ import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
5
5
  import { padArrayEnd, times, timesAsync } from '@aztec/foundation/collection';
6
6
  import { Fr } from '@aztec/foundation/curves/bn254';
7
7
  import type { Logger } from '@aztec/foundation/log';
8
+ import { SerialQueue } from '@aztec/foundation/queue';
8
9
  import type { FieldsOf } from '@aztec/foundation/types';
9
10
  import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
10
11
  import { ProtocolContractsList } from '@aztec/protocol-contracts';
11
12
  import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
12
13
  import { PublicDataWrite } from '@aztec/stdlib/avm';
13
14
  import { AztecAddress } from '@aztec/stdlib/aztec-address';
14
- import { EthAddress } from '@aztec/stdlib/block';
15
15
  import type { Checkpoint } from '@aztec/stdlib/checkpoint';
16
16
  import type { MerkleTreeWriteOperations, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
17
17
  import type { CheckpointConstantData } from '@aztec/stdlib/rollup';
@@ -24,6 +24,7 @@ import {
24
24
  StateReference,
25
25
  TreeSnapshots,
26
26
  } from '@aztec/stdlib/tx';
27
+ import type { GenesisData } from '@aztec/stdlib/world-state';
27
28
  import type { MerkleTreeAdminDatabase } from '@aztec/world-state';
28
29
  import { NativeWorldStateService } from '@aztec/world-state/native';
29
30
 
@@ -35,12 +36,21 @@ import {
35
36
  getTreeSnapshot,
36
37
  insertSideEffects,
37
38
  } from '../orchestrator/block-building-helpers.js';
38
- import type { BlockProvingState } from '../orchestrator/block-proving-state.js';
39
- import { ProvingOrchestrator } from '../orchestrator/index.js';
40
39
  import { BrokerCircuitProverFacade } from '../proving_broker/broker_prover_facade.js';
41
40
  import { TestBroker } from '../test/mock_prover.js';
42
41
  import { getEnvironmentConfig, getSimulator, makeCheckpointConstants, makeGlobals } from './fixtures.js';
43
42
 
43
+ /**
44
+ * Builds a started `SerialQueue` for use as an orchestrator's deferred-job queue in
45
+ * tests. Production wires a single shared queue via `ProverClient`; tests that construct
46
+ * orchestrators directly use one of these per orchestrator (or share one).
47
+ */
48
+ export function makeTestDeferredJobQueue(concurrency = 10): SerialQueue {
49
+ const queue = new SerialQueue();
50
+ queue.start(concurrency);
51
+ return queue;
52
+ }
53
+
44
54
  export class TestContext {
45
55
  private headers: Map<number, BlockHeader> = new Map();
46
56
  private checkpoints: Checkpoint[] = [];
@@ -56,7 +66,6 @@ export class TestContext {
56
66
  public prover: ServerCircuitProver,
57
67
  public broker: TestBroker,
58
68
  public brokerProverFacade: BrokerCircuitProverFacade,
59
- public orchestrator: TestProvingOrchestrator,
60
69
  private feePayer: AztecAddress,
61
70
  initialFeePayerBalance: Fr,
62
71
  private directoriesToCleanup: string[],
@@ -65,10 +74,6 @@ export class TestContext {
65
74
  this.feePayerBalance = initialFeePayerBalance;
66
75
  }
67
76
 
68
- public get epochProver() {
69
- return this.orchestrator;
70
- }
71
-
72
77
  static async new(
73
78
  logger: Logger,
74
79
  {
@@ -81,17 +86,16 @@ export class TestContext {
81
86
  ) {
82
87
  const directoriesToCleanup: string[] = [];
83
88
 
84
- const feePayer = AztecAddress.fromNumber(42222);
89
+ const feePayer = AztecAddress.fromNumberUnsafe(42222);
85
90
  const initialFeePayerBalance = new Fr(10n ** 20n);
86
91
  const feePayerSlot = await computeFeePayerBalanceLeafSlot(feePayer);
87
- const prefilledPublicData = [new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)];
92
+ const genesis: GenesisData = {
93
+ prefilledPublicData: [new PublicDataTreeLeaf(feePayerSlot, initialFeePayerBalance)],
94
+ genesisTimestamp: 0n,
95
+ };
88
96
 
89
97
  // Separated dbs for public processor and prover - see public_processor for context
90
- const ws = await NativeWorldStateService.tmp(
91
- /*rollupAddress=*/ undefined,
92
- /*cleanupTmpDir=*/ true,
93
- prefilledPublicData,
94
- );
98
+ const ws = await NativeWorldStateService.tmp(/*rollupAddress=*/ undefined, /*cleanupTmpDir=*/ true, genesis);
95
99
 
96
100
  let localProver: ServerCircuitProver;
97
101
  const config = await getEnvironmentConfig(logger);
@@ -104,8 +108,10 @@ export class TestContext {
104
108
  bbBinaryPath: config.expectedBBPath,
105
109
  bbWorkingDirectory: config.bbWorkingDirectory,
106
110
  bbSkipCleanup: config.bbSkipCleanup,
107
- numConcurrentIVCVerifiers: 2,
111
+ numConcurrentIVCVerifiers: 8,
108
112
  bbIVCConcurrency: 1,
113
+ bbChonkVerifyMaxBatch: 16,
114
+ bbChonkVerifyConcurrency: 6,
109
115
  };
110
116
  localProver = await createProver(bbConfig);
111
117
  }
@@ -116,22 +122,11 @@ export class TestContext {
116
122
 
117
123
  const broker = new TestBroker(proverCount, localProver);
118
124
  const facade = new BrokerCircuitProverFacade(broker);
119
- const orchestrator = new TestProvingOrchestrator(ws, facade, EthAddress.ZERO);
120
125
 
121
126
  await broker.start();
122
127
  facade.start();
123
128
 
124
- return new this(
125
- ws,
126
- localProver,
127
- broker,
128
- facade,
129
- orchestrator,
130
- feePayer,
131
- initialFeePayerBalance,
132
- directoriesToCleanup,
133
- logger,
134
- );
129
+ return new this(ws, localProver, broker, facade, feePayer, initialFeePayerBalance, directoriesToCleanup, logger);
135
130
  }
136
131
 
137
132
  public getFork() {
@@ -250,7 +245,7 @@ export class TestContext {
250
245
  const previousCheckpointOutHashes = this.checkpointOutHashes;
251
246
  const builder = await LightweightCheckpointBuilder.startNewCheckpoint(
252
247
  checkpointNumber,
253
- constants,
248
+ { ...constants, timestamp },
254
249
  l1ToL2Messages,
255
250
  previousCheckpointOutHashes,
256
251
  cleanFork,
@@ -262,7 +257,7 @@ export class TestContext {
262
257
  const txs = blockTxs[i];
263
258
  const state = blockEndStates[i];
264
259
 
265
- const block = await builder.addBlock(blockGlobalVariables[i], txs, {
260
+ const { block } = await builder.addBlock(blockGlobalVariables[i], txs, {
266
261
  expectedEndState: state,
267
262
  insertTxsEffects: true,
268
263
  });
@@ -282,6 +277,7 @@ export class TestContext {
282
277
 
283
278
  return {
284
279
  constants,
280
+ checkpoint,
285
281
  header: checkpoint.header,
286
282
  blocks,
287
283
  l1ToL2Messages,
@@ -349,16 +345,3 @@ export class TestContext {
349
345
  return endStateReference;
350
346
  }
351
347
  }
352
-
353
- class TestProvingOrchestrator extends ProvingOrchestrator {
354
- public isVerifyBuiltBlockAgainstSyncedStateEnabled = false;
355
-
356
- // Disable this check by default, since it requires seeding world state with the block being built
357
- // This is only enabled in some tests with multiple blocks that populate the pending chain via makePendingBlock
358
- protected override verifyBuiltBlockAgainstSyncedState(provingState: BlockProvingState): Promise<void> {
359
- if (this.isVerifyBuiltBlockAgainstSyncedStateEnabled) {
360
- return super.verifyBuiltBlockAgainstSyncedState(provingState);
361
- }
362
- return Promise.resolve();
363
- }
364
- }
@@ -253,8 +253,8 @@ export function getPublicChonkVerifierPrivateInputsFromTx(tx: Tx | ProcessedTx,
253
253
  // Build "hints" as the private inputs for the checkpoint root rollup circuit.
254
254
  // The `blobCommitments` will be accumulated and checked in the root rollup against the `finalBlobChallenges`.
255
255
  // The `blobsHash` will be validated on L1 against the submitted blob data.
256
- export const buildBlobHints = (blobFields: Fr[]) => {
257
- const blobs = getBlobsPerL1Block(blobFields);
256
+ export const buildBlobHints = async (blobFields: Fr[]) => {
257
+ const blobs = await getBlobsPerL1Block(blobFields);
258
258
  const blobCommitments = getBlobCommitmentsFromBlobs(blobs);
259
259
  const blobsHash = computeBlobsHashFromBlobs(blobs);
260
260
  return { blobCommitments, blobs, blobsHash };
@@ -55,6 +55,7 @@ export class BlockProvingState {
55
55
  | ProofState<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>
56
56
  | undefined;
57
57
  private builtBlockHeader: BlockHeader | undefined;
58
+ private builtArchive: AppendOnlyTreeSnapshot | undefined;
58
59
  private endState: StateReference | undefined;
59
60
  private endSpongeBlob: SpongeBlob | undefined;
60
61
  private txs: TxProvingState[] = [];
@@ -232,6 +233,14 @@ export class BlockProvingState {
232
233
  return this.builtBlockHeader;
233
234
  }
234
235
 
236
+ public setBuiltArchive(archive: AppendOnlyTreeSnapshot) {
237
+ this.builtArchive = archive;
238
+ }
239
+
240
+ public getBuiltArchive() {
241
+ return this.builtArchive;
242
+ }
243
+
235
244
  public getStartSpongeBlob() {
236
245
  return this.startSpongeBlob;
237
246
  }