@aztec/sequencer-client 0.6.7 → 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 (112) hide show
  1. package/Dockerfile +21 -0
  2. package/package.json +10 -10
  3. package/src/block_builder/solo_block_builder.test.ts +8 -8
  4. package/src/block_builder/solo_block_builder.ts +114 -44
  5. package/src/block_builder/types.ts +1 -1
  6. package/src/publisher/viem-tx-sender.ts +4 -1
  7. package/src/sequencer/sequencer.ts +18 -6
  8. package/src/simulator/public_executor.ts +2 -16
  9. package/src/simulator/rollup.ts +25 -6
  10. package/.tsbuildinfo +0 -1
  11. package/dest/block_builder/index.d.ts +0 -19
  12. package/dest/block_builder/index.d.ts.map +0 -1
  13. package/dest/block_builder/index.js +0 -2
  14. package/dest/block_builder/solo_block_builder.d.ts +0 -76
  15. package/dest/block_builder/solo_block_builder.d.ts.map +0 -1
  16. package/dest/block_builder/solo_block_builder.js +0 -452
  17. package/dest/block_builder/solo_block_builder.test.d.ts +0 -3
  18. package/dest/block_builder/solo_block_builder.test.d.ts.map +0 -1
  19. package/dest/block_builder/solo_block_builder.test.js +0 -277
  20. package/dest/block_builder/types.d.ts +0 -12
  21. package/dest/block_builder/types.d.ts.map +0 -1
  22. package/dest/block_builder/types.js +0 -2
  23. package/dest/client/index.d.ts +0 -2
  24. package/dest/client/index.d.ts.map +0 -1
  25. package/dest/client/index.js +0 -2
  26. package/dest/client/sequencer-client.d.ts +0 -32
  27. package/dest/client/sequencer-client.d.ts.map +0 -1
  28. package/dest/client/sequencer-client.js +0 -47
  29. package/dest/config.d.ts +0 -12
  30. package/dest/config.d.ts.map +0 -1
  31. package/dest/config.js +0 -28
  32. package/dest/global_variable_builder/config.d.ts +0 -19
  33. package/dest/global_variable_builder/config.d.ts.map +0 -1
  34. package/dest/global_variable_builder/config.js +0 -2
  35. package/dest/global_variable_builder/global_builder.d.ts +0 -58
  36. package/dest/global_variable_builder/global_builder.d.ts.map +0 -1
  37. package/dest/global_variable_builder/global_builder.js +0 -36
  38. package/dest/global_variable_builder/index.d.ts +0 -12
  39. package/dest/global_variable_builder/index.d.ts.map +0 -1
  40. package/dest/global_variable_builder/index.js +0 -12
  41. package/dest/global_variable_builder/viem-reader.d.ts +0 -16
  42. package/dest/global_variable_builder/viem-reader.d.ts.map +0 -1
  43. package/dest/global_variable_builder/viem-reader.js +0 -37
  44. package/dest/index.d.ts +0 -12
  45. package/dest/index.d.ts.map +0 -1
  46. package/dest/index.js +0 -14
  47. package/dest/mocks/verification_keys.d.ts +0 -28
  48. package/dest/mocks/verification_keys.d.ts.map +0 -1
  49. package/dest/mocks/verification_keys.js +0 -14
  50. package/dest/prover/empty.d.ts +0 -41
  51. package/dest/prover/empty.d.ts.map +0 -1
  52. package/dest/prover/empty.js +0 -57
  53. package/dest/prover/index.d.ts +0 -40
  54. package/dest/prover/index.d.ts.map +0 -1
  55. package/dest/prover/index.js +0 -2
  56. package/dest/publisher/config.d.ts +0 -32
  57. package/dest/publisher/config.d.ts.map +0 -1
  58. package/dest/publisher/config.js +0 -2
  59. package/dest/publisher/index.d.ts +0 -10
  60. package/dest/publisher/index.d.ts.map +0 -1
  61. package/dest/publisher/index.js +0 -11
  62. package/dest/publisher/l1-publisher.d.ts +0 -105
  63. package/dest/publisher/l1-publisher.d.ts.map +0 -1
  64. package/dest/publisher/l1-publisher.js +0 -156
  65. package/dest/publisher/l1-publisher.test.d.ts +0 -2
  66. package/dest/publisher/l1-publisher.test.d.ts.map +0 -1
  67. package/dest/publisher/l1-publisher.test.js +0 -58
  68. package/dest/publisher/viem-tx-sender.d.ts +0 -42
  69. package/dest/publisher/viem-tx-sender.d.ts.map +0 -1
  70. package/dest/publisher/viem-tx-sender.js +0 -118
  71. package/dest/receiver.d.ts +0 -13
  72. package/dest/receiver.d.ts.map +0 -1
  73. package/dest/receiver.js +0 -2
  74. package/dest/sequencer/config.d.ts +0 -26
  75. package/dest/sequencer/config.d.ts.map +0 -1
  76. package/dest/sequencer/config.js +0 -2
  77. package/dest/sequencer/index.d.ts +0 -4
  78. package/dest/sequencer/index.d.ts.map +0 -1
  79. package/dest/sequencer/index.js +0 -4
  80. package/dest/sequencer/processed_tx.d.ts +0 -51
  81. package/dest/sequencer/processed_tx.d.ts.map +0 -1
  82. package/dest/sequencer/processed_tx.js +0 -40
  83. package/dest/sequencer/public_processor.d.ts +0 -75
  84. package/dest/sequencer/public_processor.d.ts.map +0 -1
  85. package/dest/sequencer/public_processor.js +0 -269
  86. package/dest/sequencer/public_processor.test.d.ts +0 -2
  87. package/dest/sequencer/public_processor.test.d.ts.map +0 -1
  88. package/dest/sequencer/public_processor.test.js +0 -164
  89. package/dest/sequencer/sequencer.d.ts +0 -133
  90. package/dest/sequencer/sequencer.d.ts.map +0 -1
  91. package/dest/sequencer/sequencer.js +0 -297
  92. package/dest/sequencer/sequencer.test.d.ts +0 -2
  93. package/dest/sequencer/sequencer.test.d.ts.map +0 -1
  94. package/dest/sequencer/sequencer.test.js +0 -99
  95. package/dest/sequencer/utils.d.ts +0 -7
  96. package/dest/sequencer/utils.d.ts.map +0 -1
  97. package/dest/sequencer/utils.js +0 -12
  98. package/dest/simulator/index.d.ts +0 -43
  99. package/dest/simulator/index.d.ts.map +0 -1
  100. package/dest/simulator/index.js +0 -2
  101. package/dest/simulator/public_executor.d.ts +0 -22
  102. package/dest/simulator/public_executor.d.ts.map +0 -1
  103. package/dest/simulator/public_executor.js +0 -99
  104. package/dest/simulator/public_kernel.d.ts +0 -20
  105. package/dest/simulator/public_kernel.d.ts.map +0 -1
  106. package/dest/simulator/public_kernel.js +0 -27
  107. package/dest/simulator/rollup.d.ts +0 -33
  108. package/dest/simulator/rollup.d.ts.map +0 -1
  109. package/dest/simulator/rollup.js +0 -41
  110. package/dest/utils.d.ts +0 -12
  111. package/dest/utils.d.ts.map +0 -1
  112. package/dest/utils.js +0 -16
@@ -1,277 +0,0 @@
1
- import { AppendOnlyTreeSnapshot, BaseRollupInputs, CircuitsWasm, Fr, GlobalVariables, KernelCircuitPublicInputs, MAX_NEW_COMMITMENTS_PER_TX, MAX_NEW_L2_TO_L1_MSGS_PER_TX, MAX_NEW_NULLIFIERS_PER_TX, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, Proof, PublicDataUpdateRequest, makeTuple, range, } from '@aztec/circuits.js';
2
- import { computeBlockHashWithGlobals, computeContractLeaf } from '@aztec/circuits.js/abis';
3
- import { fr, makeBaseOrMergeRollupPublicInputs, makeNewContractData, makePrivateKernelPublicInputsFinal, makeProof, makePublicCallRequest, makeRootRollupPublicInputs, } from '@aztec/circuits.js/factories';
4
- import { toBufferBE } from '@aztec/foundation/bigint-buffer';
5
- import { to2Fields } from '@aztec/foundation/serialize';
6
- import { ContractData, ExtendedContractData, L2Block, L2BlockL2Logs, MerkleTreeId, PublicDataWrite, Tx, TxL2Logs, makeEmptyLogs, mockTx, } from '@aztec/types';
7
- import { MerkleTrees } from '@aztec/world-state';
8
- import { mock } from 'jest-mock-extended';
9
- import { default as levelup } from 'levelup';
10
- import flatMap from 'lodash.flatmap';
11
- import times from 'lodash.times';
12
- import { default as memdown } from 'memdown';
13
- import { getVerificationKeys } from '../mocks/verification_keys.js';
14
- import { EmptyRollupProver } from '../prover/empty.js';
15
- import { makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricTreeRoots, makeProcessedTx, } from '../sequencer/processed_tx.js';
16
- import { getHistoricBlockData } from '../sequencer/utils.js';
17
- import { WasmRollupCircuitSimulator } from '../simulator/rollup.js';
18
- import { SoloBlockBuilder } from './solo_block_builder.js';
19
- export const createMemDown = () => memdown();
20
- describe('sequencer/solo_block_builder', () => {
21
- let builder;
22
- let builderDb;
23
- let expectsDb;
24
- let vks;
25
- let simulator;
26
- let prover;
27
- let blockNumber;
28
- let baseRollupOutputLeft;
29
- let baseRollupOutputRight;
30
- let rootRollupOutput;
31
- let mockL1ToL2Messages;
32
- let wasm;
33
- let globalVariables;
34
- const emptyProof = new Proof(Buffer.alloc(32, 0));
35
- const chainId = Fr.ZERO;
36
- const version = Fr.ZERO;
37
- beforeAll(async () => {
38
- wasm = await CircuitsWasm.get();
39
- });
40
- beforeEach(async () => {
41
- blockNumber = 3;
42
- globalVariables = new GlobalVariables(chainId, version, new Fr(blockNumber), Fr.ZERO);
43
- builderDb = await MerkleTrees.new(levelup(createMemDown())).then(t => t.asLatest());
44
- expectsDb = await MerkleTrees.new(levelup(createMemDown())).then(t => t.asLatest());
45
- vks = getVerificationKeys();
46
- simulator = mock();
47
- prover = mock();
48
- builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
49
- // Create mock l1 to L2 messages
50
- mockL1ToL2Messages = new Array(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP).fill(new Fr(0n));
51
- // Create mock outputs for simulator
52
- baseRollupOutputLeft = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
53
- baseRollupOutputRight = makeBaseOrMergeRollupPublicInputs(0, globalVariables);
54
- rootRollupOutput = makeRootRollupPublicInputs(0, globalVariables);
55
- // Set up mocks
56
- prover.getBaseRollupProof.mockResolvedValue(emptyProof);
57
- prover.getRootRollupProof.mockResolvedValue(emptyProof);
58
- simulator.baseRollupCircuit
59
- .mockResolvedValueOnce(baseRollupOutputLeft)
60
- .mockResolvedValueOnce(baseRollupOutputRight);
61
- simulator.rootRollupCircuit.mockResolvedValue(rootRollupOutput);
62
- }, 20000);
63
- const makeEmptyProcessedTx = async () => {
64
- const historicTreeRoots = await getHistoricBlockData(builderDb);
65
- return makeEmptyProcessedTxFromHistoricTreeRoots(historicTreeRoots, chainId, version);
66
- };
67
- // Updates the expectedDb trees based on the new commitments, contracts, and nullifiers from these txs
68
- const updateExpectedTreesFromTxs = async (txs) => {
69
- const newContracts = flatMap(txs, tx => tx.data.end.newContracts.map(n => computeContractLeaf(wasm, n)));
70
- for (const [tree, leaves] of [
71
- [MerkleTreeId.PRIVATE_DATA_TREE, flatMap(txs, tx => tx.data.end.newCommitments.map(l => l.toBuffer()))],
72
- [MerkleTreeId.CONTRACT_TREE, newContracts.map(x => x.toBuffer())],
73
- ]) {
74
- await expectsDb.appendLeaves(tree, leaves);
75
- }
76
- await expectsDb.batchInsert(MerkleTreeId.NULLIFIER_TREE, flatMap(txs, tx => tx.data.end.newNullifiers.map(x => x.toBuffer())), BaseRollupInputs.NULLIFIER_SUBTREE_HEIGHT);
77
- for (const write of txs.flatMap(tx => tx.data.end.publicDataUpdateRequests)) {
78
- await expectsDb.updateLeaf(MerkleTreeId.PUBLIC_DATA_TREE, write.newValue.toBuffer(), write.leafIndex.value);
79
- }
80
- };
81
- const updateL1ToL2MessagesTree = async (l1ToL2Messages) => {
82
- const asBuffer = l1ToL2Messages.map(m => m.toBuffer());
83
- await expectsDb.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGES_TREE, asBuffer);
84
- };
85
- const updateHistoricBlocksTree = async () => {
86
- const blockHash = computeBlockHashWithGlobals(wasm, globalVariables, rootRollupOutput.endPrivateDataTreeSnapshot.root, rootRollupOutput.endNullifierTreeSnapshot.root, rootRollupOutput.endContractTreeSnapshot.root, rootRollupOutput.endL1ToL2MessageTreeSnapshot.root, rootRollupOutput.endPublicDataTreeRoot);
87
- await expectsDb.appendLeaves(MerkleTreeId.BLOCKS_TREE, [blockHash.toBuffer()]);
88
- };
89
- const getTreeSnapshot = async (tree) => {
90
- const treeInfo = await expectsDb.getTreeInfo(tree);
91
- return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
92
- };
93
- const buildMockSimulatorInputs = async () => {
94
- const kernelOutput = makePrivateKernelPublicInputsFinal();
95
- kernelOutput.constants.blockData = await getHistoricBlockData(expectsDb);
96
- const tx = await makeProcessedTx(new Tx(kernelOutput, emptyProof, makeEmptyLogs(), makeEmptyLogs(), times(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, makePublicCallRequest), [ExtendedContractData.random()]));
97
- const txsLeft = [tx, await makeEmptyProcessedTx()];
98
- const txsRight = [await makeEmptyProcessedTx(), await makeEmptyProcessedTx()];
99
- // Calculate what would be the tree roots after the txs from the first base rollup land and update mock circuit output
100
- await updateExpectedTreesFromTxs(txsLeft);
101
- baseRollupOutputLeft.endContractTreeSnapshot = await getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
102
- baseRollupOutputLeft.endNullifierTreeSnapshot = await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
103
- baseRollupOutputLeft.endPrivateDataTreeSnapshot = await getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE);
104
- baseRollupOutputLeft.endPublicDataTreeRoot = (await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE)).root;
105
- // Same for the two txs on the right
106
- await updateExpectedTreesFromTxs(txsRight);
107
- baseRollupOutputRight.endContractTreeSnapshot = await getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
108
- baseRollupOutputRight.endNullifierTreeSnapshot = await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
109
- baseRollupOutputRight.endPrivateDataTreeSnapshot = await getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE);
110
- baseRollupOutputRight.endPublicDataTreeRoot = (await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE)).root;
111
- // Update l1 to l2 data tree
112
- // And update the root trees now to create proper output to the root rollup circuit
113
- await updateL1ToL2MessagesTree(mockL1ToL2Messages);
114
- rootRollupOutput.endContractTreeSnapshot = await getTreeSnapshot(MerkleTreeId.CONTRACT_TREE);
115
- rootRollupOutput.endNullifierTreeSnapshot = await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE);
116
- rootRollupOutput.endPrivateDataTreeSnapshot = await getTreeSnapshot(MerkleTreeId.PRIVATE_DATA_TREE);
117
- rootRollupOutput.endPublicDataTreeRoot = (await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE)).root;
118
- rootRollupOutput.endL1ToL2MessageTreeSnapshot = await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE);
119
- // Calculate block hash
120
- rootRollupOutput.globalVariables = globalVariables;
121
- await updateHistoricBlocksTree();
122
- rootRollupOutput.endHistoricBlocksTreeSnapshot = await getTreeSnapshot(MerkleTreeId.BLOCKS_TREE);
123
- const txs = [...txsLeft, ...txsRight];
124
- const newNullifiers = flatMap(txs, tx => tx.data.end.newNullifiers);
125
- const newCommitments = flatMap(txs, tx => tx.data.end.newCommitments);
126
- const newContracts = flatMap(txs, tx => tx.data.end.newContracts).map(cd => computeContractLeaf(wasm, cd));
127
- const newContractData = flatMap(txs, tx => tx.data.end.newContracts).map(n => new ContractData(n.contractAddress, n.portalContractAddress));
128
- const newPublicDataWrites = flatMap(txs, tx => tx.data.end.publicDataUpdateRequests.map(t => new PublicDataWrite(t.leafIndex, t.newValue)));
129
- const newL2ToL1Msgs = flatMap(txs, tx => tx.data.end.newL2ToL1Msgs);
130
- const newEncryptedLogs = new L2BlockL2Logs(txs.map(tx => tx.encryptedLogs || new TxL2Logs([])));
131
- const newUnencryptedLogs = new L2BlockL2Logs(txs.map(tx => tx.unencryptedLogs || new TxL2Logs([])));
132
- const l2Block = L2Block.fromFields({
133
- number: blockNumber,
134
- globalVariables,
135
- startPrivateDataTreeSnapshot: rootRollupOutput.startPrivateDataTreeSnapshot,
136
- endPrivateDataTreeSnapshot: rootRollupOutput.endPrivateDataTreeSnapshot,
137
- startNullifierTreeSnapshot: rootRollupOutput.startNullifierTreeSnapshot,
138
- endNullifierTreeSnapshot: rootRollupOutput.endNullifierTreeSnapshot,
139
- startContractTreeSnapshot: rootRollupOutput.startContractTreeSnapshot,
140
- endContractTreeSnapshot: rootRollupOutput.endContractTreeSnapshot,
141
- startPublicDataTreeRoot: rootRollupOutput.startPublicDataTreeRoot,
142
- endPublicDataTreeRoot: rootRollupOutput.endPublicDataTreeRoot,
143
- startL1ToL2MessageTreeSnapshot: rootRollupOutput.startL1ToL2MessageTreeSnapshot,
144
- endL1ToL2MessageTreeSnapshot: rootRollupOutput.endL1ToL2MessageTreeSnapshot,
145
- startHistoricBlocksTreeSnapshot: rootRollupOutput.startHistoricBlocksTreeSnapshot,
146
- endHistoricBlocksTreeSnapshot: rootRollupOutput.endHistoricBlocksTreeSnapshot,
147
- newCommitments,
148
- newNullifiers,
149
- newContracts,
150
- newContractData,
151
- newPublicDataWrites,
152
- newL1ToL2Messages: mockL1ToL2Messages,
153
- newL2ToL1Msgs,
154
- newEncryptedLogs,
155
- newUnencryptedLogs,
156
- });
157
- const callDataHash = l2Block.getCalldataHash();
158
- const high = Fr.fromBuffer(callDataHash.slice(0, 16));
159
- const low = Fr.fromBuffer(callDataHash.slice(16, 32));
160
- rootRollupOutput.calldataHash = [high, low];
161
- return txs;
162
- };
163
- describe('mock simulator', () => {
164
- beforeEach(() => {
165
- // Create instance to test
166
- builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
167
- });
168
- it('builds an L2 block using mock simulator', async () => {
169
- // Assemble a fake transaction
170
- const txs = await buildMockSimulatorInputs();
171
- // Actually build a block!
172
- const [l2Block, proof] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
173
- expect(l2Block.number).toEqual(blockNumber);
174
- expect(proof).toEqual(emptyProof);
175
- }, 20000);
176
- it('rejects if too many l1 to l2 messages are provided', async () => {
177
- // Assemble a fake transaction
178
- const txs = await buildMockSimulatorInputs();
179
- const l1ToL2Messages = new Array(100).fill(new Fr(0n));
180
- await expect(builder.buildL2Block(globalVariables, txs, l1ToL2Messages)).rejects.toThrow();
181
- });
182
- });
183
- describe('circuits simulator', () => {
184
- beforeEach(async () => {
185
- const simulator = await WasmRollupCircuitSimulator.new();
186
- const prover = new EmptyRollupProver();
187
- builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
188
- });
189
- const makeContractDeployProcessedTx = async (seed = 0x1) => {
190
- const tx = await makeEmptyProcessedTx();
191
- tx.data.end.newContracts = [makeNewContractData(seed + 0x1000)];
192
- return tx;
193
- };
194
- const makeBloatedProcessedTx = async (seed = 0x1) => {
195
- const tx = mockTx(seed);
196
- const kernelOutput = KernelCircuitPublicInputs.empty();
197
- kernelOutput.constants.blockData = await getHistoricBlockData(builderDb);
198
- kernelOutput.end.publicDataUpdateRequests = makeTuple(MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, i => new PublicDataUpdateRequest(fr(i), fr(0), fr(i + 10)), seed + 0x500);
199
- const processedTx = await makeProcessedTx(tx, kernelOutput, makeProof());
200
- processedTx.data.end.newCommitments = makeTuple(MAX_NEW_COMMITMENTS_PER_TX, fr, seed + 0x100);
201
- processedTx.data.end.newNullifiers = makeTuple(MAX_NEW_NULLIFIERS_PER_TX, fr, seed + 0x200);
202
- processedTx.data.end.newNullifiers[tx.data.end.newNullifiers.length - 1] = Fr.ZERO;
203
- processedTx.data.end.newL2ToL1Msgs = makeTuple(MAX_NEW_L2_TO_L1_MSGS_PER_TX, fr, seed + 0x300);
204
- processedTx.data.end.newContracts = [makeNewContractData(seed + 0x1000)];
205
- processedTx.data.end.encryptedLogsHash = to2Fields(L2Block.computeKernelLogsHash(processedTx.encryptedLogs));
206
- processedTx.data.end.unencryptedLogsHash = to2Fields(L2Block.computeKernelLogsHash(processedTx.unencryptedLogs));
207
- return processedTx;
208
- };
209
- it.each([
210
- [0, 4],
211
- [1, 4],
212
- [4, 4],
213
- [0, 16],
214
- [16, 16],
215
- ])('builds an L2 block with %i contract deploy txs and %i txs total', async (deployCount, totalCount) => {
216
- const contractTreeBefore = await builderDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE);
217
- const txs = [
218
- ...(await Promise.all(times(deployCount, makeContractDeployProcessedTx))),
219
- ...(await Promise.all(times(totalCount - deployCount, makeEmptyProcessedTx))),
220
- ];
221
- const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
222
- expect(l2Block.number).toEqual(blockNumber);
223
- await updateExpectedTreesFromTxs(txs);
224
- const contractTreeAfter = await builderDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE);
225
- if (deployCount > 0) {
226
- expect(contractTreeAfter.root).not.toEqual(contractTreeBefore.root);
227
- }
228
- const expectedContractTreeAfter = await expectsDb.getTreeInfo(MerkleTreeId.CONTRACT_TREE).then(t => t.root);
229
- expect(contractTreeAfter.root).toEqual(expectedContractTreeAfter);
230
- expect(contractTreeAfter.size).toEqual(BigInt(totalCount));
231
- }, 30000);
232
- it('builds an empty L2 block', async () => {
233
- const txs = await Promise.all([
234
- makeEmptyProcessedTx(),
235
- makeEmptyProcessedTx(),
236
- makeEmptyProcessedTx(),
237
- makeEmptyProcessedTx(),
238
- ]);
239
- const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
240
- expect(l2Block.number).toEqual(blockNumber);
241
- }, 10000);
242
- it('builds a mixed L2 block', async () => {
243
- // Ensure that each transaction has unique (non-intersecting nullifier values)
244
- const txs = await Promise.all([
245
- makeBloatedProcessedTx(1 * MAX_NEW_NULLIFIERS_PER_TX),
246
- makeBloatedProcessedTx(2 * MAX_NEW_NULLIFIERS_PER_TX),
247
- makeBloatedProcessedTx(3 * MAX_NEW_NULLIFIERS_PER_TX),
248
- makeBloatedProcessedTx(4 * MAX_NEW_NULLIFIERS_PER_TX),
249
- ]);
250
- const l1ToL2Messages = range(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, 1 + 0x400).map(fr);
251
- const [l2Block] = await builder.buildL2Block(globalVariables, txs, l1ToL2Messages);
252
- expect(l2Block.number).toEqual(blockNumber);
253
- }, 20000);
254
- // This test specifically tests nullifier values which previously caused e2e_private_token test to fail
255
- it('e2e_private_token edge case regression test on nullifier values', async () => {
256
- const simulator = await WasmRollupCircuitSimulator.new();
257
- const prover = new EmptyRollupProver();
258
- builder = new SoloBlockBuilder(builderDb, vks, simulator, prover);
259
- // update the starting tree
260
- const updateVals = Array(4 * MAX_NEW_NULLIFIERS_PER_TX).fill(0n);
261
- updateVals[0] = 19777494491628650244807463906174285795660759352776418619064841306523677458742n;
262
- updateVals[1] = 10246291467305176436335175657884940686778521321101740385288169037814567547848n;
263
- // new added values
264
- const tx = await makeEmptyProcessedTx();
265
- tx.data.end.newNullifiers[0] = new Fr(10336601644835972678500657502133589897705389664587188571002640950065546264856n);
266
- tx.data.end.newNullifiers[1] = new Fr(17490072961923661940560522096125238013953043065748521735636170028491723851741n);
267
- const txs = [tx, await makeEmptyProcessedTx(), await makeEmptyProcessedTx(), await makeEmptyProcessedTx()];
268
- // Must be built after the txs are created
269
- await builderDb.batchInsert(MerkleTreeId.NULLIFIER_TREE, updateVals.map(v => toBufferBE(v, 32)), BaseRollupInputs.NULLIFIER_SUBTREE_HEIGHT);
270
- const [l2Block] = await builder.buildL2Block(globalVariables, txs, mockL1ToL2Messages);
271
- expect(l2Block.number).toEqual(blockNumber);
272
- }, 10000);
273
- });
274
- // describe("Input guard tests", () => {
275
- // })
276
- });
277
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"solo_block_builder.test.js","sourceRoot":"","sources":["../../src/block_builder/solo_block_builder.test.ts"],"names":[],"mappings":"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"}
@@ -1,12 +0,0 @@
1
- import { AppendOnlyTreeSnapshot, BaseOrMergeRollupPublicInputs, RootRollupPublicInputs } from '@aztec/circuits.js';
2
- /**
3
- * Type to assert that only the correct trees are checked when validating rollup tree outputs.
4
- */
5
- export type AllowedTreeNames<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs> = T extends RootRollupPublicInputs ? 'PrivateData' | 'Contract' | 'Nullifier' | 'L1ToL2Message' | 'HistoricBlocks' : 'PrivateData' | 'Contract' | 'Nullifier';
6
- /**
7
- * Type to assert the correct object field is indexed when validating rollup tree outputs.
8
- */
9
- export type OutputWithTreeSnapshot<T extends BaseOrMergeRollupPublicInputs | RootRollupPublicInputs> = {
10
- [K in `end${AllowedTreeNames<T>}TreeSnapshot`]: AppendOnlyTreeSnapshot;
11
- };
12
- //# 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,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEnH;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,6BAA6B,GAAG,sBAAsB,IAC3F,CAAC,SAAS,sBAAsB,GAC5B,aAAa,GAAG,UAAU,GAAG,WAAW,GAAG,eAAe,GAAG,gBAAgB,GAC7E,aAAa,GAAG,UAAU,GAAG,WAAW,CAAC;AAE/C;;GAEG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,6BAA6B,GAAG,sBAAsB,IAAI;KACpG,CAAC,IAAI,MAAM,gBAAgB,CAAC,CAAC,CAAC,cAAc,GAAG,sBAAsB;CACvE,CAAC"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmxvY2tfYnVpbGRlci90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
@@ -1,2 +0,0 @@
1
- export * from './sequencer-client.js';
2
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
@@ -1,2 +0,0 @@
1
- export * from './sequencer-client.js';
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsdUJBQXVCLENBQUMifQ==
@@ -1,32 +0,0 @@
1
- import { P2P } from '@aztec/p2p';
2
- import { ContractDataSource, L1ToL2MessageSource, L2BlockSource } from '@aztec/types';
3
- import { WorldStateSynchroniser } from '@aztec/world-state';
4
- import { SequencerClientConfig } from '../config.js';
5
- import { Sequencer } from '../index.js';
6
- /**
7
- * Encapsulates the full sequencer and publisher.
8
- */
9
- export declare class SequencerClient {
10
- private sequencer;
11
- constructor(sequencer: Sequencer);
12
- /**
13
- * Initializes and starts a new instance.
14
- * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
15
- * @param p2pClient - P2P client that provides the txs to be sequenced.
16
- * @param worldStateSynchroniser - Provides access to world state.
17
- * @param contractDataSource - Provides access to contract bytecode for public executions.
18
- * @param l2BlockSource - Provides information about the previously published blocks.
19
- * @param l1ToL2MessageSource - Provides access to L1 to L2 messages.
20
- * @returns A new running instance.
21
- */
22
- static new(config: SequencerClientConfig, p2pClient: P2P, worldStateSynchroniser: WorldStateSynchroniser, contractDataSource: ContractDataSource, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource): Promise<SequencerClient>;
23
- /**
24
- * Stops the sequencer from processing new txs.
25
- */
26
- stop(): Promise<void>;
27
- /**
28
- * Restarts the sequencer after being stopped.
29
- */
30
- restart(): void;
31
- }
32
- //# sourceMappingURL=sequencer-client.d.ts.map
@@ -1 +0,0 @@
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,EAAuC,MAAM,aAAa,CAAC;AAK7E;;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;;OAEG;IACU,IAAI;IAIjB;;OAEG;IACI,OAAO;CAGf"}
@@ -1,47 +0,0 @@
1
- import { SoloBlockBuilder } from '../block_builder/solo_block_builder.js';
2
- import { getGlobalVariableBuilder } from '../global_variable_builder/index.js';
3
- import { Sequencer, getL1Publisher, getVerificationKeys } from '../index.js';
4
- import { EmptyRollupProver } from '../prover/empty.js';
5
- import { PublicProcessorFactory } from '../sequencer/public_processor.js';
6
- import { WasmRollupCircuitSimulator } from '../simulator/rollup.js';
7
- /**
8
- * Encapsulates the full sequencer and publisher.
9
- */
10
- export class SequencerClient {
11
- constructor(sequencer) {
12
- this.sequencer = sequencer;
13
- }
14
- /**
15
- * Initializes and starts a new instance.
16
- * @param config - Configuration for the sequencer, publisher, and L1 tx sender.
17
- * @param p2pClient - P2P client that provides the txs to be sequenced.
18
- * @param worldStateSynchroniser - Provides access to world state.
19
- * @param contractDataSource - Provides access to contract bytecode for public executions.
20
- * @param l2BlockSource - Provides information about the previously published blocks.
21
- * @param l1ToL2MessageSource - Provides access to L1 to L2 messages.
22
- * @returns A new running instance.
23
- */
24
- static async new(config, p2pClient, worldStateSynchroniser, contractDataSource, l2BlockSource, l1ToL2MessageSource) {
25
- const publisher = getL1Publisher(config);
26
- const globalsBuilder = getGlobalVariableBuilder(config);
27
- const merkleTreeDb = worldStateSynchroniser.getLatest();
28
- const blockBuilder = new SoloBlockBuilder(merkleTreeDb, getVerificationKeys(), await WasmRollupCircuitSimulator.new(), new EmptyRollupProver());
29
- const publicProcessorFactory = new PublicProcessorFactory(merkleTreeDb, contractDataSource, l1ToL2MessageSource);
30
- const sequencer = new Sequencer(publisher, globalsBuilder, p2pClient, worldStateSynchroniser, blockBuilder, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, config);
31
- await sequencer.start();
32
- return new SequencerClient(sequencer);
33
- }
34
- /**
35
- * Stops the sequencer from processing new txs.
36
- */
37
- async stop() {
38
- await this.sequencer.stop();
39
- }
40
- /**
41
- * Restarts the sequencer after being stopped.
42
- */
43
- restart() {
44
- this.sequencer.restart();
45
- }
46
- }
47
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvc2VxdWVuY2VyLWNsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx3Q0FBd0MsQ0FBQztBQUUxRSxPQUFPLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUM3RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUMxRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVwRTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQzFCLFlBQW9CLFNBQW9CO1FBQXBCLGNBQVMsR0FBVCxTQUFTLENBQVc7SUFBRyxDQUFDO0lBRTVDOzs7Ozs7Ozs7T0FTRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUNyQixNQUE2QixFQUM3QixTQUFjLEVBQ2Qsc0JBQThDLEVBQzlDLGtCQUFzQyxFQUN0QyxhQUE0QixFQUM1QixtQkFBd0M7UUFFeEMsTUFBTSxTQUFTLEdBQUcsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3pDLE1BQU0sY0FBYyxHQUFHLHdCQUF3QixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3hELE1BQU0sWUFBWSxHQUFHLHNCQUFzQixDQUFDLFNBQVMsRUFBRSxDQUFDO1FBRXhELE1BQU0sWUFBWSxHQUFHLElBQUksZ0JBQWdCLENBQ3ZDLFlBQVksRUFDWixtQkFBbUIsRUFBRSxFQUNyQixNQUFNLDBCQUEwQixDQUFDLEdBQUcsRUFBRSxFQUN0QyxJQUFJLGlCQUFpQixFQUFFLENBQ3hCLENBQUM7UUFFRixNQUFNLHNCQUFzQixHQUFHLElBQUksc0JBQXNCLENBQUMsWUFBWSxFQUFFLGtCQUFrQixFQUFFLG1CQUFtQixDQUFDLENBQUM7UUFFakgsTUFBTSxTQUFTLEdBQUcsSUFBSSxTQUFTLENBQzdCLFNBQVMsRUFDVCxjQUFjLEVBQ2QsU0FBUyxFQUNULHNCQUFzQixFQUN0QixZQUFZLEVBQ1osYUFBYSxFQUNiLG1CQUFtQixFQUNuQixzQkFBc0IsRUFDdEIsTUFBTSxDQUNQLENBQUM7UUFFRixNQUFNLFNBQVMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN4QixPQUFPLElBQUksZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxJQUFJO1FBQ2YsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzlCLENBQUM7SUFFRDs7T0FFRztJQUNJLE9BQU87UUFDWixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7Q0FDRiJ9
package/dest/config.d.ts DELETED
@@ -1,12 +0,0 @@
1
- import { GlobalReaderConfig } from './global_variable_builder/index.js';
2
- import { PublisherConfig, TxSenderConfig } from './publisher/config.js';
3
- import { SequencerConfig } from './sequencer/config.js';
4
- /**
5
- * Configuration settings for the SequencerClient.
6
- */
7
- export type SequencerClientConfig = PublisherConfig & TxSenderConfig & SequencerConfig & GlobalReaderConfig;
8
- /**
9
- * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
10
- */
11
- export declare function getConfigEnvVars(): SequencerClientConfig;
12
- //# sourceMappingURL=config.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,eAAe,GAAG,cAAc,GAAG,eAAe,GAAG,kBAAkB,CAAC;AAE5G;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,qBAAqB,CAwCxD"}
package/dest/config.js DELETED
@@ -1,28 +0,0 @@
1
- import { EthAddress } from '@aztec/foundation/eth-address';
2
- /**
3
- * Creates an instance of SequencerClientConfig out of environment variables using sensible defaults for integration testing if not set.
4
- */
5
- export function getConfigEnvVars() {
6
- const { SEQ_PUBLISHER_PRIVATE_KEY, ETHEREUM_HOST, CHAIN_ID, VERSION, API_KEY, SEQ_REQUIRED_CONFS, SEQ_PUBLISH_RETRY_INTERVAL_MS, SEQ_TX_POLLING_INTERVAL_MS, SEQ_MAX_TX_PER_BLOCK, SEQ_MIN_TX_PER_BLOCK, ROLLUP_CONTRACT_ADDRESS, INBOX_CONTRACT_ADDRESS, CONTRACT_DEPLOYMENT_EMITTER_ADDRESS, } = process.env;
7
- const publisherPrivateKey = `0x${SEQ_PUBLISHER_PRIVATE_KEY
8
- ? SEQ_PUBLISHER_PRIVATE_KEY.replace('0x', '')
9
- : '0000000000000000000000000000000000000000000000000000000000000000'}`;
10
- return {
11
- rpcUrl: ETHEREUM_HOST ? ETHEREUM_HOST : '',
12
- chainId: CHAIN_ID ? +CHAIN_ID : 31337,
13
- version: VERSION ? +VERSION : 1,
14
- apiKey: API_KEY,
15
- requiredConfirmations: SEQ_REQUIRED_CONFS ? +SEQ_REQUIRED_CONFS : 1,
16
- l1BlockPublishRetryIntervalMS: SEQ_PUBLISH_RETRY_INTERVAL_MS ? +SEQ_PUBLISH_RETRY_INTERVAL_MS : 1000,
17
- transactionPollingIntervalMS: SEQ_TX_POLLING_INTERVAL_MS ? +SEQ_TX_POLLING_INTERVAL_MS : 1000,
18
- rollupContract: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO,
19
- inboxContract: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
20
- contractDeploymentEmitterContract: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
21
- ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
22
- : EthAddress.ZERO,
23
- publisherPrivateKey,
24
- maxTxsPerBlock: SEQ_MAX_TX_PER_BLOCK ? +SEQ_MAX_TX_PER_BLOCK : 32,
25
- minTxsPerBlock: SEQ_MIN_TX_PER_BLOCK ? +SEQ_MIN_TX_PER_BLOCK : 1,
26
- };
27
- }
28
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFXM0Q7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCO0lBQzlCLE1BQU0sRUFDSix5QkFBeUIsRUFDekIsYUFBYSxFQUNiLFFBQVEsRUFDUixPQUFPLEVBQ1AsT0FBTyxFQUNQLGtCQUFrQixFQUNsQiw2QkFBNkIsRUFDN0IsMEJBQTBCLEVBQzFCLG9CQUFvQixFQUNwQixvQkFBb0IsRUFDcEIsdUJBQXVCLEVBQ3ZCLHNCQUFzQixFQUN0QixtQ0FBbUMsR0FDcEMsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO0lBRWhCLE1BQU0sbUJBQW1CLEdBQWtCLEtBQ3pDLHlCQUF5QjtRQUN2QixDQUFDLENBQUMseUJBQXlCLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUM7UUFDN0MsQ0FBQyxDQUFDLGtFQUNOLEVBQUUsQ0FBQztJQUVILE9BQU87UUFDTCxNQUFNLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDMUMsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUs7UUFDckMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxFQUFFLE9BQU87UUFDZixxQkFBcUIsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNuRSw2QkFBNkIsRUFBRSw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLENBQUMsSUFBSztRQUNyRyw0QkFBNEIsRUFBRSwwQkFBMEIsQ0FBQyxDQUFDLENBQUMsQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLENBQUMsSUFBSztRQUM5RixjQUFjLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUk7UUFDMUcsYUFBYSxFQUFFLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJO1FBQ3ZHLGlDQUFpQyxFQUFFLG1DQUFtQztZQUNwRSxDQUFDLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxtQ0FBbUMsQ0FBQztZQUM1RCxDQUFDLENBQUMsVUFBVSxDQUFDLElBQUk7UUFDbkIsbUJBQW1CO1FBQ25CLGNBQWMsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsRUFBRTtRQUNqRSxjQUFjLEVBQUUsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDakUsQ0FBQztBQUNKLENBQUMifQ==
@@ -1,19 +0,0 @@
1
- import { EthAddress } from '@aztec/circuits.js';
2
- /**
3
- * Configuration of the L1GlobalReader.
4
- */
5
- export interface GlobalReaderConfig {
6
- /**
7
- * Rollup contract address.
8
- */
9
- rollupContract: EthAddress;
10
- /**
11
- * The RPC Url of the ethereum host.
12
- */
13
- rpcUrl: string;
14
- /**
15
- * The API key of the ethereum host.
16
- */
17
- apiKey?: string;
18
- }
19
- //# sourceMappingURL=config.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,cAAc,EAAE,UAAU,CAAC;IAC3B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dsb2JhbF92YXJpYWJsZV9idWlsZGVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=
@@ -1,58 +0,0 @@
1
- import { Fr, GlobalVariables } from '@aztec/circuits.js';
2
- /**
3
- * Reads values from L1 state that is used for the global values.
4
- */
5
- export interface L1GlobalReader {
6
- /**
7
- * Fetches the last timestamp that a block was processed by the contract.
8
- * @returns The last timestamp that a block was processed by the contract.
9
- */
10
- getLastTimestamp(): Promise<bigint>;
11
- /**
12
- * Fetches the version of the rollup contract.
13
- * @returns The version of the rollup contract.
14
- */
15
- getVersion(): Promise<bigint>;
16
- /**
17
- * Gets the chain id.
18
- * @returns The chain id.
19
- */
20
- getChainId(): Promise<bigint>;
21
- /**
22
- * Gets the current L1 time.
23
- * @returns The current L1 time.
24
- */
25
- getL1CurrentTime(): Promise<bigint>;
26
- /**
27
- * Gets the last time L2 was warped as tracked by the rollup contract.
28
- * @returns The warped time.
29
- */
30
- getLastWarpedBlockTs(): Promise<bigint>;
31
- }
32
- /**
33
- * Builds global variables from L1 state.
34
- */
35
- export interface GlobalVariableBuilder {
36
- /**
37
- * Builds global variables.
38
- * @param blockNumber - The block number to build global variables for.
39
- * @returns The global variables for the given block number.
40
- */
41
- buildGlobalVariables(blockNumber: Fr): Promise<GlobalVariables>;
42
- }
43
- /**
44
- * Simple test implementation of a builder that uses the minimum time possible for the global variables.
45
- * Also uses a "hack" to make use of the warp cheatcode that manipulates time on Aztec.
46
- */
47
- export declare class SimpleTestGlobalVariableBuilder implements GlobalVariableBuilder {
48
- private readonly reader;
49
- private log;
50
- constructor(reader: L1GlobalReader);
51
- /**
52
- * Simple builder of global variables that use the minimum time possible.
53
- * @param blockNumber - The block number to build global variables for.
54
- * @returns The global variables for the given block number.
55
- */
56
- buildGlobalVariables(blockNumber: Fr): Promise<GlobalVariables>;
57
- }
58
- //# sourceMappingURL=global_builder.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"global_builder.d.ts","sourceRoot":"","sources":["../../src/global_variable_builder/global_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGzD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B;;;OAGG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAEpC;;;OAGG;IACH,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,oBAAoB,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CACjE;AAED;;;GAGG;AACH,qBAAa,+BAAgC,YAAW,qBAAqB;IAE/D,OAAO,CAAC,QAAQ,CAAC,MAAM;IADnC,OAAO,CAAC,GAAG,CAA4E;gBAC1D,MAAM,EAAE,cAAc;IAEnD;;;;OAIG;IACU,oBAAoB,CAAC,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;CAwB7E"}
@@ -1,36 +0,0 @@
1
- import { Fr, GlobalVariables } from '@aztec/circuits.js';
2
- import { createDebugLogger } from '@aztec/foundation/log';
3
- /**
4
- * Simple test implementation of a builder that uses the minimum time possible for the global variables.
5
- * Also uses a "hack" to make use of the warp cheatcode that manipulates time on Aztec.
6
- */
7
- export class SimpleTestGlobalVariableBuilder {
8
- constructor(reader) {
9
- this.reader = reader;
10
- this.log = createDebugLogger('aztec:sequencer:simple_test_global_variable_builder');
11
- }
12
- /**
13
- * Simple builder of global variables that use the minimum time possible.
14
- * @param blockNumber - The block number to build global variables for.
15
- * @returns The global variables for the given block number.
16
- */
17
- async buildGlobalVariables(blockNumber) {
18
- let lastTimestamp = new Fr(await this.reader.getLastTimestamp());
19
- const version = new Fr(await this.reader.getVersion());
20
- const chainId = new Fr(await this.reader.getChainId());
21
- // TODO(rahul) - fix #1614. By using the cheatcode warp to modify L2 time,
22
- // txs in the next rollup would have same time as the txs in the current rollup (i.e. the rollup that was warped).
23
- // So, for now you check if L2 time was warped and if so, serve warpedTime + 1 to txs in the new rollup.
24
- // Check if L2 time was warped in the last rollup by checking if current L1 time is same as the warpedTime (stored on the rollup contract).
25
- // more details at https://github.com/AztecProtocol/aztec-packages/issues/1614
26
- const currTimestamp = await this.reader.getL1CurrentTime();
27
- const rollupWarpTime = await this.reader.getLastWarpedBlockTs();
28
- const isLastBlockWarped = rollupWarpTime === currTimestamp;
29
- if (isLastBlockWarped) {
30
- lastTimestamp = new Fr(lastTimestamp.value + 1n);
31
- }
32
- this.log(`Built global variables for block ${blockNumber}: (${chainId}, ${version}, ${blockNumber}, ${lastTimestamp})`);
33
- return new GlobalVariables(chainId, version, blockNumber, lastTimestamp);
34
- }
35
- }
36
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsX2J1aWxkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2xvYmFsX3ZhcmlhYmxlX2J1aWxkZXIvZ2xvYmFsX2J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxlQUFlLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQStDMUQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLCtCQUErQjtJQUUxQyxZQUE2QixNQUFzQjtRQUF0QixXQUFNLEdBQU4sTUFBTSxDQUFnQjtRQUQzQyxRQUFHLEdBQUcsaUJBQWlCLENBQUMscURBQXFELENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRXZEOzs7O09BSUc7SUFDSSxLQUFLLENBQUMsb0JBQW9CLENBQUMsV0FBZTtRQUMvQyxJQUFJLGFBQWEsR0FBRyxJQUFJLEVBQUUsQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDO1FBQ2pFLE1BQU0sT0FBTyxHQUFHLElBQUksRUFBRSxDQUFDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZELE1BQU0sT0FBTyxHQUFHLElBQUksRUFBRSxDQUFDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDO1FBRXZELDBFQUEwRTtRQUMxRSxrSEFBa0g7UUFDbEgsd0dBQXdHO1FBQ3hHLDJJQUEySTtRQUMzSSw4RUFBOEU7UUFFOUUsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUM7UUFDM0QsTUFBTSxjQUFjLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLG9CQUFvQixFQUFFLENBQUM7UUFDaEUsTUFBTSxpQkFBaUIsR0FBRyxjQUFjLEtBQUssYUFBYSxDQUFDO1FBQzNELElBQUksaUJBQWlCLEVBQUU7WUFDckIsYUFBYSxHQUFHLElBQUksRUFBRSxDQUFDLGFBQWEsQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDbEQ7UUFFRCxJQUFJLENBQUMsR0FBRyxDQUNOLG9DQUFvQyxXQUFXLE1BQU0sT0FBTyxLQUFLLE9BQU8sS0FBSyxXQUFXLEtBQUssYUFBYSxHQUFHLENBQzlHLENBQUM7UUFFRixPQUFPLElBQUksZUFBZSxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBQzNFLENBQUM7Q0FDRiJ9