@aztec/sequencer-client 0.30.1 → 0.31.0

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 (104) hide show
  1. package/dest/client/sequencer-client.d.ts +5 -1
  2. package/dest/client/sequencer-client.d.ts.map +1 -1
  3. package/dest/client/sequencer-client.js +5 -34
  4. package/dest/index.d.ts +0 -7
  5. package/dest/index.d.ts.map +1 -1
  6. package/dest/index.js +1 -8
  7. package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
  8. package/dest/publisher/viem-tx-sender.js +2 -3
  9. package/dest/sequencer/abstract_phase_manager.d.ts +1 -3
  10. package/dest/sequencer/abstract_phase_manager.d.ts.map +1 -1
  11. package/dest/sequencer/abstract_phase_manager.js +13 -17
  12. package/dest/sequencer/app_logic_phase_manager.d.ts +1 -3
  13. package/dest/sequencer/app_logic_phase_manager.d.ts.map +1 -1
  14. package/dest/sequencer/app_logic_phase_manager.js +3 -4
  15. package/dest/sequencer/phase_manager_factory.d.ts +2 -3
  16. package/dest/sequencer/phase_manager_factory.d.ts.map +1 -1
  17. package/dest/sequencer/phase_manager_factory.js +9 -9
  18. package/dest/sequencer/public_processor.d.ts +3 -7
  19. package/dest/sequencer/public_processor.d.ts.map +1 -1
  20. package/dest/sequencer/public_processor.js +6 -9
  21. package/dest/sequencer/sequencer.d.ts +4 -5
  22. package/dest/sequencer/sequencer.d.ts.map +1 -1
  23. package/dest/sequencer/sequencer.js +13 -12
  24. package/dest/sequencer/setup_phase_manager.d.ts +1 -3
  25. package/dest/sequencer/setup_phase_manager.d.ts.map +1 -1
  26. package/dest/sequencer/setup_phase_manager.js +3 -4
  27. package/dest/sequencer/tail_phase_manager.d.ts +1 -3
  28. package/dest/sequencer/tail_phase_manager.d.ts.map +1 -1
  29. package/dest/sequencer/tail_phase_manager.js +3 -4
  30. package/dest/sequencer/teardown_phase_manager.d.ts +1 -3
  31. package/dest/sequencer/teardown_phase_manager.d.ts.map +1 -1
  32. package/dest/sequencer/teardown_phase_manager.js +3 -4
  33. package/dest/sequencer/tx_validator.d.ts +1 -2
  34. package/dest/sequencer/tx_validator.d.ts.map +1 -1
  35. package/dest/sequencer/tx_validator.js +15 -2
  36. package/dest/simulator/index.d.ts +1 -37
  37. package/dest/simulator/index.d.ts.map +1 -1
  38. package/dest/simulator/index.js +2 -2
  39. package/dest/simulator/public_executor.d.ts +1 -1
  40. package/dest/simulator/public_executor.d.ts.map +1 -1
  41. package/dest/simulator/public_executor.js +22 -12
  42. package/dest/simulator/public_kernel.d.ts +1 -1
  43. package/dest/simulator/public_kernel.d.ts.map +1 -1
  44. package/dest/simulator/public_kernel.js +2 -2
  45. package/package.json +13 -13
  46. package/src/client/sequencer-client.ts +7 -42
  47. package/src/index.ts +0 -9
  48. package/src/publisher/viem-tx-sender.ts +1 -2
  49. package/src/sequencer/abstract_phase_manager.ts +14 -16
  50. package/src/sequencer/app_logic_phase_manager.ts +1 -3
  51. package/src/sequencer/phase_manager_factory.ts +0 -9
  52. package/src/sequencer/public_processor.ts +12 -17
  53. package/src/sequencer/sequencer.ts +12 -13
  54. package/src/sequencer/setup_phase_manager.ts +1 -3
  55. package/src/sequencer/tail_phase_manager.ts +1 -3
  56. package/src/sequencer/teardown_phase_manager.ts +1 -3
  57. package/src/sequencer/tx_validator.ts +17 -2
  58. package/src/simulator/index.ts +0 -45
  59. package/src/simulator/public_executor.ts +32 -11
  60. package/src/simulator/public_kernel.ts +2 -2
  61. package/dest/block_builder/index.d.ts +0 -19
  62. package/dest/block_builder/index.d.ts.map +0 -1
  63. package/dest/block_builder/index.js +0 -2
  64. package/dest/block_builder/solo_block_builder.d.ts +0 -78
  65. package/dest/block_builder/solo_block_builder.d.ts.map +0 -1
  66. package/dest/block_builder/solo_block_builder.js +0 -489
  67. package/dest/block_builder/types.d.ts +0 -10
  68. package/dest/block_builder/types.d.ts.map +0 -1
  69. package/dest/block_builder/types.js +0 -2
  70. package/dest/mocks/verification_keys.d.ts +0 -28
  71. package/dest/mocks/verification_keys.d.ts.map +0 -1
  72. package/dest/mocks/verification_keys.js +0 -14
  73. package/dest/prover/empty.d.ts +0 -53
  74. package/dest/prover/empty.d.ts.map +0 -1
  75. package/dest/prover/empty.js +0 -75
  76. package/dest/prover/index.d.ts +0 -52
  77. package/dest/prover/index.d.ts.map +0 -1
  78. package/dest/prover/index.js +0 -2
  79. package/dest/sequencer/processed_tx.d.ts +0 -81
  80. package/dest/sequencer/processed_tx.d.ts.map +0 -1
  81. package/dest/sequencer/processed_tx.js +0 -98
  82. package/dest/simulator/acvm_native.d.ts +0 -20
  83. package/dest/simulator/acvm_native.d.ts.map +0 -1
  84. package/dest/simulator/acvm_native.js +0 -96
  85. package/dest/simulator/acvm_wasm.d.ts +0 -7
  86. package/dest/simulator/acvm_wasm.d.ts.map +0 -1
  87. package/dest/simulator/acvm_wasm.js +0 -23
  88. package/dest/simulator/rollup.d.ts +0 -43
  89. package/dest/simulator/rollup.d.ts.map +0 -1
  90. package/dest/simulator/rollup.js +0 -78
  91. package/dest/simulator/simulation_provider.d.ts +0 -9
  92. package/dest/simulator/simulation_provider.d.ts.map +0 -1
  93. package/dest/simulator/simulation_provider.js +0 -2
  94. package/src/block_builder/index.ts +0 -20
  95. package/src/block_builder/solo_block_builder.ts +0 -812
  96. package/src/block_builder/types.ts +0 -8
  97. package/src/mocks/verification_keys.ts +0 -36
  98. package/src/prover/empty.ts +0 -97
  99. package/src/prover/index.ts +0 -70
  100. package/src/sequencer/processed_tx.ts +0 -210
  101. package/src/simulator/acvm_native.ts +0 -112
  102. package/src/simulator/acvm_wasm.ts +0 -31
  103. package/src/simulator/rollup.ts +0 -127
  104. package/src/simulator/simulation_provider.ts +0 -10
@@ -1,489 +0,0 @@
1
- import { Body, L2Block, MerkleTreeId } from '@aztec/circuit-types';
2
- import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseParityInputs, BaseRollupInputs, ConstantRollupData, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_READS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MembershipWitness, MergeRollupInputs, NOTE_HASH_SUBTREE_HEIGHT, NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NUM_BASE_PARITY_PER_ROOT_PARITY, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousRollupData, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, ROLLUP_VK_TREE_HEIGHT, RollupKernelCircuitPublicInputs, RollupKernelData, RollupTypes, RootParityInput, RootParityInputs, RootRollupInputs, StateDiffHints, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
3
- import { assertPermutation, makeTuple } from '@aztec/foundation/array';
4
- import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
5
- import { padArrayEnd } from '@aztec/foundation/collection';
6
- import { Fr } from '@aztec/foundation/fields';
7
- import { createDebugLogger } from '@aztec/foundation/log';
8
- import { assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
9
- import { elapsed } from '@aztec/foundation/timer';
10
- import chunk from 'lodash.chunk';
11
- import { inspect } from 'util';
12
- import { toTxEffect } from '../sequencer/processed_tx.js';
13
- const frToBigInt = (fr) => toBigIntBE(fr.toBuffer());
14
- // Denotes fields that are not used now, but will be in the future
15
- const FUTURE_FR = new Fr(0n);
16
- const FUTURE_NUM = 0;
17
- // Denotes fields that should be deleted
18
- const DELETE_FR = new Fr(0n);
19
- /**
20
- * Builds an L2 block out of a set of ProcessedTx's,
21
- * using the base, merge, and root rollup circuits.
22
- */
23
- export class SoloBlockBuilder {
24
- constructor(db, vks, simulator, prover, debug = createDebugLogger('aztec:sequencer:solo-block-builder')) {
25
- this.db = db;
26
- this.vks = vks;
27
- this.simulator = simulator;
28
- this.prover = prover;
29
- this.debug = debug;
30
- }
31
- /**
32
- * Builds an L2 block with the given number containing the given txs, updating state trees.
33
- * @param globalVariables - Global variables to be used in the block.
34
- * @param txs - Processed transactions to include in the block.
35
- * @param l1ToL2Messages - L1 to L2 messages to be part of the block.
36
- * @param timestamp - Timestamp of the block.
37
- * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
38
- */
39
- async buildL2Block(globalVariables, txs, l1ToL2Messages) {
40
- // Check txs are good for processing by checking if all the tree snapshots in header are non-empty
41
- this.validateTxs(txs);
42
- // We pad the messages as the circuits expect that.
43
- const l1ToL2MessagesPadded = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
44
- // We fill the tx batch with empty txs, we process only one tx at a time for now
45
- const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, l1ToL2MessagesPadded);
46
- // Collect all new nullifiers, commitments, and contracts from all txs in this block
47
- const txEffects = txs.map(tx => toTxEffect(tx));
48
- const blockBody = new Body(l1ToL2MessagesPadded, txEffects);
49
- const l2Block = L2Block.fromFields({
50
- archive: circuitsOutput.archive,
51
- header: circuitsOutput.header,
52
- body: blockBody,
53
- });
54
- if (!l2Block.body.getTxsEffectsHash().equals(circuitsOutput.header.contentCommitment.txsEffectsHash)) {
55
- this.debug(inspect(blockBody));
56
- throw new Error(`Txs effects hash mismatch, ${l2Block.body
57
- .getTxsEffectsHash()
58
- .toString('hex')} == ${circuitsOutput.header.contentCommitment.txsEffectsHash.toString('hex')} `);
59
- }
60
- return [l2Block, proof];
61
- }
62
- validateTxs(txs) {
63
- for (const tx of txs) {
64
- const txHeader = tx.data.constants.historicalHeader;
65
- if (txHeader.state.l1ToL2MessageTree.isZero()) {
66
- throw new Error(`Empty L1 to L2 messages tree in tx: ${toFriendlyJSON(tx)}`);
67
- }
68
- if (txHeader.state.partial.noteHashTree.isZero()) {
69
- throw new Error(`Empty note hash tree in tx: ${toFriendlyJSON(tx)}`);
70
- }
71
- if (txHeader.state.partial.nullifierTree.isZero()) {
72
- throw new Error(`Empty nullifier tree in tx: ${toFriendlyJSON(tx)}`);
73
- }
74
- if (txHeader.state.partial.publicDataTree.isZero()) {
75
- throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
76
- }
77
- }
78
- }
79
- async getTreeSnapshot(id) {
80
- const treeInfo = await this.db.getTreeInfo(id);
81
- return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
82
- }
83
- async runCircuits(globalVariables, txs, l1ToL2Messages) {
84
- // Check that the length of the array of txs is a power of two
85
- // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
86
- if (txs.length < 2 || (txs.length & (txs.length - 1)) !== 0) {
87
- throw new Error(`Length of txs for the block should be a power of two and at least two (got ${txs.length})`);
88
- }
89
- // BASE PARITY CIRCUIT (run in parallel)
90
- // Note: In the future we will want to cache the results of empty base and root parity circuits so that we don't
91
- // have to run them. (It will most likely be quite common that some base parity circuits will be "empty")
92
- let baseParityInputs = [];
93
- let elapsedBaseParityOutputsPromise;
94
- {
95
- baseParityInputs = Array.from({ length: NUM_BASE_PARITY_PER_ROOT_PARITY }, (_, i) => BaseParityInputs.fromSlice(l1ToL2Messages, i));
96
- const baseParityOutputs = [];
97
- for (const inputs of baseParityInputs) {
98
- baseParityOutputs.push(this.baseParityCircuit(inputs));
99
- }
100
- elapsedBaseParityOutputsPromise = elapsed(() => Promise.all(baseParityOutputs));
101
- }
102
- // BASE ROLLUP CIRCUIT (run in parallel)
103
- let elapsedBaseRollupOutputsPromise;
104
- const baseRollupInputs = [];
105
- {
106
- // Perform all tree insertions and retrieve snapshots for all base rollups
107
- const treeSnapshots = [];
108
- for (const tx of txs) {
109
- const input = await this.buildBaseRollupInput(tx, globalVariables);
110
- baseRollupInputs.push(input);
111
- const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(async (id) => {
112
- return { key: id, value: await this.getTreeSnapshot(id) };
113
- });
114
- const snapshots = new Map((await Promise.all(promises)).map(obj => [obj.key, obj.value]));
115
- treeSnapshots.push(snapshots);
116
- }
117
- // Run the base rollup circuits for the txs in parallel
118
- const baseRollupOutputs = [];
119
- for (let i = 0; i < txs.length; i++) {
120
- baseRollupOutputs.push(this.baseRollupCircuit(txs[i], baseRollupInputs[i], treeSnapshots[i]));
121
- }
122
- elapsedBaseRollupOutputsPromise = elapsed(() => Promise.all(baseRollupOutputs));
123
- }
124
- // ROOT PARITY CIRCUIT
125
- let elapsedRootParityOutputPromise;
126
- let rootParityInputs;
127
- {
128
- // First we await the base parity outputs
129
- const [duration, baseParityOutputs] = await elapsedBaseParityOutputsPromise;
130
- // We emit stats for base parity circuits
131
- for (let i = 0; i < baseParityOutputs.length; i++) {
132
- this.debug(`Simulated base parity circuit`, {
133
- eventName: 'circuit-simulation',
134
- circuitName: 'base-parity',
135
- duration: duration / baseParityOutputs.length,
136
- inputSize: baseParityInputs[i].toBuffer().length,
137
- outputSize: baseParityOutputs[i].toBuffer().length,
138
- });
139
- }
140
- rootParityInputs = new RootParityInputs(baseParityOutputs);
141
- elapsedRootParityOutputPromise = elapsed(() => this.rootParityCircuit(rootParityInputs));
142
- }
143
- // MERGE ROLLUP CIRCUIT (each layer run in parallel)
144
- let mergeOutputLeft;
145
- let mergeOutputRight;
146
- {
147
- // Run merge rollups in layers until we have only two outputs
148
- const [duration, mergeInputs] = await elapsedBaseRollupOutputsPromise;
149
- // We emit stats for base rollup circuits
150
- for (let i = 0; i < mergeInputs.length; i++) {
151
- this.debug(`Simulated base rollup circuit`, {
152
- eventName: 'circuit-simulation',
153
- circuitName: 'base-rollup',
154
- duration: duration / mergeInputs.length,
155
- inputSize: baseRollupInputs[i].toBuffer().length,
156
- outputSize: mergeInputs[i][0].toBuffer().length,
157
- });
158
- }
159
- let mergeRollupInputs = mergeInputs;
160
- while (mergeRollupInputs.length > 2) {
161
- const mergeInputStructs = [];
162
- for (const pair of chunk(mergeRollupInputs, 2)) {
163
- const [r1, r2] = pair;
164
- mergeInputStructs.push(this.createMergeRollupInputs(r1, r2));
165
- }
166
- const [duration, mergeOutputs] = await elapsed(() => Promise.all(mergeInputStructs.map(async (input) => await this.mergeRollupCircuit(input))));
167
- // We emit stats for merge rollup circuits
168
- for (let i = 0; i < mergeOutputs.length; i++) {
169
- this.debug(`Simulated merge rollup circuit`, {
170
- eventName: 'circuit-simulation',
171
- circuitName: 'merge-rollup',
172
- duration: duration / mergeOutputs.length,
173
- inputSize: mergeInputStructs[i].toBuffer().length,
174
- outputSize: mergeOutputs[i][0].toBuffer().length,
175
- });
176
- }
177
- mergeRollupInputs = mergeOutputs;
178
- }
179
- // Run the root rollup with the last two merge rollups (or base, if no merge layers)
180
- [mergeOutputLeft, mergeOutputRight] = mergeRollupInputs;
181
- }
182
- // Finally, we emit stats for root parity circuit
183
- const [duration, rootParityOutput] = await elapsedRootParityOutputPromise;
184
- this.debug(`Simulated root parity circuit`, {
185
- eventName: 'circuit-simulation',
186
- circuitName: 'root-parity',
187
- duration: duration,
188
- inputSize: rootParityInputs.toBuffer().length,
189
- outputSize: rootParityOutput.toBuffer().length,
190
- });
191
- return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, rootParityOutput, l1ToL2Messages);
192
- }
193
- async baseParityCircuit(inputs) {
194
- this.debug(`Running base parity circuit`);
195
- const parityPublicInputs = await this.simulator.baseParityCircuit(inputs);
196
- const proof = await this.prover.getBaseParityProof(inputs, parityPublicInputs);
197
- return new RootParityInput(proof, parityPublicInputs);
198
- }
199
- async rootParityCircuit(inputs) {
200
- this.debug(`Running root parity circuit`);
201
- const parityPublicInputs = await this.simulator.rootParityCircuit(inputs);
202
- const proof = await this.prover.getRootParityProof(inputs, parityPublicInputs);
203
- return new RootParityInput(proof, parityPublicInputs);
204
- }
205
- async baseRollupCircuit(tx, inputs, treeSnapshots) {
206
- this.debug(`Running base rollup for ${tx.hash}`);
207
- const rollupOutput = await this.simulator.baseRollupCircuit(inputs);
208
- this.validatePartialState(rollupOutput.end, treeSnapshots);
209
- const proof = await this.prover.getBaseRollupProof(inputs, rollupOutput);
210
- return [rollupOutput, proof];
211
- }
212
- createMergeRollupInputs(left, right) {
213
- const vk = this.getVerificationKey(left[0].rollupType);
214
- const mergeInputs = new MergeRollupInputs([
215
- this.getPreviousRollupDataFromPublicInputs(left[0], left[1], vk),
216
- this.getPreviousRollupDataFromPublicInputs(right[0], right[1], vk),
217
- ]);
218
- return mergeInputs;
219
- }
220
- async mergeRollupCircuit(mergeInputs) {
221
- this.debug(`Running merge rollup circuit`);
222
- const output = await this.simulator.mergeRollupCircuit(mergeInputs);
223
- const proof = await this.prover.getMergeRollupProof(mergeInputs, output);
224
- return [output, proof];
225
- }
226
- getVerificationKey(type) {
227
- switch (type) {
228
- case RollupTypes.Base:
229
- return this.vks.baseRollupCircuit;
230
- case RollupTypes.Merge:
231
- return this.vks.mergeRollupCircuit;
232
- default:
233
- throw new Error(`No verification key available for ${type}`);
234
- }
235
- }
236
- async rootRollupCircuit(left, right, l1ToL2Roots, l1ToL2Messages) {
237
- this.debug(`Running root rollup circuit`);
238
- const rootInput = await this.getRootRollupInput(...left, ...right, l1ToL2Roots, l1ToL2Messages);
239
- // Update the local trees to include the l1 to l2 messages
240
- await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, l1ToL2Messages.map(m => m.toBuffer()));
241
- // Simulate and get proof for the root circuit
242
- const rootOutput = await this.simulator.rootRollupCircuit(rootInput);
243
- const rootProof = await this.prover.getRootRollupProof(rootInput, rootOutput);
244
- // Update the archive with the latest block header
245
- this.debug(`Updating and validating root trees`);
246
- await this.db.updateArchive(rootOutput.header);
247
- await this.validateRootOutput(rootOutput);
248
- return [rootOutput, rootProof];
249
- }
250
- validatePartialState(partialState, treeSnapshots) {
251
- this.validateSimulatedTree(treeSnapshots.get(MerkleTreeId.NOTE_HASH_TREE), partialState.noteHashTree, 'NoteHashTree');
252
- this.validateSimulatedTree(treeSnapshots.get(MerkleTreeId.NULLIFIER_TREE), partialState.nullifierTree, 'NullifierTree');
253
- this.validateSimulatedTree(treeSnapshots.get(MerkleTreeId.PUBLIC_DATA_TREE), partialState.publicDataTree, 'PublicDataTree');
254
- }
255
- async validateState(state) {
256
- const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(async (id) => {
257
- return { key: id, value: await this.getTreeSnapshot(id) };
258
- });
259
- const snapshots = new Map((await Promise.all(promises)).map(obj => [obj.key, obj.value]));
260
- this.validatePartialState(state.partial, snapshots);
261
- this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), state.l1ToL2MessageTree, 'L1ToL2MessageTree');
262
- }
263
- // Validate that the roots of all local trees match the output of the root circuit simulation
264
- async validateRootOutput(rootOutput) {
265
- await Promise.all([
266
- this.validateState(rootOutput.header.state),
267
- this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.ARCHIVE), rootOutput.archive, 'Archive'),
268
- ]);
269
- }
270
- // Helper for comparing two trees snapshots
271
- validateSimulatedTree(localTree, simulatedTree, name, label) {
272
- if (!simulatedTree.root.toBuffer().equals(localTree.root.toBuffer())) {
273
- throw new Error(`${label ?? name} tree root mismatch (local ${localTree.root}, simulated ${simulatedTree.root})`);
274
- }
275
- if (simulatedTree.nextAvailableLeafIndex !== localTree.nextAvailableLeafIndex) {
276
- throw new Error(`${label ?? name} tree next available leaf index mismatch (local ${localTree.nextAvailableLeafIndex}, simulated ${simulatedTree.nextAvailableLeafIndex})`);
277
- }
278
- }
279
- // Builds the inputs for the root rollup circuit, without making any changes to trees
280
- async getRootRollupInput(rollupOutputLeft, rollupProofLeft, rollupOutputRight, rollupProofRight, l1ToL2Roots, newL1ToL2Messages) {
281
- const vk = this.getVerificationKey(rollupOutputLeft.rollupType);
282
- const previousRollupData = [
283
- this.getPreviousRollupDataFromPublicInputs(rollupOutputLeft, rollupProofLeft, vk),
284
- this.getPreviousRollupDataFromPublicInputs(rollupOutputRight, rollupProofRight, vk),
285
- ];
286
- const getRootTreeSiblingPath = async (treeId) => {
287
- const { size } = await this.db.getTreeInfo(treeId);
288
- const path = await this.db.getSiblingPath(treeId, size);
289
- return path.toFields();
290
- };
291
- const newL1ToL2MessageTreeRootSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT);
292
- const newL1ToL2MessageTreeRootSiblingPath = makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, i => i < newL1ToL2MessageTreeRootSiblingPathArray.length ? newL1ToL2MessageTreeRootSiblingPathArray[i] : Fr.ZERO, 0);
293
- // Get tree snapshots
294
- const startL1ToL2MessageTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE);
295
- // Get blocks tree
296
- const startArchiveSnapshot = await this.getTreeSnapshot(MerkleTreeId.ARCHIVE);
297
- const newArchiveSiblingPathArray = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE);
298
- const newArchiveSiblingPath = makeTuple(ARCHIVE_HEIGHT, i => (i < newArchiveSiblingPathArray.length ? newArchiveSiblingPathArray[i] : Fr.ZERO), 0);
299
- return RootRollupInputs.from({
300
- previousRollupData,
301
- l1ToL2Roots,
302
- newL1ToL2Messages,
303
- newL1ToL2MessageTreeRootSiblingPath,
304
- startL1ToL2MessageTreeSnapshot,
305
- startArchiveSnapshot,
306
- newArchiveSiblingPath,
307
- });
308
- }
309
- getPreviousRollupDataFromPublicInputs(rollupOutput, rollupProof, vk) {
310
- return new PreviousRollupData(rollupOutput, rollupProof, vk,
311
- // MembershipWitness for a VK tree to be implemented in the future
312
- FUTURE_NUM, new MembershipWitness(ROLLUP_VK_TREE_HEIGHT, BigInt(FUTURE_NUM), makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR)));
313
- }
314
- getKernelDataFor(tx) {
315
- const inputs = new RollupKernelCircuitPublicInputs(tx.data.aggregationObject, tx.data.combinedData, tx.data.constants);
316
- return new RollupKernelData(inputs, tx.proof,
317
- // VK for the kernel circuit
318
- this.vks.privateKernelCircuit,
319
- // MembershipWitness for a VK tree to be implemented in the future
320
- FUTURE_NUM, assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT));
321
- }
322
- // Scan a tree searching for a specific value and return a membership witness proof for it
323
- async getMembershipWitnessFor(value, treeId, height) {
324
- // If this is an empty tx, then just return zeroes
325
- if (value.isZero()) {
326
- return this.makeEmptyMembershipWitness(height);
327
- }
328
- const index = await this.db.findLeafIndex(treeId, value.toBuffer());
329
- if (index === undefined) {
330
- throw new Error(`Leaf with value ${value} not found in tree ${MerkleTreeId[treeId]}`);
331
- }
332
- const path = await this.db.getSiblingPath(treeId, index);
333
- return new MembershipWitness(height, index, assertLength(path.toFields(), height));
334
- }
335
- async getConstantRollupData(globalVariables) {
336
- return ConstantRollupData.from({
337
- baseRollupVkHash: DELETE_FR,
338
- mergeRollupVkHash: DELETE_FR,
339
- privateKernelVkTreeRoot: FUTURE_FR,
340
- publicKernelVkTreeRoot: FUTURE_FR,
341
- lastArchive: await this.getTreeSnapshot(MerkleTreeId.ARCHIVE),
342
- globalVariables,
343
- });
344
- }
345
- async getLowNullifierInfo(nullifier) {
346
- // Return empty nullifier info for an empty tx
347
- if (nullifier.value === 0n) {
348
- return {
349
- index: 0,
350
- leafPreimage: NullifierLeafPreimage.empty(),
351
- witness: this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
352
- };
353
- }
354
- const tree = MerkleTreeId.NULLIFIER_TREE;
355
- const prevValueIndex = await this.db.getPreviousValueIndex(tree, frToBigInt(nullifier));
356
- if (!prevValueIndex) {
357
- throw new Error(`Nullifier tree should have one initial leaf`);
358
- }
359
- const prevValuePreimage = (await this.db.getLeafPreimage(tree, prevValueIndex.index));
360
- const prevValueSiblingPath = await this.db.getSiblingPath(tree, BigInt(prevValueIndex.index));
361
- return {
362
- index: prevValueIndex,
363
- leafPreimage: prevValuePreimage,
364
- witness: new MembershipWitness(NULLIFIER_TREE_HEIGHT, BigInt(prevValueIndex.index), assertLength(prevValueSiblingPath.toFields(), NULLIFIER_TREE_HEIGHT)),
365
- };
366
- }
367
- async getSubtreeSiblingPath(treeId, subtreeHeight) {
368
- const nextAvailableLeafIndex = await this.db.getTreeInfo(treeId).then(t => t.size);
369
- const fullSiblingPath = await this.db.getSiblingPath(treeId, nextAvailableLeafIndex);
370
- // Drop the first subtreeHeight items since we only care about the path to the subtree root
371
- return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight).toFields();
372
- }
373
- async processPublicDataUpdateRequests(tx) {
374
- const combinedPublicDataUpdateRequests = tx.data.combinedData.publicDataUpdateRequests.map(updateRequest => {
375
- return new PublicDataTreeLeaf(updateRequest.leafSlot, updateRequest.newValue);
376
- });
377
- const { lowLeavesWitnessData, newSubtreeSiblingPath, sortedNewLeaves, sortedNewLeavesIndexes } = await this.db.batchInsert(MerkleTreeId.PUBLIC_DATA_TREE, combinedPublicDataUpdateRequests.map(x => x.toBuffer()),
378
- // TODO(#3675) remove oldValue from update requests
379
- PUBLIC_DATA_SUBTREE_HEIGHT);
380
- if (lowLeavesWitnessData === undefined) {
381
- throw new Error(`Could not craft public data batch insertion proofs`);
382
- }
383
- const sortedPublicDataWrites = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
384
- return PublicDataTreeLeaf.fromBuffer(sortedNewLeaves[i]);
385
- });
386
- const sortedPublicDataWritesIndexes = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
387
- return sortedNewLeavesIndexes[i];
388
- });
389
- const subtreeSiblingPathAsFields = newSubtreeSiblingPath.toFields();
390
- const newPublicDataSubtreeSiblingPath = makeTuple(PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, i => {
391
- return subtreeSiblingPathAsFields[i];
392
- });
393
- const lowPublicDataWritesMembershipWitnesses = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
394
- const witness = lowLeavesWitnessData[i];
395
- return MembershipWitness.fromBufferArray(witness.index, assertLength(witness.siblingPath.toBufferArray(), PUBLIC_DATA_TREE_HEIGHT));
396
- });
397
- const lowPublicDataWritesPreimages = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => {
398
- return lowLeavesWitnessData[i].leafPreimage;
399
- });
400
- // validate that the sortedPublicDataWrites and sortedPublicDataWritesIndexes are in the correct order
401
- // otherwise it will just fail in the circuit
402
- assertPermutation(combinedPublicDataUpdateRequests, sortedPublicDataWrites, sortedPublicDataWritesIndexes, (a, b) => a.equals(b));
403
- return {
404
- lowPublicDataWritesPreimages,
405
- lowPublicDataWritesMembershipWitnesses,
406
- newPublicDataSubtreeSiblingPath,
407
- sortedPublicDataWrites,
408
- sortedPublicDataWritesIndexes,
409
- };
410
- }
411
- async getPublicDataReadsInfo(tx) {
412
- const newPublicDataReadsWitnesses = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => MembershipWitness.empty(PUBLIC_DATA_TREE_HEIGHT, 0n));
413
- const newPublicDataReadsPreimages = makeTuple(MAX_PUBLIC_DATA_READS_PER_TX, () => PublicDataTreeLeafPreimage.empty());
414
- for (const i in tx.data.validationRequests.publicDataReads) {
415
- const leafSlot = tx.data.validationRequests.publicDataReads[i].leafSlot.value;
416
- const lowLeafResult = await this.db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot);
417
- if (!lowLeafResult) {
418
- throw new Error(`Public data tree should have one initial leaf`);
419
- }
420
- const preimage = await this.db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
421
- const path = await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, lowLeafResult.index);
422
- newPublicDataReadsWitnesses[i] = new MembershipWitness(PUBLIC_DATA_TREE_HEIGHT, BigInt(lowLeafResult.index), path.toTuple());
423
- newPublicDataReadsPreimages[i] = preimage;
424
- }
425
- return {
426
- newPublicDataReadsWitnesses,
427
- newPublicDataReadsPreimages,
428
- };
429
- }
430
- // Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
431
- async buildBaseRollupInput(tx, globalVariables) {
432
- // Get trees info before any changes hit
433
- const constants = await this.getConstantRollupData(globalVariables);
434
- const start = new PartialStateReference(await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE), await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE), await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE));
435
- // Get the subtree sibling paths for the circuit
436
- const noteHashSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.NOTE_HASH_TREE, NOTE_HASH_SUBTREE_HEIGHT);
437
- const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i => i < noteHashSubtreeSiblingPathArray.length ? noteHashSubtreeSiblingPathArray[i] : Fr.ZERO);
438
- // Update the note hash trees with the new items being inserted to get the new roots
439
- // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
440
- const newNoteHashes = tx.data.combinedData.newNoteHashes.map(x => x.value.toBuffer());
441
- await this.db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, newNoteHashes);
442
- // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
443
- // All reads that refer to writes in the same tx are transient and can be simplified out.
444
- const txPublicDataReadsInfo = await this.getPublicDataReadsInfo(tx);
445
- const txPublicDataUpdateRequestInfo = await this.processPublicDataUpdateRequests(tx);
446
- // Update the nullifier tree, capturing the low nullifier info for each individual operation
447
- const { lowLeavesWitnessData: nullifierWitnessLeaves, newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath, sortedNewLeaves: sortedNewNullifiers, sortedNewLeavesIndexes, } = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, tx.data.combinedData.newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
448
- if (nullifierWitnessLeaves === undefined) {
449
- throw new Error(`Could not craft nullifier batch insertion proofs`);
450
- }
451
- // Extract witness objects from returned data
452
- const nullifierPredecessorMembershipWitnessesWithoutPadding = nullifierWitnessLeaves.map(l => MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)));
453
- const nullifierSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFields();
454
- const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i => i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO);
455
- const publicDataSiblingPath = txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath;
456
- const stateDiffHints = StateDiffHints.from({
457
- nullifierPredecessorPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < nullifierWitnessLeaves.length
458
- ? nullifierWitnessLeaves[i].leafPreimage
459
- : NullifierLeafPreimage.empty()),
460
- nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
461
- ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
462
- : this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT)),
463
- sortedNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
464
- sortedNullifierIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
465
- noteHashSubtreeSiblingPath,
466
- nullifierSubtreeSiblingPath,
467
- publicDataSiblingPath,
468
- });
469
- const blockHash = tx.data.constants.historicalHeader.hash();
470
- const archiveRootMembershipWitness = await this.getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT);
471
- return BaseRollupInputs.from({
472
- kernelData: this.getKernelDataFor(tx),
473
- start,
474
- stateDiffHints,
475
- sortedPublicDataWrites: txPublicDataUpdateRequestInfo.sortedPublicDataWrites,
476
- sortedPublicDataWritesIndexes: txPublicDataUpdateRequestInfo.sortedPublicDataWritesIndexes,
477
- lowPublicDataWritesPreimages: txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages,
478
- lowPublicDataWritesMembershipWitnesses: txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses,
479
- publicDataReadsPreimages: txPublicDataReadsInfo.newPublicDataReadsPreimages,
480
- publicDataReadsMembershipWitnesses: txPublicDataReadsInfo.newPublicDataReadsWitnesses,
481
- archiveRootMembershipWitness,
482
- constants,
483
- });
484
- }
485
- makeEmptyMembershipWitness(height) {
486
- return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
487
- }
488
- }
489
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"solo_block_builder.js","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
@@ -1,10 +0,0 @@
1
- /**
2
- * Type representing the names of the trees for the base rollup.
3
- */
4
- type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'PublicDataTree';
5
- /**
6
- * Type representing the names of the trees.
7
- */
8
- export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
9
- export {};
10
- //# sourceMappingURL=types.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/block_builder/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,KAAK,aAAa,GAAG,cAAc,GAAG,cAAc,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAC1F;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,mBAAmB,GAAG,SAAS,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfYnVpbGRlci90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
@@ -1,28 +0,0 @@
1
- import { VerificationKey } from '@aztec/circuits.js';
2
- /**
3
- * Well-known verification keys.
4
- */
5
- export interface VerificationKeys {
6
- /**
7
- * Verification key for the default public kernel circuit.
8
- */
9
- publicKernelCircuit: VerificationKey;
10
- /**
11
- * Verification key for the default private kernel circuit.
12
- */
13
- privateKernelCircuit: VerificationKey;
14
- /**
15
- * Verification key for the default base rollup circuit.
16
- */
17
- baseRollupCircuit: VerificationKey;
18
- /**
19
- * Verification key for the default merge rollup circuit.
20
- */
21
- mergeRollupCircuit: VerificationKey;
22
- }
23
- /**
24
- * Returns mock verification keys for each well known circuit.
25
- * @returns A VerificationKeys object with fake values.
26
- */
27
- export declare function getVerificationKeys(): VerificationKeys;
28
- //# sourceMappingURL=verification_keys.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"verification_keys.d.ts","sourceRoot":"","sources":["../../src/mocks/verification_keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,mBAAmB,EAAE,eAAe,CAAC;IACrC;;OAEG;IACH,oBAAoB,EAAE,eAAe,CAAC;IACtC;;OAEG;IACH,iBAAiB,EAAE,eAAe,CAAC;IACnC;;OAEG;IACH,kBAAkB,EAAE,eAAe,CAAC;CACrC;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,gBAAgB,CAOtD"}
@@ -1,14 +0,0 @@
1
- import { VerificationKey } from '@aztec/circuits.js';
2
- /**
3
- * Returns mock verification keys for each well known circuit.
4
- * @returns A VerificationKeys object with fake values.
5
- */
6
- export function getVerificationKeys() {
7
- return {
8
- privateKernelCircuit: VerificationKey.makeFake(),
9
- baseRollupCircuit: VerificationKey.makeFake(),
10
- mergeRollupCircuit: VerificationKey.makeFake(),
11
- publicKernelCircuit: VerificationKey.makeFake(),
12
- };
13
- }
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyaWZpY2F0aW9uX2tleXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbW9ja3MvdmVyaWZpY2F0aW9uX2tleXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBd0JyRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsbUJBQW1CO0lBQ2pDLE9BQU87UUFDTCxvQkFBb0IsRUFBRSxlQUFlLENBQUMsUUFBUSxFQUFFO1FBQ2hELGlCQUFpQixFQUFFLGVBQWUsQ0FBQyxRQUFRLEVBQUU7UUFDN0Msa0JBQWtCLEVBQUUsZUFBZSxDQUFDLFFBQVEsRUFBRTtRQUM5QyxtQkFBbUIsRUFBRSxlQUFlLENBQUMsUUFBUSxFQUFFO0tBQ2hELENBQUM7QUFDSixDQUFDIn0=