@aztec/sequencer-client 0.7.0 → 0.7.2

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 (111) hide show
  1. package/Dockerfile +21 -0
  2. package/package.json +10 -10
  3. package/src/block_builder/solo_block_builder.test.ts +4 -4
  4. package/src/block_builder/solo_block_builder.ts +80 -24
  5. package/src/publisher/viem-tx-sender.ts +4 -1
  6. package/src/sequencer/sequencer.ts +15 -4
  7. package/src/simulator/public_executor.ts +2 -16
  8. package/src/simulator/rollup.ts +7 -4
  9. package/.tsbuildinfo +0 -1
  10. package/dest/block_builder/index.d.ts +0 -19
  11. package/dest/block_builder/index.d.ts.map +0 -1
  12. package/dest/block_builder/index.js +0 -2
  13. package/dest/block_builder/solo_block_builder.d.ts +0 -77
  14. package/dest/block_builder/solo_block_builder.d.ts.map +0 -1
  15. package/dest/block_builder/solo_block_builder.js +0 -454
  16. package/dest/block_builder/solo_block_builder.test.d.ts +0 -3
  17. package/dest/block_builder/solo_block_builder.test.d.ts.map +0 -1
  18. package/dest/block_builder/solo_block_builder.test.js +0 -277
  19. package/dest/block_builder/types.d.ts +0 -12
  20. package/dest/block_builder/types.d.ts.map +0 -1
  21. package/dest/block_builder/types.js +0 -2
  22. package/dest/client/index.d.ts +0 -2
  23. package/dest/client/index.d.ts.map +0 -1
  24. package/dest/client/index.js +0 -2
  25. package/dest/client/sequencer-client.d.ts +0 -32
  26. package/dest/client/sequencer-client.d.ts.map +0 -1
  27. package/dest/client/sequencer-client.js +0 -47
  28. package/dest/config.d.ts +0 -12
  29. package/dest/config.d.ts.map +0 -1
  30. package/dest/config.js +0 -28
  31. package/dest/global_variable_builder/config.d.ts +0 -19
  32. package/dest/global_variable_builder/config.d.ts.map +0 -1
  33. package/dest/global_variable_builder/config.js +0 -2
  34. package/dest/global_variable_builder/global_builder.d.ts +0 -58
  35. package/dest/global_variable_builder/global_builder.d.ts.map +0 -1
  36. package/dest/global_variable_builder/global_builder.js +0 -36
  37. package/dest/global_variable_builder/index.d.ts +0 -12
  38. package/dest/global_variable_builder/index.d.ts.map +0 -1
  39. package/dest/global_variable_builder/index.js +0 -12
  40. package/dest/global_variable_builder/viem-reader.d.ts +0 -16
  41. package/dest/global_variable_builder/viem-reader.d.ts.map +0 -1
  42. package/dest/global_variable_builder/viem-reader.js +0 -37
  43. package/dest/index.d.ts +0 -12
  44. package/dest/index.d.ts.map +0 -1
  45. package/dest/index.js +0 -14
  46. package/dest/mocks/verification_keys.d.ts +0 -28
  47. package/dest/mocks/verification_keys.d.ts.map +0 -1
  48. package/dest/mocks/verification_keys.js +0 -14
  49. package/dest/prover/empty.d.ts +0 -41
  50. package/dest/prover/empty.d.ts.map +0 -1
  51. package/dest/prover/empty.js +0 -57
  52. package/dest/prover/index.d.ts +0 -40
  53. package/dest/prover/index.d.ts.map +0 -1
  54. package/dest/prover/index.js +0 -2
  55. package/dest/publisher/config.d.ts +0 -32
  56. package/dest/publisher/config.d.ts.map +0 -1
  57. package/dest/publisher/config.js +0 -2
  58. package/dest/publisher/index.d.ts +0 -10
  59. package/dest/publisher/index.d.ts.map +0 -1
  60. package/dest/publisher/index.js +0 -11
  61. package/dest/publisher/l1-publisher.d.ts +0 -105
  62. package/dest/publisher/l1-publisher.d.ts.map +0 -1
  63. package/dest/publisher/l1-publisher.js +0 -156
  64. package/dest/publisher/l1-publisher.test.d.ts +0 -2
  65. package/dest/publisher/l1-publisher.test.d.ts.map +0 -1
  66. package/dest/publisher/l1-publisher.test.js +0 -58
  67. package/dest/publisher/viem-tx-sender.d.ts +0 -42
  68. package/dest/publisher/viem-tx-sender.d.ts.map +0 -1
  69. package/dest/publisher/viem-tx-sender.js +0 -118
  70. package/dest/receiver.d.ts +0 -13
  71. package/dest/receiver.d.ts.map +0 -1
  72. package/dest/receiver.js +0 -2
  73. package/dest/sequencer/config.d.ts +0 -26
  74. package/dest/sequencer/config.d.ts.map +0 -1
  75. package/dest/sequencer/config.js +0 -2
  76. package/dest/sequencer/index.d.ts +0 -4
  77. package/dest/sequencer/index.d.ts.map +0 -1
  78. package/dest/sequencer/index.js +0 -4
  79. package/dest/sequencer/processed_tx.d.ts +0 -51
  80. package/dest/sequencer/processed_tx.d.ts.map +0 -1
  81. package/dest/sequencer/processed_tx.js +0 -40
  82. package/dest/sequencer/public_processor.d.ts +0 -75
  83. package/dest/sequencer/public_processor.d.ts.map +0 -1
  84. package/dest/sequencer/public_processor.js +0 -269
  85. package/dest/sequencer/public_processor.test.d.ts +0 -2
  86. package/dest/sequencer/public_processor.test.d.ts.map +0 -1
  87. package/dest/sequencer/public_processor.test.js +0 -164
  88. package/dest/sequencer/sequencer.d.ts +0 -133
  89. package/dest/sequencer/sequencer.d.ts.map +0 -1
  90. package/dest/sequencer/sequencer.js +0 -297
  91. package/dest/sequencer/sequencer.test.d.ts +0 -2
  92. package/dest/sequencer/sequencer.test.d.ts.map +0 -1
  93. package/dest/sequencer/sequencer.test.js +0 -99
  94. package/dest/sequencer/utils.d.ts +0 -7
  95. package/dest/sequencer/utils.d.ts.map +0 -1
  96. package/dest/sequencer/utils.js +0 -12
  97. package/dest/simulator/index.d.ts +0 -43
  98. package/dest/simulator/index.d.ts.map +0 -1
  99. package/dest/simulator/index.js +0 -2
  100. package/dest/simulator/public_executor.d.ts +0 -22
  101. package/dest/simulator/public_executor.d.ts.map +0 -1
  102. package/dest/simulator/public_executor.js +0 -99
  103. package/dest/simulator/public_kernel.d.ts +0 -20
  104. package/dest/simulator/public_kernel.d.ts.map +0 -1
  105. package/dest/simulator/public_kernel.js +0 -27
  106. package/dest/simulator/rollup.d.ts +0 -34
  107. package/dest/simulator/rollup.d.ts.map +0 -1
  108. package/dest/simulator/rollup.js +0 -50
  109. package/dest/utils.d.ts +0 -12
  110. package/dest/utils.d.ts.map +0 -1
  111. package/dest/utils.js +0 -16
@@ -1,77 +0,0 @@
1
- import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantRollupData, GlobalVariables, MembershipWitness, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PreviousKernelData, PreviousRollupData, Proof, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VerificationKey } from '@aztec/circuits.js';
2
- import { Fr } from '@aztec/foundation/fields';
3
- import { Tuple } from '@aztec/foundation/serialize';
4
- import { L2Block, MerkleTreeId } from '@aztec/types';
5
- import { MerkleTreeOperations } from '@aztec/world-state';
6
- import { VerificationKeys } from '../mocks/verification_keys.js';
7
- import { RollupProver } from '../prover/index.js';
8
- import { ProcessedTx } from '../sequencer/processed_tx.js';
9
- import { RollupSimulator } from '../simulator/index.js';
10
- import { BlockBuilder } from './index.js';
11
- import { AllowedTreeNames } from './types.js';
12
- /**
13
- * Builds an L2 block out of a set of ProcessedTx's,
14
- * using the base, merge, and root rollup circuits.
15
- */
16
- export declare class SoloBlockBuilder implements BlockBuilder {
17
- protected db: MerkleTreeOperations;
18
- protected vks: VerificationKeys;
19
- protected simulator: RollupSimulator;
20
- protected prover: RollupProver;
21
- protected debug: import("@aztec/foundation/log").DebugLogger;
22
- constructor(db: MerkleTreeOperations, vks: VerificationKeys, simulator: RollupSimulator, prover: RollupProver, debug?: import("@aztec/foundation/log").DebugLogger);
23
- /**
24
- * Builds an L2 block with the given number containing the given txs, updating state trees.
25
- * @param globalVariables - Global variables to be used in the block.
26
- * @param txs - Processed transactions to include in the block.
27
- * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
28
- * @param timestamp - Timestamp of the block.
29
- * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
30
- */
31
- buildL2Block(globalVariables: GlobalVariables, txs: ProcessedTx[], newL1ToL2Messages: Fr[]): Promise<[L2Block, Proof]>;
32
- protected validateTxs(txs: ProcessedTx[]): void;
33
- protected getTreeSnapshot(id: MerkleTreeId): Promise<AppendOnlyTreeSnapshot>;
34
- protected runCircuits(globalVariables: GlobalVariables, txs: ProcessedTx[], newL1ToL2Messages: Fr[]): Promise<[RootRollupPublicInputs, Proof]>;
35
- protected baseRollupCircuit(tx1: ProcessedTx, tx2: ProcessedTx, globalVariables: GlobalVariables): Promise<[BaseOrMergeRollupPublicInputs, Proof]>;
36
- protected mergeRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof]): Promise<[BaseOrMergeRollupPublicInputs, Proof]>;
37
- protected getVerificationKey(type: RollupTypes): VerificationKey;
38
- protected rootRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof], newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<[RootRollupPublicInputs, Proof]>;
39
- updateHistoricBlocksTree(globalVariables: GlobalVariables): Promise<void>;
40
- protected calculateBlockHash(globals: GlobalVariables): Promise<Fr>;
41
- protected validateTrees(rollupOutput: BaseOrMergeRollupPublicInputs | RootRollupPublicInputs): Promise<void>;
42
- protected validateRootOutput(rootOutput: RootRollupPublicInputs): Promise<void>;
43
- protected validateRootTree(rootOutput: RootRollupPublicInputs, treeId: MerkleTreeId, name: 'Contract' | 'PrivateData' | 'L1ToL2Messages'): Promise<void>;
44
- /**
45
- * Validates that the root of the public data tree matches the output of the circuit simulation.
46
- * @param output - The output of the circuit simulation.
47
- * Note: Public data tree is sparse, so the "next available leaf index" doesn't make sense there.
48
- * For this reason we only validate root.
49
- */
50
- protected validatePublicDataTreeRoot(output: BaseOrMergeRollupPublicInputs | RootRollupPublicInputs): Promise<void>;
51
- protected validateTree<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs>(output: T, treeId: MerkleTreeId, name: AllowedTreeNames<T>): Promise<void>;
52
- protected validateSimulatedTree(localTree: AppendOnlyTreeSnapshot, simulatedTree: AppendOnlyTreeSnapshot, name: 'PrivateData' | 'Contract' | 'Nullifier' | 'L1ToL2Messages' | 'HistoricBlocks', label?: string): void;
53
- protected getRootRollupInput(rollupOutputLeft: BaseOrMergeRollupPublicInputs, rollupProofLeft: Proof, rollupOutputRight: BaseOrMergeRollupPublicInputs, rollupProofRight: Proof, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<RootRollupInputs>;
54
- protected getPreviousRollupDataFromPublicInputs(rollupOutput: BaseOrMergeRollupPublicInputs, rollupProof: Proof, vk: VerificationKey): PreviousRollupData;
55
- protected getKernelDataFor(tx: ProcessedTx): PreviousKernelData;
56
- protected getMembershipWitnessFor<N extends number>(value: Fr, treeId: MerkleTreeId, height: N): Promise<MembershipWitness<N>>;
57
- protected getHistoricTreesMembershipWitnessFor(tx: ProcessedTx): Promise<MembershipWitness<16>>;
58
- protected getConstantRollupData(globalVariables: GlobalVariables): Promise<ConstantRollupData>;
59
- protected getLowNullifierInfo(nullifier: Fr): Promise<{
60
- index: number;
61
- leafPreimage: NullifierLeafPreimage;
62
- witness: MembershipWitness<16>;
63
- } | {
64
- index: {
65
- index: number;
66
- alreadyPresent: boolean;
67
- };
68
- leafPreimage: NullifierLeafPreimage;
69
- witness: MembershipWitness<16>;
70
- }>;
71
- protected getSubtreeSiblingPath(treeId: MerkleTreeId, subtreeHeight: number): Promise<Fr[]>;
72
- protected processPublicDataUpdateRequests(tx: ProcessedTx): Promise<Fr[][]>;
73
- protected getPublicDataReadsSiblingPaths(tx: ProcessedTx): Promise<Fr[][]>;
74
- protected buildBaseRollupInput(left: ProcessedTx, right: ProcessedTx, globalVariables: GlobalVariables): Promise<BaseRollupInputs>;
75
- protected makeEmptyMembershipWitness<N extends number>(height: N): MembershipWitness<N>;
76
- }
77
- //# sourceMappingURL=solo_block_builder.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
@@ -1,454 +0,0 @@
1
- import { AppendOnlyTreeSnapshot, BaseRollupInputs, CircuitsWasm, ConstantRollupData, HISTORIC_BLOCKS_TREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, MembershipWitness, MergeRollupInputs, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PreviousKernelData, PreviousRollupData, ROLLUP_VK_TREE_HEIGHT, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VK_TREE_HEIGHT, makeTuple, } from '@aztec/circuits.js';
2
- import { computeBlockHash, computeBlockHashWithGlobals, computeContractLeaf } from '@aztec/circuits.js/abis';
3
- import { toFriendlyJSON } from '@aztec/circuits.js/utils';
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 } from '@aztec/foundation/serialize';
9
- import { ContractData, L2Block, L2BlockL2Logs, MerkleTreeId, PublicDataWrite, TxL2Logs } from '@aztec/types';
10
- import { computeGlobalVariablesHash } from '@aztec/world-state';
11
- import chunk from 'lodash.chunk';
12
- import flatMap from 'lodash.flatmap';
13
- const frToBigInt = (fr) => toBigIntBE(fr.toBuffer());
14
- const bigintToFr = (num) => new Fr(num);
15
- const bigintToNum = (num) => Number(num);
16
- // Denotes fields that are not used now, but will be in the future
17
- const FUTURE_FR = new Fr(0n);
18
- const FUTURE_NUM = 0;
19
- // Denotes fields that should be deleted
20
- const DELETE_FR = new Fr(0n);
21
- /**
22
- * Builds an L2 block out of a set of ProcessedTx's,
23
- * using the base, merge, and root rollup circuits.
24
- */
25
- export class SoloBlockBuilder {
26
- constructor(db, vks, simulator, prover, debug = createDebugLogger('aztec:sequencer:solo-block-builder')) {
27
- this.db = db;
28
- this.vks = vks;
29
- this.simulator = simulator;
30
- this.prover = prover;
31
- this.debug = debug;
32
- }
33
- /**
34
- * Builds an L2 block with the given number containing the given txs, updating state trees.
35
- * @param globalVariables - Global variables to be used in the block.
36
- * @param txs - Processed transactions to include in the block.
37
- * @param newL1ToL2Messages - L1 to L2 messages to be part of the block.
38
- * @param timestamp - Timestamp of the block.
39
- * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
40
- */
41
- async buildL2Block(globalVariables, txs, newL1ToL2Messages) {
42
- const [startPrivateDataTreeSnapshot, startNullifierTreeSnapshot, startContractTreeSnapshot, startPublicDataTreeSnapshot, startL1ToL2MessageTreeSnapshot, startHistoricBlocksTreeSnapshot,] = await Promise.all([
43
- MerkleTreeId.PRIVATE_DATA_TREE,
44
- MerkleTreeId.NULLIFIER_TREE,
45
- MerkleTreeId.CONTRACT_TREE,
46
- MerkleTreeId.PUBLIC_DATA_TREE,
47
- MerkleTreeId.L1_TO_L2_MESSAGES_TREE,
48
- MerkleTreeId.BLOCKS_TREE,
49
- ].map(tree => this.getTreeSnapshot(tree)));
50
- // Check txs are good for processing
51
- this.validateTxs(txs);
52
- // We fill the tx batch with empty txs, we process only one tx at a time for now
53
- const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, newL1ToL2Messages);
54
- const { endPrivateDataTreeSnapshot, endNullifierTreeSnapshot, endContractTreeSnapshot, endPublicDataTreeRoot, endL1ToL2MessagesTreeSnapshot, endHistoricBlocksTreeSnapshot, } = circuitsOutput;
55
- // Collect all new nullifiers, commitments, and contracts from all txs in this block
56
- const wasm = await CircuitsWasm.get();
57
- const newNullifiers = flatMap(txs, tx => tx.data.end.newNullifiers);
58
- const newCommitments = flatMap(txs, tx => tx.data.end.newCommitments);
59
- const newContracts = flatMap(txs, tx => tx.data.end.newContracts).map(cd => computeContractLeaf(wasm, cd));
60
- const newContractData = flatMap(txs, tx => tx.data.end.newContracts).map(n => new ContractData(n.contractAddress, n.portalContractAddress));
61
- const newPublicDataWrites = flatMap(txs, tx => tx.data.end.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafIndex, t.newValue)));
62
- const newL2ToL1Msgs = flatMap(txs, tx => tx.data.end.newL2ToL1Msgs);
63
- // Consolidate logs data from all txs
64
- const encryptedLogsArr = [];
65
- const unencryptedLogsArr = [];
66
- for (const tx of txs) {
67
- const encryptedLogs = tx.encryptedLogs || new TxL2Logs([]);
68
- encryptedLogsArr.push(encryptedLogs);
69
- const unencryptedLogs = tx.unencryptedLogs || new TxL2Logs([]);
70
- unencryptedLogsArr.push(unencryptedLogs);
71
- }
72
- const newEncryptedLogs = new L2BlockL2Logs(encryptedLogsArr);
73
- const newUnencryptedLogs = new L2BlockL2Logs(unencryptedLogsArr);
74
- const l2Block = L2Block.fromFields({
75
- number: Number(globalVariables.blockNumber.value),
76
- globalVariables,
77
- startPrivateDataTreeSnapshot,
78
- endPrivateDataTreeSnapshot,
79
- startNullifierTreeSnapshot,
80
- endNullifierTreeSnapshot,
81
- startContractTreeSnapshot,
82
- endContractTreeSnapshot,
83
- startPublicDataTreeRoot: startPublicDataTreeSnapshot.root,
84
- endPublicDataTreeRoot,
85
- startL1ToL2MessagesTreeSnapshot: startL1ToL2MessageTreeSnapshot,
86
- endL1ToL2MessagesTreeSnapshot,
87
- startHistoricBlocksTreeSnapshot,
88
- endHistoricBlocksTreeSnapshot,
89
- newCommitments,
90
- newNullifiers,
91
- newL2ToL1Msgs,
92
- newContracts,
93
- newContractData,
94
- newPublicDataWrites,
95
- newL1ToL2Messages,
96
- newEncryptedLogs,
97
- newUnencryptedLogs,
98
- });
99
- if (!l2Block.getCalldataHash().equals(circuitsOutput.sha256CalldataHash())) {
100
- throw new Error(`Calldata hash mismatch, ${l2Block.getCalldataHash().toString('hex')} == ${circuitsOutput
101
- .sha256CalldataHash()
102
- .toString('hex')} `);
103
- }
104
- return [l2Block, proof];
105
- }
106
- validateTxs(txs) {
107
- for (const tx of txs) {
108
- for (const historicTreeRoot of [
109
- 'privateDataTreeRoot',
110
- 'contractTreeRoot',
111
- 'nullifierTreeRoot',
112
- 'l1ToL2MessagesTreeRoot',
113
- ]) {
114
- if (tx.data.constants.blockData[historicTreeRoot].isZero()) {
115
- throw new Error(`Empty ${historicTreeRoot} for tx: ${toFriendlyJSON(tx)}`);
116
- }
117
- }
118
- }
119
- }
120
- async getTreeSnapshot(id) {
121
- const treeInfo = await this.db.getTreeInfo(id);
122
- return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
123
- }
124
- async runCircuits(globalVariables, txs, newL1ToL2Messages) {
125
- // Check that the length of the array of txs is a power of two
126
- // See https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2
127
- if (txs.length < 4 || (txs.length & (txs.length - 1)) !== 0) {
128
- throw new Error(`Length of txs for the block should be a power of two and at least four (got ${txs.length})`);
129
- }
130
- // padArrayEnd throws if the array is already full. Otherwise it pads till we reach the required size
131
- const newL1ToL2MessagesTuple = padArrayEnd(newL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
132
- // Run the base rollup circuits for the txs
133
- const baseRollupOutputs = [];
134
- for (const pair of chunk(txs, 2)) {
135
- const [tx1, tx2] = pair;
136
- baseRollupOutputs.push(await this.baseRollupCircuit(tx1, tx2, globalVariables));
137
- }
138
- // Run merge rollups in layers until we have only two outputs
139
- let mergeRollupInputs = baseRollupOutputs;
140
- let mergeRollupOutputs = [];
141
- while (mergeRollupInputs.length > 2) {
142
- for (const pair of chunk(mergeRollupInputs, 2)) {
143
- const [r1, r2] = pair;
144
- mergeRollupOutputs.push(await this.mergeRollupCircuit(r1, r2));
145
- }
146
- mergeRollupInputs = mergeRollupOutputs;
147
- mergeRollupOutputs = [];
148
- }
149
- // Run the root rollup with the last two merge rollups (or base, if no merge layers)
150
- const [mergeOutputLeft, mergeOutputRight] = mergeRollupInputs;
151
- return this.rootRollupCircuit(mergeOutputLeft, mergeOutputRight, newL1ToL2MessagesTuple);
152
- }
153
- async baseRollupCircuit(tx1, tx2, globalVariables) {
154
- this.debug(`Running base rollup for ${tx1.hash} ${tx2.hash}`);
155
- const rollupInput = await this.buildBaseRollupInput(tx1, tx2, globalVariables);
156
- const rollupOutput = await this.simulator.baseRollupCircuit(rollupInput);
157
- await this.validateTrees(rollupOutput);
158
- const proof = await this.prover.getBaseRollupProof(rollupInput, rollupOutput);
159
- return [rollupOutput, proof];
160
- }
161
- async mergeRollupCircuit(left, right) {
162
- const vk = this.getVerificationKey(left[0].rollupType);
163
- const mergeInputs = new MergeRollupInputs([
164
- this.getPreviousRollupDataFromPublicInputs(left[0], left[1], vk),
165
- this.getPreviousRollupDataFromPublicInputs(right[0], right[1], vk),
166
- ]);
167
- this.debug(`Running merge rollup circuit`);
168
- const output = await this.simulator.mergeRollupCircuit(mergeInputs);
169
- const proof = await this.prover.getMergeRollupProof(mergeInputs, output);
170
- return [output, proof];
171
- }
172
- getVerificationKey(type) {
173
- switch (type) {
174
- case RollupTypes.Base:
175
- return this.vks.baseRollupCircuit;
176
- case RollupTypes.Merge:
177
- return this.vks.mergeRollupCircuit;
178
- default:
179
- throw new Error(`No verification key available for ${type}`);
180
- }
181
- }
182
- async rootRollupCircuit(left, right, newL1ToL2Messages) {
183
- this.debug(`Running root rollup circuit`);
184
- const rootInput = await this.getRootRollupInput(...left, ...right, newL1ToL2Messages);
185
- // Update the local trees to include the new l1 to l2 messages
186
- await this.db.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGES_TREE, newL1ToL2Messages.map(m => m.toBuffer()));
187
- // Simulate and get proof for the root circuit
188
- const rootOutput = await this.simulator.rootRollupCircuit(rootInput);
189
- const rootProof = await this.prover.getRootRollupProof(rootInput, rootOutput);
190
- // Update the root trees with the latest data and contract tree roots,
191
- // and validate them against the output of the root circuit simulation
192
- this.debug(`Updating and validating root trees`);
193
- const globalVariablesHash = await computeGlobalVariablesHash(left[0].constants.globalVariables);
194
- await this.db.updateLatestGlobalVariablesHash(globalVariablesHash);
195
- await this.db.updateHistoricBlocksTree(globalVariablesHash);
196
- await this.validateRootOutput(rootOutput);
197
- return [rootOutput, rootProof];
198
- }
199
- async updateHistoricBlocksTree(globalVariables) {
200
- // Calculate the block hash and add it to the historic block hashes tree
201
- const blockHash = await this.calculateBlockHash(globalVariables);
202
- await this.db.appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
203
- }
204
- async calculateBlockHash(globals) {
205
- const [privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, publicDataTreeRoot, l1ToL2MessageTreeRoot] = (await Promise.all([
206
- MerkleTreeId.PRIVATE_DATA_TREE,
207
- MerkleTreeId.NULLIFIER_TREE,
208
- MerkleTreeId.CONTRACT_TREE,
209
- MerkleTreeId.PUBLIC_DATA_TREE,
210
- MerkleTreeId.L1_TO_L2_MESSAGES_TREE,
211
- ].map(tree => this.getTreeSnapshot(tree)))).map(r => r.root);
212
- const wasm = await CircuitsWasm.get();
213
- const blockHash = computeBlockHashWithGlobals(wasm, globals, privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessageTreeRoot, publicDataTreeRoot);
214
- return blockHash;
215
- }
216
- // Validate that the new roots we calculated from manual insertions match the outputs of the simulation
217
- async validateTrees(rollupOutput) {
218
- await Promise.all([
219
- this.validateTree(rollupOutput, MerkleTreeId.CONTRACT_TREE, 'Contract'),
220
- this.validateTree(rollupOutput, MerkleTreeId.PRIVATE_DATA_TREE, 'PrivateData'),
221
- this.validateTree(rollupOutput, MerkleTreeId.NULLIFIER_TREE, 'Nullifier'),
222
- this.validatePublicDataTreeRoot(rollupOutput),
223
- ]);
224
- }
225
- // Validate that the roots of all local trees match the output of the root circuit simulation
226
- async validateRootOutput(rootOutput) {
227
- await Promise.all([
228
- this.validateTrees(rootOutput),
229
- this.validateTree(rootOutput, MerkleTreeId.BLOCKS_TREE, 'HistoricBlocks'),
230
- this.validateTree(rootOutput, MerkleTreeId.L1_TO_L2_MESSAGES_TREE, 'L1ToL2Messages'),
231
- ]);
232
- }
233
- // Helper for validating a roots tree against a circuit simulation output
234
- async validateRootTree(rootOutput, treeId, name) {
235
- const localTree = await this.getTreeSnapshot(treeId);
236
- const simulatedTree = rootOutput[`endTreeOfHistoric${name}TreeRootsSnapshot`];
237
- this.validateSimulatedTree(localTree, simulatedTree, name, `Roots ${name}`);
238
- }
239
- /**
240
- * Validates that the root of the public data tree matches the output of the circuit simulation.
241
- * @param output - The output of the circuit simulation.
242
- * Note: Public data tree is sparse, so the "next available leaf index" doesn't make sense there.
243
- * For this reason we only validate root.
244
- */
245
- async validatePublicDataTreeRoot(output) {
246
- const localTree = await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
247
- const simulatedTreeRoot = output[`endPublicDataTreeRoot`];
248
- if (!simulatedTreeRoot.toBuffer().equals(localTree.root.toBuffer())) {
249
- throw new Error(`PublicData tree root mismatch (local ${localTree.root}, simulated ${simulatedTreeRoot})`);
250
- }
251
- }
252
- // Helper for validating a non-roots tree against a circuit simulation output
253
- async validateTree(output, treeId, name) {
254
- if ('endL1ToL2MessageTreeSnapshot' in output && !(output instanceof RootRollupPublicInputs)) {
255
- throw new Error(`The name 'L1ToL2Message' can only be used when output is of type RootRollupPublicInputs`);
256
- }
257
- const localTree = await this.getTreeSnapshot(treeId);
258
- const simulatedTree = output[`end${name}TreeSnapshot`];
259
- this.validateSimulatedTree(localTree, simulatedTree, name);
260
- }
261
- // Helper for comparing two trees snapshots
262
- validateSimulatedTree(localTree, simulatedTree, name, label) {
263
- if (!simulatedTree.root.toBuffer().equals(localTree.root.toBuffer())) {
264
- throw new Error(`${label ?? name} tree root mismatch (local ${localTree.root}, simulated ${simulatedTree.root})`);
265
- }
266
- if (simulatedTree.nextAvailableLeafIndex !== localTree.nextAvailableLeafIndex) {
267
- throw new Error(`${label ?? name} tree next available leaf index mismatch (local ${localTree.nextAvailableLeafIndex}, simulated ${simulatedTree.nextAvailableLeafIndex})`);
268
- }
269
- }
270
- // Builds the inputs for the root rollup circuit, without making any changes to trees
271
- async getRootRollupInput(rollupOutputLeft, rollupProofLeft, rollupOutputRight, rollupProofRight, newL1ToL2Messages) {
272
- const vk = this.getVerificationKey(rollupOutputLeft.rollupType);
273
- const previousRollupData = [
274
- this.getPreviousRollupDataFromPublicInputs(rollupOutputLeft, rollupProofLeft, vk),
275
- this.getPreviousRollupDataFromPublicInputs(rollupOutputRight, rollupProofRight, vk),
276
- ];
277
- const getRootTreeSiblingPath = async (treeId) => {
278
- // TODO: Synchronize these operations into the tree db to avoid race conditions
279
- const { size } = await this.db.getTreeInfo(treeId);
280
- // TODO: Check for off-by-one errors
281
- const path = await this.db.getSiblingPath(treeId, size);
282
- return path.toFieldArray();
283
- };
284
- const newL1ToL2MessagesTreeRootSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.L1_TO_L2_MESSAGES_TREE, L1_TO_L2_MSG_SUBTREE_HEIGHT);
285
- const newL1ToL2MessagesTreeRootSiblingPath = makeTuple(L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, i => i < newL1ToL2MessagesTreeRootSiblingPathArray.length ? newL1ToL2MessagesTreeRootSiblingPathArray[i] : Fr.ZERO, 0);
286
- // Get tree snapshots
287
- const startL1ToL2MessagesTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE);
288
- // Get historic block tree roots
289
- const startHistoricBlocksTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE);
290
- const newHistoricBlocksTreeSiblingPathArray = await getRootTreeSiblingPath(MerkleTreeId.BLOCKS_TREE);
291
- const newHistoricBlocksTreeSiblingPath = makeTuple(HISTORIC_BLOCKS_TREE_HEIGHT, i => (i < newHistoricBlocksTreeSiblingPathArray.length ? newHistoricBlocksTreeSiblingPathArray[i] : Fr.ZERO), 0);
292
- return RootRollupInputs.from({
293
- previousRollupData,
294
- newL1ToL2Messages,
295
- newL1ToL2MessagesTreeRootSiblingPath,
296
- startL1ToL2MessagesTreeSnapshot,
297
- startHistoricBlocksTreeSnapshot,
298
- newHistoricBlocksTreeSiblingPath,
299
- });
300
- }
301
- getPreviousRollupDataFromPublicInputs(rollupOutput, rollupProof, vk) {
302
- return new PreviousRollupData(rollupOutput, rollupProof, vk,
303
- // MembershipWitness for a VK tree to be implemented in the future
304
- FUTURE_NUM, new MembershipWitness(ROLLUP_VK_TREE_HEIGHT, BigInt(FUTURE_NUM), makeTuple(ROLLUP_VK_TREE_HEIGHT, () => FUTURE_FR)));
305
- }
306
- getKernelDataFor(tx) {
307
- return new PreviousKernelData(tx.data, tx.proof,
308
- // VK for the kernel circuit
309
- this.vks.privateKernelCircuit,
310
- // MembershipWitness for a VK tree to be implemented in the future
311
- FUTURE_NUM, assertLength(Array(VK_TREE_HEIGHT).fill(FUTURE_FR), VK_TREE_HEIGHT));
312
- }
313
- // Scan a tree searching for a specific value and return a membership witness proof for it
314
- async getMembershipWitnessFor(value, treeId, height) {
315
- // If this is an empty tx, then just return zeroes
316
- if (value.isZero())
317
- return this.makeEmptyMembershipWitness(height);
318
- const index = await this.db.findLeafIndex(treeId, value.toBuffer());
319
- if (index === undefined) {
320
- throw new Error(`Leaf with value ${value} not found in tree ${MerkleTreeId[treeId]}`);
321
- }
322
- const path = await this.db.getSiblingPath(treeId, index);
323
- return new MembershipWitness(height, index, assertLength(path.toFieldArray(), height));
324
- }
325
- async getHistoricTreesMembershipWitnessFor(tx) {
326
- const wasm = await CircuitsWasm.get();
327
- const blockData = tx.data.constants.blockData;
328
- const { privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessagesTreeRoot, publicDataTreeRoot } = blockData;
329
- const blockHash = computeBlockHash(wasm, blockData.globalVariablesHash, privateDataTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessagesTreeRoot, publicDataTreeRoot);
330
- return this.getMembershipWitnessFor(blockHash, MerkleTreeId.BLOCKS_TREE, HISTORIC_BLOCKS_TREE_HEIGHT);
331
- }
332
- async getConstantRollupData(globalVariables) {
333
- return ConstantRollupData.from({
334
- baseRollupVkHash: DELETE_FR,
335
- mergeRollupVkHash: DELETE_FR,
336
- privateKernelVkTreeRoot: FUTURE_FR,
337
- publicKernelVkTreeRoot: FUTURE_FR,
338
- startHistoricBlocksTreeRootsSnapshot: await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE),
339
- globalVariables,
340
- });
341
- }
342
- async getLowNullifierInfo(nullifier) {
343
- // Return empty nullifier info for an empty tx
344
- if (nullifier.value === 0n) {
345
- return {
346
- index: 0,
347
- leafPreimage: NullifierLeafPreimage.empty(),
348
- witness: this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
349
- };
350
- }
351
- const tree = MerkleTreeId.NULLIFIER_TREE;
352
- const prevValueIndex = await this.db.getPreviousValueIndex(tree, frToBigInt(nullifier));
353
- const prevValueInfo = await this.db.getLeafData(tree, prevValueIndex.index);
354
- if (!prevValueInfo)
355
- throw new Error(`Nullifier tree should have one initial leaf`);
356
- const prevValueSiblingPath = await this.db.getSiblingPath(tree, BigInt(prevValueIndex.index));
357
- return {
358
- index: prevValueIndex,
359
- leafPreimage: new NullifierLeafPreimage(bigintToFr(prevValueInfo.value), bigintToFr(prevValueInfo.nextValue), bigintToNum(prevValueInfo.nextIndex)),
360
- witness: new MembershipWitness(NULLIFIER_TREE_HEIGHT, BigInt(prevValueIndex.index), assertLength(prevValueSiblingPath.toFieldArray(), NULLIFIER_TREE_HEIGHT)),
361
- };
362
- }
363
- async getSubtreeSiblingPath(treeId, subtreeHeight) {
364
- const nextAvailableLeafIndex = await this.db.getTreeInfo(treeId).then(t => t.size);
365
- const fullSiblingPath = await this.db.getSiblingPath(treeId, nextAvailableLeafIndex);
366
- // Drop the first subtreeHeight items since we only care about the path to the subtree root
367
- return fullSiblingPath.getSubtreeSiblingPath(subtreeHeight).toFieldArray();
368
- }
369
- async processPublicDataUpdateRequests(tx) {
370
- const newPublicDataUpdateRequestsSiblingPaths = [];
371
- for (const publicDataUpdateRequest of tx.data.end.publicDataUpdateRequests) {
372
- const index = publicDataUpdateRequest.leafIndex.value;
373
- const path = await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, index);
374
- await this.db.updateLeaf(MerkleTreeId.PUBLIC_DATA_TREE, publicDataUpdateRequest.newValue.toBuffer(), index);
375
- newPublicDataUpdateRequestsSiblingPaths.push(path.toFieldArray());
376
- }
377
- return newPublicDataUpdateRequestsSiblingPaths;
378
- }
379
- async getPublicDataReadsSiblingPaths(tx) {
380
- const newPublicDataReadsSiblingPaths = [];
381
- for (const publicDataRead of tx.data.end.publicDataReads) {
382
- const index = publicDataRead.leafIndex.value;
383
- const path = await this.db.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, index);
384
- newPublicDataReadsSiblingPaths.push(path.toFieldArray());
385
- }
386
- return newPublicDataReadsSiblingPaths;
387
- }
388
- // Builds the base rollup inputs, updating the contract, nullifier, and data trees in the process
389
- async buildBaseRollupInput(left, right, globalVariables) {
390
- const wasm = await CircuitsWasm.get();
391
- // Get trees info before any changes hit
392
- const constants = await this.getConstantRollupData(globalVariables);
393
- const startNullifierTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
394
- const startContractTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
395
- const startPrivateDataTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE);
396
- const startPublicDataTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
397
- const startHistoricBlocksTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.BLOCKS_TREE);
398
- // Get the subtree sibling paths for the circuit
399
- const newCommitmentsSubtreeSiblingPath = await this.getSubtreeSiblingPath(MerkleTreeId.PRIVATE_DATA_TREE, BaseRollupInputs.PRIVATE_DATA_SUBTREE_HEIGHT);
400
- const newContractsSubtreeSiblingPath = await this.getSubtreeSiblingPath(MerkleTreeId.CONTRACT_TREE, BaseRollupInputs.CONTRACT_SUBTREE_HEIGHT);
401
- // Update the contract and private data trees with the new items being inserted to get the new roots
402
- // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
403
- const newContracts = flatMap([left, right], tx => tx.data.end.newContracts.map(cd => computeContractLeaf(wasm, cd)));
404
- const newCommitments = flatMap([left, right], tx => tx.data.end.newCommitments.map(x => x.toBuffer()));
405
- await this.db.appendLeaves(MerkleTreeId.CONTRACT_TREE, newContracts.map(x => x.toBuffer()));
406
- await this.db.appendLeaves(MerkleTreeId.PRIVATE_DATA_TREE, newCommitments);
407
- // Update the public data tree and get membership witnesses.
408
- // All public data reads are checked against the unmodified data root when the corresponding tx started,
409
- // so it's the unmodified tree for tx1, and the one after applying tx1 update request for tx2.
410
- // Update requests are checked against the tree as it is iteratively updated.
411
- // See https://github.com/AztecProtocol/aztec3-packages/issues/270#issuecomment-1522258200
412
- const leftPublicDataReadSiblingPaths = await this.getPublicDataReadsSiblingPaths(left);
413
- const leftPublicDataUpdateRequestsSiblingPaths = await this.processPublicDataUpdateRequests(left);
414
- const rightPublicDataReadSiblingPaths = await this.getPublicDataReadsSiblingPaths(right);
415
- const rightPublicDataUpdateRequestsSiblingPaths = await this.processPublicDataUpdateRequests(right);
416
- const newPublicDataReadsSiblingPaths = [...leftPublicDataReadSiblingPaths, ...rightPublicDataReadSiblingPaths];
417
- const newPublicDataUpdateRequestsSiblingPaths = [
418
- ...leftPublicDataUpdateRequestsSiblingPaths,
419
- ...rightPublicDataUpdateRequestsSiblingPaths,
420
- ];
421
- // Update the nullifier tree, capturing the low nullifier info for each individual operation
422
- const newNullifiers = [...left.data.end.newNullifiers, ...right.data.end.newNullifiers];
423
- const [nullifierWitnessLeaves, newNullifiersSubtreeSiblingPath] = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, newNullifiers.map(fr => fr.toBuffer()), BaseRollupInputs.NULLIFIER_SUBTREE_HEIGHT);
424
- if (nullifierWitnessLeaves === undefined) {
425
- throw new Error(`Could not craft nullifier batch insertion proofs`);
426
- }
427
- // Extract witness objects from returned data
428
- const lowNullifierMembershipWitnesses = nullifierWitnessLeaves.map(l => MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)));
429
- return BaseRollupInputs.from({
430
- constants,
431
- startNullifierTreeSnapshot,
432
- startContractTreeSnapshot,
433
- startPrivateDataTreeSnapshot,
434
- startPublicDataTreeRoot: startPublicDataTreeSnapshot.root,
435
- startHistoricBlocksTreeSnapshot,
436
- newCommitmentsSubtreeSiblingPath,
437
- newContractsSubtreeSiblingPath,
438
- newNullifiersSubtreeSiblingPath: newNullifiersSubtreeSiblingPath.toFieldArray(),
439
- newPublicDataUpdateRequestsSiblingPaths,
440
- newPublicDataReadsSiblingPaths,
441
- lowNullifierLeafPreimages: nullifierWitnessLeaves.map(({ leafData }) => new NullifierLeafPreimage(new Fr(leafData.value), new Fr(leafData.nextValue), Number(leafData.nextIndex))),
442
- lowNullifierMembershipWitness: lowNullifierMembershipWitnesses,
443
- kernelData: [this.getKernelDataFor(left), this.getKernelDataFor(right)],
444
- historicBlocksTreeRootMembershipWitnesses: [
445
- await this.getHistoricTreesMembershipWitnessFor(left),
446
- await this.getHistoricTreesMembershipWitnessFor(right),
447
- ],
448
- });
449
- }
450
- makeEmptyMembershipWitness(height) {
451
- return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
452
- }
453
- }
454
- //# 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,3 +0,0 @@
1
- import { type MemDown } from 'memdown';
2
- export declare const createMemDown: () => MemDown<any, any>;
3
- //# sourceMappingURL=solo_block_builder.test.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"solo_block_builder.test.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.test.ts"],"names":[],"mappings":"AAkDA,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,SAAS,CAAC;AAe3D,eAAO,MAAM,aAAa,yBAAgD,CAAC"}