@aztec/sequencer-client 0.17.0 → 0.19.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 (37) hide show
  1. package/dest/block_builder/index.d.ts +1 -1
  2. package/dest/block_builder/index.d.ts.map +1 -1
  3. package/dest/block_builder/solo_block_builder.d.ts +5 -5
  4. package/dest/block_builder/solo_block_builder.d.ts.map +1 -1
  5. package/dest/block_builder/solo_block_builder.js +54 -83
  6. package/dest/block_builder/types.d.ts +0 -11
  7. package/dest/block_builder/types.d.ts.map +1 -1
  8. package/dest/client/sequencer-client.d.ts +1 -1
  9. package/dest/client/sequencer-client.d.ts.map +1 -1
  10. package/dest/prover/empty.js +4 -4
  11. package/dest/publisher/l1-publisher.d.ts +12 -3
  12. package/dest/publisher/l1-publisher.d.ts.map +1 -1
  13. package/dest/publisher/l1-publisher.js +23 -23
  14. package/dest/publisher/viem-tx-sender.d.ts +2 -1
  15. package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
  16. package/dest/publisher/viem-tx-sender.js +6 -2
  17. package/dest/receiver.d.ts +1 -1
  18. package/dest/receiver.d.ts.map +1 -1
  19. package/dest/sequencer/config.d.ts +1 -1
  20. package/dest/sequencer/config.d.ts.map +1 -1
  21. package/dest/sequencer/processed_tx.d.ts +1 -1
  22. package/dest/sequencer/processed_tx.d.ts.map +1 -1
  23. package/dest/sequencer/processed_tx.js +2 -2
  24. package/dest/sequencer/public_processor.d.ts +1 -1
  25. package/dest/sequencer/public_processor.d.ts.map +1 -1
  26. package/dest/sequencer/public_processor.js +2 -2
  27. package/dest/sequencer/sequencer.d.ts +1 -1
  28. package/dest/sequencer/sequencer.d.ts.map +1 -1
  29. package/dest/sequencer/sequencer.js +13 -13
  30. package/dest/simulator/public_executor.d.ts +1 -1
  31. package/dest/simulator/public_executor.d.ts.map +1 -1
  32. package/dest/simulator/public_executor.js +2 -2
  33. package/dest/simulator/public_kernel.d.ts.map +1 -1
  34. package/dest/simulator/public_kernel.js +1 -1
  35. package/dest/simulator/rollup.d.ts.map +1 -1
  36. package/dest/simulator/rollup.js +1 -1
  37. package/package.json +12 -11
@@ -1,6 +1,6 @@
1
+ import { L2Block } from '@aztec/circuit-types';
1
2
  import { GlobalVariables, Proof } from '@aztec/circuits.js';
2
3
  import { Fr } from '@aztec/foundation/fields';
3
- import { L2Block } from '@aztec/types';
4
4
  import { ProcessedTx } from '../sequencer/processed_tx.js';
5
5
  /**
6
6
  * Assembles an L2Block from a set of processed transactions.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,YAAY,CACV,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;CAC9B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/block_builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;OAOG;IACH,YAAY,CACV,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,WAAW,EAAE,EAClB,iBAAiB,EAAE,EAAE,EAAE,GACtB,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;CAC9B"}
@@ -1,14 +1,14 @@
1
- import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantRollupData, GlobalVariables, MembershipWitness, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PreviousKernelData, PreviousRollupData, Proof, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VerificationKey } from '@aztec/circuits.js';
1
+ import { L2Block, MerkleTreeId } from '@aztec/circuit-types';
2
+ import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, BaseRollupInputs, ConstantRollupData, GlobalVariables, MembershipWitness, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeafPreimage, PartialStateReference, PreviousKernelData, PreviousRollupData, Proof, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, RollupTypes, RootRollupInputs, RootRollupPublicInputs, StateReference, VerificationKey } from '@aztec/circuits.js';
2
3
  import { Fr } from '@aztec/foundation/fields';
3
4
  import { Tuple } from '@aztec/foundation/serialize';
4
- import { L2Block, MerkleTreeId } from '@aztec/types';
5
5
  import { MerkleTreeOperations } from '@aztec/world-state';
6
6
  import { VerificationKeys } from '../mocks/verification_keys.js';
7
7
  import { RollupProver } from '../prover/index.js';
8
8
  import { ProcessedTx } from '../sequencer/processed_tx.js';
9
9
  import { RollupSimulator } from '../simulator/index.js';
10
10
  import { BlockBuilder } from './index.js';
11
- import { AllowedTreeNames, TreeNames } from './types.js';
11
+ import { TreeNames } from './types.js';
12
12
  /**
13
13
  * Builds an L2 block out of a set of ProcessedTx's,
14
14
  * using the base, merge, and root rollup circuits.
@@ -38,9 +38,9 @@ export declare class SoloBlockBuilder implements BlockBuilder {
38
38
  protected rootRollupCircuit(left: [BaseOrMergeRollupPublicInputs, Proof], right: [BaseOrMergeRollupPublicInputs, Proof], newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<[RootRollupPublicInputs, Proof]>;
39
39
  updateArchive(globalVariables: GlobalVariables): Promise<void>;
40
40
  protected calculateBlockHash(globals: GlobalVariables): Promise<Fr>;
41
- protected validateTrees(rollupOutput: BaseOrMergeRollupPublicInputs | RootRollupPublicInputs): Promise<void>;
41
+ protected validatePartialState(partialState: PartialStateReference): Promise<void>;
42
+ protected validateState(state: StateReference): Promise<void>;
42
43
  protected validateRootOutput(rootOutput: RootRollupPublicInputs): Promise<void>;
43
- protected validateTree<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs>(output: T, treeId: MerkleTreeId, name: AllowedTreeNames<T>): Promise<void>;
44
44
  protected validateSimulatedTree(localTree: AppendOnlyTreeSnapshot, simulatedTree: AppendOnlyTreeSnapshot, name: TreeNames, label?: string): void;
45
45
  protected getRootRollupInput(rollupOutputLeft: BaseOrMergeRollupPublicInputs, rollupProofLeft: Proof, rollupOutputRight: BaseOrMergeRollupPublicInputs, rollupProofRight: Proof, newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>): Promise<RootRollupInputs>;
46
46
  protected getPreviousRollupDataFromPublicInputs(rollupOutput: BaseOrMergeRollupPublicInputs, rollupProof: Proof, vk: VerificationKey): PreviousRollupData;
@@ -1 +1 @@
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
+ {"version":3,"file":"solo_block_builder.d.ts","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
- import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, CONTRACT_SUBTREE_HEIGHT, CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, 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, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PreviousKernelData, PreviousRollupData, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, ROLLUP_VK_TREE_HEIGHT, RollupTypes, RootRollupInputs, RootRollupPublicInputs, VK_TREE_HEIGHT, makeTuple, } from '@aztec/circuits.js';
1
+ import { ContractData, L2Block, L2BlockL2Logs, MerkleTreeId, PublicDataWrite, TxL2Logs } from '@aztec/circuit-types';
2
+ import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BaseRollupInputs, CONTRACT_SUBTREE_HEIGHT, CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, 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, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PreviousKernelData, PreviousRollupData, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, ROLLUP_VK_TREE_HEIGHT, RollupTypes, RootRollupInputs, StateDiffHints, VK_TREE_HEIGHT, } from '@aztec/circuits.js';
2
3
  import { computeBlockHash, computeBlockHashWithGlobals, computeContractLeaf, computeGlobalsHash, } from '@aztec/circuits.js/abis';
3
- import { toFriendlyJSON } from '@aztec/circuits.js/utils';
4
+ import { makeTuple } from '@aztec/foundation/array';
4
5
  import { toBigIntBE } from '@aztec/foundation/bigint-buffer';
5
6
  import { padArrayEnd } from '@aztec/foundation/collection';
6
7
  import { Fr } from '@aztec/foundation/fields';
7
8
  import { createDebugLogger } from '@aztec/foundation/log';
8
- import { assertLength } from '@aztec/foundation/serialize';
9
- import { ContractData, L2Block, L2BlockL2Logs, MerkleTreeId, PublicDataWrite, TxL2Logs } from '@aztec/types';
9
+ import { assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
10
10
  import chunk from 'lodash.chunk';
11
11
  const frToBigInt = (fr) => toBigIntBE(fr.toBuffer());
12
12
  // Denotes fields that are not used now, but will be in the future
@@ -35,19 +35,10 @@ export class SoloBlockBuilder {
35
35
  * @returns The new L2 block and a correctness proof as returned by the root rollup circuit.
36
36
  */
37
37
  async buildL2Block(globalVariables, txs, newL1ToL2Messages) {
38
- const [startNoteHashTreeSnapshot, startNullifierTreeSnapshot, startContractTreeSnapshot, startPublicDataTreeSnapshot, startL1ToL2MessageTreeSnapshot, startArchiveSnapshot,] = await Promise.all([
39
- MerkleTreeId.NOTE_HASH_TREE,
40
- MerkleTreeId.NULLIFIER_TREE,
41
- MerkleTreeId.CONTRACT_TREE,
42
- MerkleTreeId.PUBLIC_DATA_TREE,
43
- MerkleTreeId.L1_TO_L2_MESSAGE_TREE,
44
- MerkleTreeId.ARCHIVE,
45
- ].map(tree => this.getTreeSnapshot(tree)));
46
38
  // Check txs are good for processing
47
39
  this.validateTxs(txs);
48
40
  // We fill the tx batch with empty txs, we process only one tx at a time for now
49
41
  const [circuitsOutput, proof] = await this.runCircuits(globalVariables, txs, newL1ToL2Messages);
50
- const { endNoteHashTreeSnapshot, endNullifierTreeSnapshot, endContractTreeSnapshot, endPublicDataTreeSnapshot, endL1ToL2MessageTreeSnapshot, endArchiveSnapshot, } = circuitsOutput;
51
42
  // Collect all new nullifiers, commitments, and contracts from all txs in this block
52
43
  const newNullifiers = txs.flatMap(tx => tx.data.end.newNullifiers);
53
44
  const newCommitments = txs.flatMap(tx => tx.data.end.newCommitments);
@@ -69,20 +60,8 @@ export class SoloBlockBuilder {
69
60
  const newEncryptedLogs = new L2BlockL2Logs(encryptedLogsArr);
70
61
  const newUnencryptedLogs = new L2BlockL2Logs(unencryptedLogsArr);
71
62
  const l2Block = L2Block.fromFields({
72
- number: Number(globalVariables.blockNumber.value),
73
- globalVariables,
74
- startNoteHashTreeSnapshot,
75
- endNoteHashTreeSnapshot,
76
- startNullifierTreeSnapshot,
77
- endNullifierTreeSnapshot,
78
- startContractTreeSnapshot,
79
- endContractTreeSnapshot,
80
- startPublicDataTreeSnapshot,
81
- endPublicDataTreeSnapshot,
82
- startL1ToL2MessageTreeSnapshot: startL1ToL2MessageTreeSnapshot,
83
- endL1ToL2MessageTreeSnapshot,
84
- startArchiveSnapshot,
85
- endArchiveSnapshot,
63
+ archive: circuitsOutput.archive,
64
+ header: circuitsOutput.header,
86
65
  newCommitments: newCommitments.map((c) => c.value),
87
66
  newNullifiers: newNullifiers.map((n) => n.value),
88
67
  newL2ToL1Msgs,
@@ -93,10 +72,10 @@ export class SoloBlockBuilder {
93
72
  newEncryptedLogs,
94
73
  newUnencryptedLogs,
95
74
  });
96
- if (!l2Block.getCalldataHash().equals(circuitsOutput.sha256CalldataHash())) {
97
- throw new Error(`Calldata hash mismatch, ${l2Block.getCalldataHash().toString('hex')} == ${circuitsOutput
98
- .sha256CalldataHash()
99
- .toString('hex')} `);
75
+ if (!l2Block.getCalldataHash().equals(circuitsOutput.header.bodyHash)) {
76
+ throw new Error(`Calldata hash mismatch, ${l2Block
77
+ .getCalldataHash()
78
+ .toString('hex')} == ${circuitsOutput.header.bodyHash.toString('hex')} `);
100
79
  }
101
80
  return [l2Block, proof];
102
81
  }
@@ -150,7 +129,7 @@ export class SoloBlockBuilder {
150
129
  this.debug(`Running base rollup for ${tx.hash}`);
151
130
  const rollupInput = await this.buildBaseRollupInput(tx, globalVariables);
152
131
  const rollupOutput = await this.simulator.baseRollupCircuit(rollupInput);
153
- await this.validateTrees(rollupOutput);
132
+ await this.validatePartialState(rollupOutput.end);
154
133
  const proof = await this.prover.getBaseRollupProof(rollupInput, rollupOutput);
155
134
  return [rollupOutput, proof];
156
135
  }
@@ -208,32 +187,27 @@ export class SoloBlockBuilder {
208
187
  const blockHash = computeBlockHashWithGlobals(globals, noteHashTreeRoot, nullifierTreeRoot, contractTreeRoot, l1ToL2MessageTreeRoot, publicDataTreeRoot);
209
188
  return blockHash;
210
189
  }
211
- // Validate that the new roots we calculated from manual insertions match the outputs of the simulation
212
- async validateTrees(rollupOutput) {
190
+ async validatePartialState(partialState) {
191
+ await Promise.all([
192
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE), partialState.noteHashTree, 'NoteHashTree'),
193
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE), partialState.nullifierTree, 'NullifierTree'),
194
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE), partialState.contractTree, 'ContractTree'),
195
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE), partialState.publicDataTree, 'PublicDataTree'),
196
+ ]);
197
+ }
198
+ async validateState(state) {
213
199
  await Promise.all([
214
- this.validateTree(rollupOutput, MerkleTreeId.CONTRACT_TREE, 'ContractTree'),
215
- this.validateTree(rollupOutput, MerkleTreeId.NOTE_HASH_TREE, 'NoteHashTree'),
216
- this.validateTree(rollupOutput, MerkleTreeId.NULLIFIER_TREE, 'NullifierTree'),
217
- this.validateTree(rollupOutput, MerkleTreeId.PUBLIC_DATA_TREE, 'PublicDataTree'),
200
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE), state.l1ToL2MessageTree, 'L1ToL2MessageTree'),
201
+ this.validatePartialState(state.partial),
218
202
  ]);
219
203
  }
220
204
  // Validate that the roots of all local trees match the output of the root circuit simulation
221
205
  async validateRootOutput(rootOutput) {
222
206
  await Promise.all([
223
- this.validateTrees(rootOutput),
224
- this.validateTree(rootOutput, MerkleTreeId.ARCHIVE, 'Archive'),
225
- this.validateTree(rootOutput, MerkleTreeId.L1_TO_L2_MESSAGE_TREE, 'L1ToL2MessageTree'),
207
+ this.validateState(rootOutput.header.state),
208
+ this.validateSimulatedTree(await this.getTreeSnapshot(MerkleTreeId.ARCHIVE), rootOutput.archive, 'Archive'),
226
209
  ]);
227
210
  }
228
- // Helper for validating a non-roots tree against a circuit simulation output
229
- async validateTree(output, treeId, name) {
230
- if ('endL1ToL2MessageTreeSnapshot' in output && !(output instanceof RootRollupPublicInputs)) {
231
- throw new Error(`The name 'L1ToL2Message' can only be used when output is of type RootRollupPublicInputs`);
232
- }
233
- const localTree = await this.getTreeSnapshot(treeId);
234
- const simulatedTree = output[`end${name}Snapshot`];
235
- this.validateSimulatedTree(localTree, simulatedTree, name);
236
- }
237
211
  // Helper for comparing two trees snapshots
238
212
  validateSimulatedTree(localTree, simulatedTree, name, label) {
239
213
  if (!simulatedTree.root.toBuffer().equals(localTree.root.toBuffer())) {
@@ -311,7 +285,7 @@ export class SoloBlockBuilder {
311
285
  mergeRollupVkHash: DELETE_FR,
312
286
  privateKernelVkTreeRoot: FUTURE_FR,
313
287
  publicKernelVkTreeRoot: FUTURE_FR,
314
- archiveSnapshot: await this.getTreeSnapshot(MerkleTreeId.ARCHIVE),
288
+ lastArchive: await this.getTreeSnapshot(MerkleTreeId.ARCHIVE),
315
289
  globalVariables,
316
290
  });
317
291
  }
@@ -400,16 +374,12 @@ export class SoloBlockBuilder {
400
374
  async buildBaseRollupInput(tx, globalVariables) {
401
375
  // Get trees info before any changes hit
402
376
  const constants = await this.getConstantRollupData(globalVariables);
403
- const startNullifierTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
404
- const startContractTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
405
- const startNoteHashTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE);
406
- const startPublicDataTreeSnapshot = await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE);
407
- const startArchiveSnapshot = await this.getTreeSnapshot(MerkleTreeId.ARCHIVE);
377
+ const start = new PartialStateReference(await this.getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE), await this.getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE), await this.getTreeSnapshot(MerkleTreeId.CONTRACT_TREE), await this.getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE));
408
378
  // Get the subtree sibling paths for the circuit
409
- const newCommitmentsSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.NOTE_HASH_TREE, NOTE_HASH_SUBTREE_HEIGHT);
410
- const newCommitmentsSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i => i < newCommitmentsSubtreeSiblingPathArray.length ? newCommitmentsSubtreeSiblingPathArray[i] : Fr.ZERO);
411
- const newContractsSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.CONTRACT_TREE, CONTRACT_SUBTREE_HEIGHT);
412
- const newContractsSubtreeSiblingPath = makeTuple(CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, i => i < newContractsSubtreeSiblingPathArray.length ? newContractsSubtreeSiblingPathArray[i] : Fr.ZERO);
379
+ const noteHashSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.NOTE_HASH_TREE, NOTE_HASH_SUBTREE_HEIGHT);
380
+ const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i => i < noteHashSubtreeSiblingPathArray.length ? noteHashSubtreeSiblingPathArray[i] : Fr.ZERO);
381
+ const contractSubtreeSiblingPathArray = await this.getSubtreeSiblingPath(MerkleTreeId.CONTRACT_TREE, CONTRACT_SUBTREE_HEIGHT);
382
+ const contractSubtreeSiblingPath = makeTuple(CONTRACT_SUBTREE_SIBLING_PATH_LENGTH, i => i < contractSubtreeSiblingPathArray.length ? contractSubtreeSiblingPathArray[i] : Fr.ZERO);
413
383
  // Update the contract and note hash trees with the new items being inserted to get the new roots
414
384
  // that will be used by the next iteration of the base rollup circuit, skipping the empty ones
415
385
  const newContracts = tx.data.end.newContracts.map(cd => computeContractLeaf(cd));
@@ -422,44 +392,45 @@ export class SoloBlockBuilder {
422
392
  const txPublicDataUpdateRequestInfo = await this.processPublicDataUpdateRequests(tx);
423
393
  // Update the nullifier tree, capturing the low nullifier info for each individual operation
424
394
  const newNullifiers = tx.data.end.newNullifiers;
425
- const { lowLeavesWitnessData: nullifierWitnessLeaves, newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath, sortedNewLeaves: sortedNewNullifiers, sortedNewLeavesIndexes: sortednewNullifiersIndexes, } = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
395
+ const { lowLeavesWitnessData: nullifierWitnessLeaves, newSubtreeSiblingPath: newNullifiersSubtreeSiblingPath, sortedNewLeaves: sortedNewNullifiers, sortedNewLeavesIndexes, } = await this.db.batchInsert(MerkleTreeId.NULLIFIER_TREE, newNullifiers.map(sideEffectLinkedToNoteHash => sideEffectLinkedToNoteHash.value.toBuffer()), NULLIFIER_SUBTREE_HEIGHT);
426
396
  if (nullifierWitnessLeaves === undefined) {
427
397
  throw new Error(`Could not craft nullifier batch insertion proofs`);
428
398
  }
429
399
  // Extract witness objects from returned data
430
- const lowNullifierMembershipWitnesses = nullifierWitnessLeaves.map(l => MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)));
431
- const newNullifiersSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFieldArray();
400
+ const nullifierPredecessorMembershipWitnessesWithoutPadding = nullifierWitnessLeaves.map(l => MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)));
401
+ const nullifierSubtreeSiblingPathArray = newNullifiersSubtreeSiblingPath.toFieldArray();
402
+ const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i => i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO);
403
+ const publicDataSiblingPath = txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath;
404
+ const stateDiffHints = StateDiffHints.from({
405
+ nullifierPredecessorPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < nullifierWitnessLeaves.length
406
+ ? nullifierWitnessLeaves[i].leafPreimage
407
+ : NullifierLeafPreimage.empty()),
408
+ nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
409
+ ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
410
+ : this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT)),
411
+ sortedNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
412
+ sortedNullifierIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
413
+ noteHashSubtreeSiblingPath,
414
+ nullifierSubtreeSiblingPath,
415
+ contractSubtreeSiblingPath,
416
+ publicDataSiblingPath,
417
+ });
432
418
  return BaseRollupInputs.from({
433
- constants,
434
- startNullifierTreeSnapshot,
435
- startContractTreeSnapshot,
436
- startNoteHashTreeSnapshot,
437
- startPublicDataTreeSnapshot,
438
- archiveSnapshot: startArchiveSnapshot,
419
+ kernelData: this.getKernelDataFor(tx),
420
+ start,
421
+ stateDiffHints,
439
422
  sortedPublicDataWrites: txPublicDataUpdateRequestInfo.sortedPublicDataWrites,
440
423
  sortedPublicDataWritesIndexes: txPublicDataUpdateRequestInfo.sortedPublicDataWritesIndexes,
441
424
  lowPublicDataWritesPreimages: txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages,
442
425
  lowPublicDataWritesMembershipWitnesses: txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses,
443
- publicDataWritesSubtreeSiblingPath: txPublicDataUpdateRequestInfo.newPublicDataSubtreeSiblingPath,
444
- sortedNewNullifiers: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortedNewNullifiers[i])),
445
- sortednewNullifiersIndexes: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => sortednewNullifiersIndexes[i]),
446
- newCommitmentsSubtreeSiblingPath,
447
- newContractsSubtreeSiblingPath,
448
- newNullifiersSubtreeSiblingPath: makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i => i < newNullifiersSubtreeSiblingPathArray.length ? newNullifiersSubtreeSiblingPathArray[i] : Fr.ZERO),
449
426
  publicDataReadsPreimages: txPublicDataReadsInfo.newPublicDataReadsPreimages,
450
427
  publicDataReadsMembershipWitnesses: txPublicDataReadsInfo.newPublicDataReadsWitnesses,
451
- lowNullifierLeafPreimages: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < nullifierWitnessLeaves.length
452
- ? nullifierWitnessLeaves[i].leafPreimage
453
- : NullifierLeafPreimage.empty()),
454
- lowNullifierMembershipWitness: makeTuple(MAX_NEW_NULLIFIERS_PER_TX, i => i < lowNullifierMembershipWitnesses.length
455
- ? lowNullifierMembershipWitnesses[i]
456
- : this.makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT)),
457
- kernelData: this.getKernelDataFor(tx),
458
428
  archiveRootMembershipWitness: await this.getHistoricalTreesMembershipWitnessFor(tx),
429
+ constants,
459
430
  });
460
431
  }
461
432
  makeEmptyMembershipWitness(height) {
462
433
  return new MembershipWitness(height, 0n, makeTuple(height, () => Fr.ZERO));
463
434
  }
464
435
  }
465
- //# 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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"}
436
+ //# 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,4 +1,3 @@
1
- import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, RootRollupPublicInputs } from '@aztec/circuits.js';
2
1
  /**
3
2
  * Type representing the names of the trees for the base rollup.
4
3
  */
@@ -7,15 +6,5 @@ type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'Public
7
6
  * Type representing the names of the trees.
8
7
  */
9
8
  export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
10
- /**
11
- * Type to assert that only the correct trees are checked when validating rollup tree outputs.
12
- */
13
- export type AllowedTreeNames<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs> = T extends RootRollupPublicInputs ? TreeNames : BaseTreeNames;
14
- /**
15
- * Type to assert the correct object field is indexed when validating rollup tree outputs.
16
- */
17
- export type OutputWithTreeSnapshot<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs> = {
18
- [K in `end${AllowedTreeNames<T>}Snapshot`]: AppendOnlyTreeSnapshot;
19
- };
20
9
  export {};
21
10
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/block_builder/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEnH;;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;AAExE;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,6BAA6B,GAAG,sBAAsB,IAC3F,CAAC,SAAS,sBAAsB,GAAG,SAAS,GAAG,aAAa,CAAC;AAE/D;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,6BAA6B,GAAG,sBAAsB,IAAI;KACpG,CAAC,IAAI,MAAM,gBAAgB,CAAC,CAAC,CAAC,UAAU,GAAG,sBAAsB;CACnE,CAAC"}
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,5 +1,5 @@
1
+ import { ContractDataSource, L1ToL2MessageSource, L2BlockSource } from '@aztec/circuit-types';
1
2
  import { P2P } from '@aztec/p2p';
2
- import { ContractDataSource, L1ToL2MessageSource, L2BlockSource } from '@aztec/types';
3
3
  import { WorldStateSynchronizer } from '@aztec/world-state';
4
4
  import { SequencerClientConfig } from '../config.js';
5
5
  import { Sequencer, SequencerConfig } from '../index.js';
@@ -1 +1 @@
1
- {"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAuC,MAAM,aAAa,CAAC;AAK9F;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC;;;;;;;;;OASG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,GAAG,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB;IA+B1C;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;CAGf"}
1
+ {"version":3,"file":"sequencer-client.d.ts","sourceRoot":"","sources":["../../src/client/sequencer-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAuC,MAAM,aAAa,CAAC;AAK9F;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAExC;;;;;;;;;OASG;WACiB,GAAG,CACrB,MAAM,EAAE,qBAAqB,EAC7B,SAAS,EAAE,GAAG,EACd,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB;IA+B1C;;;OAGG;IACI,qBAAqB,CAAC,MAAM,EAAE,eAAe;IAIpD;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;CAGf"}
@@ -13,7 +13,7 @@ export class EmptyRollupProver {
13
13
  * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
14
14
  */
15
15
  async getBaseRollupProof(_input, publicInputs) {
16
- publicInputs.endAggregationObject = AggregationObject.makeFake();
16
+ publicInputs.aggregationObject = AggregationObject.makeFake();
17
17
  return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
18
18
  }
19
19
  /**
@@ -22,7 +22,7 @@ export class EmptyRollupProver {
22
22
  * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
23
23
  */
24
24
  async getMergeRollupProof(_input, publicInputs) {
25
- publicInputs.endAggregationObject = AggregationObject.makeFake();
25
+ publicInputs.aggregationObject = AggregationObject.makeFake();
26
26
  return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
27
27
  }
28
28
  /**
@@ -31,7 +31,7 @@ export class EmptyRollupProver {
31
31
  * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
32
32
  */
33
33
  async getRootRollupProof(_input, publicInputs) {
34
- publicInputs.endAggregationObject = AggregationObject.makeFake();
34
+ publicInputs.aggregationObject = AggregationObject.makeFake();
35
35
  return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
36
36
  }
37
37
  }
@@ -54,4 +54,4 @@ export class EmptyPublicProver {
54
54
  return new Proof(Buffer.alloc(EMPTY_PROOF_SIZE, 0));
55
55
  }
56
56
  }
57
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1wdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmVyL2VtcHR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtDQUFrQztBQUNsQyxPQUFPLEVBQ0wsaUJBQWlCLEVBSWpCLEtBQUssR0FLTixNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFDO0FBRTVCLDJGQUEyRjtBQUMzRixzQ0FBc0M7QUFFdEM7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUEyQztRQUM1RixZQUFZLENBQUMsb0JBQW9CLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDakUsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsbUJBQW1CLENBQUMsTUFBeUIsRUFBRSxZQUEyQztRQUM5RixZQUFZLENBQUMsb0JBQW9CLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDakUsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUFvQztRQUNyRixZQUFZLENBQUMsb0JBQW9CLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDakUsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7T0FHRztJQUNILEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxhQUF3QztRQUNsRSxPQUFPLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLDJCQUEyQixDQUFDLGFBQXVDO1FBQ3ZFLE9BQU8sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7Q0FDRiJ9
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW1wdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJvdmVyL2VtcHR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtDQUFrQztBQUNsQyxPQUFPLEVBQ0wsaUJBQWlCLEVBSWpCLEtBQUssR0FLTixNQUFNLG9CQUFvQixDQUFDO0FBSTVCLE1BQU0sZ0JBQWdCLEdBQUcsRUFBRSxDQUFDO0FBRTVCLDJGQUEyRjtBQUMzRixzQ0FBc0M7QUFFdEM7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUEyQztRQUM1RixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsbUJBQW1CLENBQUMsTUFBeUIsRUFBRSxZQUEyQztRQUM5RixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxLQUFLLENBQUMsa0JBQWtCLENBQUMsTUFBd0IsRUFBRSxZQUFvQztRQUNyRixZQUFZLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDOUQsT0FBTyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDdEQsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCOzs7T0FHRztJQUNILEtBQUssQ0FBQyxxQkFBcUIsQ0FBQyxhQUF3QztRQUNsRSxPQUFPLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLDJCQUEyQixDQUFDLGFBQXVDO1FBQ3ZFLE9BQU8sSUFBSSxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3RELENBQUM7Q0FDRiJ9
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- import { ExtendedContractData, L2Block } from '@aztec/types';
2
+ import { ExtendedContractData, L2Block } from '@aztec/circuit-types';
3
3
  import { L2BlockReceiver } from '../receiver.js';
4
4
  import { PublisherConfig } from './config.js';
5
5
  /**
@@ -58,6 +58,11 @@ export interface L1PublisherTxSender {
58
58
  * @param txHash - Hash of the tx to look for.
59
59
  */
60
60
  getTransactionStats(txHash: string): Promise<TransactionStats | undefined>;
61
+ /**
62
+ * Returns the current state hash.
63
+ * @returns The current state hash of the rollup contract.
64
+ */
65
+ getCurrentStateHash(): Promise<Buffer>;
61
66
  }
62
67
  /**
63
68
  * Encoded block data and proof ready to be pushed to the L1 contract.
@@ -110,8 +115,12 @@ export declare class L1Publisher implements L2BlockReceiver {
110
115
  interrupt(): void;
111
116
  /** Restarts the publisher after calling `interrupt`. */
112
117
  restart(): void;
113
- private checkFeeDistributorBalance;
114
- private checkNextL2BlockNum;
118
+ /**
119
+ * Verifies that the given value of start state hash equals that on the rollup contract
120
+ * @param startStateHash - The start state hash of the block we wish to publish.
121
+ * @returns Boolean indicating if the hashes are equal.
122
+ */
123
+ private checkStartStateHash;
115
124
  private sendProcessTx;
116
125
  private sendEmitNewContractDataTx;
117
126
  private getTransactionReceipt;
@@ -1 +1 @@
1
- {"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK7D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEvE;;;;;;;;;OASG;IACH,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,oBAAoB,EAAE,GAC9C,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAAC;IAEtF;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;CAC5E;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAYF;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,eAAe;IAMrC,OAAO,CAAC,QAAQ;IAL5B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAkD;gBAEzC,QAAQ,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,eAAe;IAI3E;;;;OAIG;IACU,cAAc,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAgDnE;;;;;;OAMG;IACU,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE;IA0CjH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;YAOA,0BAA0B;IAMxC,OAAO,CAAC,mBAAmB;YAIb,aAAa;YAWb,yBAAyB;YAezB,qBAAqB;cAWnB,kBAAkB;CAGnC"}
1
+ {"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAOrE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEvE;;;;;;;;;OASG;IACH,4BAA4B,CAC1B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,oBAAoB,EAAE,GAC9C,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;OAIG;IACH,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC,CAAC;IAEtF;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAAC;IAE3E;;;OAGG;IACH,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAYF;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,eAAe;IAMrC,OAAO,CAAC,QAAQ;IAL5B,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAkD;gBAEzC,QAAQ,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,eAAe;IAI3E;;;;OAIG;IACU,cAAc,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkDnE;;;;;;OAMG;IACU,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,EAAE;IAoCjH;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;IAId;;;;OAIG;YACW,mBAAmB;YAUnB,aAAa;YAWb,yBAAyB;YAezB,qBAAqB;cAWnB,kBAAkB;CAGnC"}