@aztec/sequencer-client 0.7.10 → 0.8.7
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.
- package/README.md +1 -1
- package/dest/client/sequencer-client.d.ts +3 -3
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +6 -6
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +14 -7
- package/dest/global_variable_builder/config.d.ts +5 -5
- package/dest/global_variable_builder/config.d.ts.map +1 -1
- package/dest/global_variable_builder/viem-reader.js +3 -3
- package/dest/publisher/config.d.ts +6 -2
- package/dest/publisher/config.d.ts.map +1 -1
- package/dest/publisher/index.d.ts +27 -0
- package/dest/publisher/index.d.ts.map +1 -1
- package/dest/publisher/index.js +1 -1
- package/dest/publisher/l1-publisher.d.ts +26 -11
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +18 -4
- package/dest/publisher/viem-tx-sender.d.ts +2 -1
- package/dest/publisher/viem-tx-sender.d.ts.map +1 -1
- package/dest/publisher/viem-tx-sender.js +27 -7
- package/dest/sequencer/public_processor.d.ts +4 -2
- package/dest/sequencer/public_processor.d.ts.map +1 -1
- package/dest/sequencer/public_processor.js +11 -5
- package/dest/sequencer/sequencer.d.ts +13 -9
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +53 -34
- package/dest/simulator/index.d.ts +0 -1
- package/dest/simulator/index.d.ts.map +1 -1
- package/dest/simulator/index.js +2 -2
- package/dest/simulator/public_executor.d.ts +28 -4
- package/dest/simulator/public_executor.d.ts.map +1 -1
- package/dest/simulator/public_executor.js +46 -7
- package/dest/simulator/public_kernel.d.ts +1 -0
- package/dest/simulator/public_kernel.d.ts.map +1 -1
- package/dest/simulator/public_kernel.js +26 -5
- package/dest/simulator/rollup.d.ts +2 -8
- package/dest/simulator/rollup.d.ts.map +1 -1
- package/dest/simulator/rollup.js +37 -18
- package/package.json +70 -11
- package/src/client/sequencer-client.ts +7 -6
- package/src/config.ts +14 -5
- package/src/global_variable_builder/config.ts +6 -5
- package/src/global_variable_builder/viem-reader.ts +2 -2
- package/src/publisher/config.ts +7 -2
- package/src/publisher/index.ts +28 -0
- package/src/publisher/l1-publisher.ts +46 -13
- package/src/publisher/viem-tx-sender.ts +33 -13
- package/src/sequencer/public_processor.ts +13 -4
- package/src/sequencer/sequencer.ts +59 -45
- package/src/simulator/index.ts +0 -2
- package/src/simulator/public_executor.ts +53 -7
- package/src/simulator/public_kernel.ts +24 -4
- package/src/simulator/rollup.ts +38 -21
- package/.eslintrc.cjs +0 -1
- package/.tsbuildinfo +0 -1
- package/dest/block_builder/solo_block_builder.test.d.ts +0 -3
- package/dest/block_builder/solo_block_builder.test.d.ts.map +0 -1
- package/dest/block_builder/solo_block_builder.test.js +0 -277
- package/dest/publisher/l1-publisher.test.d.ts +0 -2
- package/dest/publisher/l1-publisher.test.d.ts.map +0 -1
- package/dest/publisher/l1-publisher.test.js +0 -58
- package/dest/sequencer/public_processor.test.d.ts +0 -2
- package/dest/sequencer/public_processor.test.d.ts.map +0 -1
- package/dest/sequencer/public_processor.test.js +0 -164
- package/dest/sequencer/sequencer.test.d.ts +0 -2
- package/dest/sequencer/sequencer.test.d.ts.map +0 -1
- package/dest/sequencer/sequencer.test.js +0 -99
- package/jest.integration.config.json +0 -13
- package/src/block_builder/solo_block_builder.test.ts +0 -425
- package/src/publisher/l1-publisher.test.ts +0 -79
- package/src/sequencer/public_processor.test.ts +0 -265
- package/src/sequencer/sequencer.test.ts +0 -160
- package/tsconfig.json +0 -38
|
@@ -1,277 +0,0 @@
|
|
|
1
|
-
import { AppendOnlyTreeSnapshot, 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, NULLIFIER_SUBTREE_HEIGHT, 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())), 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.endL1ToL2MessagesTreeSnapshot.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.endL1ToL2MessagesTreeSnapshot = 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
|
-
startL1ToL2MessagesTreeSnapshot: rootRollupOutput.startL1ToL2MessagesTreeSnapshot,
|
|
144
|
-
endL1ToL2MessagesTreeSnapshot: rootRollupOutput.endL1ToL2MessagesTreeSnapshot,
|
|
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
|
-
}, 40000);
|
|
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)), 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 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"l1-publisher.test.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,58 +0,0 @@
|
|
|
1
|
-
import { L2Block } from '@aztec/types';
|
|
2
|
-
import { mock } from 'jest-mock-extended';
|
|
3
|
-
import { sleep } from '../utils.js';
|
|
4
|
-
import { L1Publisher } from './l1-publisher.js';
|
|
5
|
-
describe('L1Publisher', () => {
|
|
6
|
-
let txSender;
|
|
7
|
-
let txHash;
|
|
8
|
-
let txReceipt;
|
|
9
|
-
let l2Block;
|
|
10
|
-
let l2Inputs;
|
|
11
|
-
let l2Proof;
|
|
12
|
-
let publisher;
|
|
13
|
-
beforeEach(() => {
|
|
14
|
-
l2Block = L2Block.random(42);
|
|
15
|
-
l2Inputs = l2Block.encode();
|
|
16
|
-
l2Proof = Buffer.alloc(0);
|
|
17
|
-
txSender = mock();
|
|
18
|
-
txHash = `0x${Buffer.from('txHash').toString('hex')}`; // random tx hash
|
|
19
|
-
txReceipt = { transactionHash: txHash, status: true };
|
|
20
|
-
txSender.sendProcessTx.mockResolvedValueOnce(txHash);
|
|
21
|
-
txSender.getTransactionReceipt.mockResolvedValueOnce(txReceipt);
|
|
22
|
-
publisher = new L1Publisher(txSender, { l1BlockPublishRetryIntervalMS: 1 });
|
|
23
|
-
});
|
|
24
|
-
it('publishes l2 block to l1', async () => {
|
|
25
|
-
const result = await publisher.processL2Block(l2Block);
|
|
26
|
-
expect(result).toEqual(true);
|
|
27
|
-
expect(txSender.sendProcessTx).toHaveBeenCalledWith({ proof: l2Proof, inputs: l2Inputs });
|
|
28
|
-
expect(txSender.getTransactionReceipt).toHaveBeenCalledWith(txHash);
|
|
29
|
-
});
|
|
30
|
-
it('does not retry if sending a tx fails', async () => {
|
|
31
|
-
txSender.sendProcessTx.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(txHash);
|
|
32
|
-
const result = await publisher.processL2Block(l2Block);
|
|
33
|
-
expect(result).toEqual(false);
|
|
34
|
-
expect(txSender.sendProcessTx).toHaveBeenCalledTimes(1);
|
|
35
|
-
});
|
|
36
|
-
it('retries if fetching the receipt fails', async () => {
|
|
37
|
-
txSender.getTransactionReceipt.mockReset().mockRejectedValueOnce(new Error()).mockResolvedValueOnce(txReceipt);
|
|
38
|
-
const result = await publisher.processL2Block(l2Block);
|
|
39
|
-
expect(result).toEqual(true);
|
|
40
|
-
expect(txSender.getTransactionReceipt).toHaveBeenCalledTimes(2);
|
|
41
|
-
});
|
|
42
|
-
it('returns false if tx reverts', async () => {
|
|
43
|
-
txSender.getTransactionReceipt.mockReset().mockResolvedValueOnce({ ...txReceipt, status: false });
|
|
44
|
-
const result = await publisher.processL2Block(l2Block);
|
|
45
|
-
expect(result).toEqual(false);
|
|
46
|
-
});
|
|
47
|
-
it('returns false if interrupted', async () => {
|
|
48
|
-
txSender.sendProcessTx.mockReset().mockImplementationOnce(() => sleep(10, txHash));
|
|
49
|
-
const resultPromise = publisher.processL2Block(l2Block);
|
|
50
|
-
publisher.interrupt();
|
|
51
|
-
const result = await resultPromise;
|
|
52
|
-
expect(result).toEqual(false);
|
|
53
|
-
expect(txSender.getTransactionReceipt).not.toHaveBeenCalled();
|
|
54
|
-
});
|
|
55
|
-
it.skip('waits for fee distributor balance', () => { });
|
|
56
|
-
it.skip('fails if contract is changed underfoot', () => { });
|
|
57
|
-
});
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDEtcHVibGlzaGVyLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2wxLXB1Ymxpc2hlci50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFdkMsT0FBTyxFQUFhLElBQUksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXJELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDcEMsT0FBTyxFQUFFLFdBQVcsRUFBa0QsTUFBTSxtQkFBbUIsQ0FBQztBQUVoRyxRQUFRLENBQUMsYUFBYSxFQUFFLEdBQUcsRUFBRTtJQUMzQixJQUFJLFFBQXdDLENBQUM7SUFDN0MsSUFBSSxNQUFjLENBQUM7SUFDbkIsSUFBSSxTQUFvQyxDQUFDO0lBQ3pDLElBQUksT0FBZ0IsQ0FBQztJQUNyQixJQUFJLFFBQWdCLENBQUM7SUFDckIsSUFBSSxPQUFlLENBQUM7SUFDcEIsSUFBSSxTQUFzQixDQUFDO0lBRTNCLFVBQVUsQ0FBQyxHQUFHLEVBQUU7UUFDZCxPQUFPLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUM3QixRQUFRLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQzVCLE9BQU8sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBRTFCLFFBQVEsR0FBRyxJQUFJLEVBQXVCLENBQUM7UUFDdkMsTUFBTSxHQUFHLEtBQUssTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDLGlCQUFpQjtRQUN4RSxTQUFTLEdBQUcsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUN0RCxRQUFRLENBQUMsYUFBYSxDQUFDLHFCQUFxQixDQUFDLE1BQU0s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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"public_processor.test.d.ts","sourceRoot":"","sources":["../../src/sequencer/public_processor.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,164 +0,0 @@
|
|
|
1
|
-
import { ARGS_LENGTH, CallContext, CircuitsWasm, CombinedAccumulatedData, EthAddress, Fr, FunctionData, GlobalVariables, HistoricBlockData, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, PUBLIC_DATA_TREE_HEIGHT, PublicKernelPublicInputs, makeEmptyProof, makeTuple, } from '@aztec/circuits.js';
|
|
2
|
-
import { computeCallStackItemHash } from '@aztec/circuits.js/abis';
|
|
3
|
-
import { makeAztecAddress, makePrivateKernelPublicInputsFinal, makePublicCallRequest, makeSelector, } from '@aztec/circuits.js/factories';
|
|
4
|
-
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
|
-
import { EncodedContractFunction, ExtendedContractData, FunctionL2Logs, SiblingPath, Tx, TxL2Logs, mockTx, } from '@aztec/types';
|
|
6
|
-
import { mock } from 'jest-mock-extended';
|
|
7
|
-
import times from 'lodash.times';
|
|
8
|
-
import { WasmPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
|
|
9
|
-
import { PublicProcessor } from './public_processor.js';
|
|
10
|
-
describe('public_processor', () => {
|
|
11
|
-
let db;
|
|
12
|
-
let publicExecutor;
|
|
13
|
-
let publicProver;
|
|
14
|
-
let contractDataSource;
|
|
15
|
-
let publicFunction;
|
|
16
|
-
let contractData;
|
|
17
|
-
let proof;
|
|
18
|
-
let root;
|
|
19
|
-
let processor;
|
|
20
|
-
beforeEach(() => {
|
|
21
|
-
db = mock();
|
|
22
|
-
publicExecutor = mock();
|
|
23
|
-
publicProver = mock();
|
|
24
|
-
contractDataSource = mock();
|
|
25
|
-
contractData = ExtendedContractData.random();
|
|
26
|
-
publicFunction = EncodedContractFunction.random();
|
|
27
|
-
proof = makeEmptyProof();
|
|
28
|
-
root = Buffer.alloc(32, 5);
|
|
29
|
-
publicProver.getPublicCircuitProof.mockResolvedValue(proof);
|
|
30
|
-
publicProver.getPublicKernelCircuitProof.mockResolvedValue(proof);
|
|
31
|
-
db.getTreeInfo.mockResolvedValue({ root });
|
|
32
|
-
contractDataSource.getExtendedContractData.mockResolvedValue(contractData);
|
|
33
|
-
contractDataSource.getPublicFunction.mockResolvedValue(publicFunction);
|
|
34
|
-
});
|
|
35
|
-
describe('with mock circuits', () => {
|
|
36
|
-
let publicKernel;
|
|
37
|
-
beforeEach(() => {
|
|
38
|
-
publicKernel = mock();
|
|
39
|
-
processor = new PublicProcessor(db, publicExecutor, publicKernel, publicProver, contractDataSource, GlobalVariables.empty(), HistoricBlockData.empty());
|
|
40
|
-
});
|
|
41
|
-
it('skips txs without public execution requests', async function () {
|
|
42
|
-
const tx = mockTx();
|
|
43
|
-
tx.data.end.publicCallStack = makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, Fr.zero);
|
|
44
|
-
const hash = await tx.getTxHash();
|
|
45
|
-
const [processed, failed] = await processor.process([tx]);
|
|
46
|
-
expect(processed).toEqual([
|
|
47
|
-
{
|
|
48
|
-
isEmpty: false,
|
|
49
|
-
hash,
|
|
50
|
-
data: new PublicKernelPublicInputs(CombinedAccumulatedData.fromFinalAccumulatedData(tx.data.end), tx.data.constants),
|
|
51
|
-
proof: tx.proof,
|
|
52
|
-
encryptedLogs: tx.encryptedLogs,
|
|
53
|
-
unencryptedLogs: tx.unencryptedLogs,
|
|
54
|
-
},
|
|
55
|
-
]);
|
|
56
|
-
expect(failed).toEqual([]);
|
|
57
|
-
});
|
|
58
|
-
it('returns failed txs without aborting entire operation', async function () {
|
|
59
|
-
publicExecutor.simulate.mockRejectedValue(new Error(`Failed`));
|
|
60
|
-
const tx = mockTx();
|
|
61
|
-
const [processed, failed] = await processor.process([tx]);
|
|
62
|
-
expect(processed).toEqual([]);
|
|
63
|
-
expect(failed[0].tx).toEqual(tx);
|
|
64
|
-
});
|
|
65
|
-
});
|
|
66
|
-
describe('with actual circuits', () => {
|
|
67
|
-
let publicKernel;
|
|
68
|
-
let wasm;
|
|
69
|
-
beforeAll(async () => {
|
|
70
|
-
wasm = await CircuitsWasm.get();
|
|
71
|
-
});
|
|
72
|
-
beforeEach(() => {
|
|
73
|
-
const path = times(PUBLIC_DATA_TREE_HEIGHT, i => Buffer.alloc(32, i));
|
|
74
|
-
db.getSiblingPath.mockResolvedValue(new SiblingPath(PUBLIC_DATA_TREE_HEIGHT, path));
|
|
75
|
-
publicKernel = new WasmPublicKernelCircuitSimulator();
|
|
76
|
-
processor = new PublicProcessor(db, publicExecutor, publicKernel, publicProver, contractDataSource, GlobalVariables.empty(), HistoricBlockData.empty());
|
|
77
|
-
});
|
|
78
|
-
const expectedTxByHash = async (tx) => expect.objectContaining({
|
|
79
|
-
hash: await tx.getTxHash(),
|
|
80
|
-
proof,
|
|
81
|
-
});
|
|
82
|
-
it('runs a tx with enqueued public calls', async function () {
|
|
83
|
-
const callRequests = [makePublicCallRequest(0x100), makePublicCallRequest(0x100)];
|
|
84
|
-
const callStackItems = await Promise.all(callRequests.map(call => call.toPublicCallStackItem()));
|
|
85
|
-
const callStackHashes = callStackItems.map(call => computeCallStackItemHash(wasm, call));
|
|
86
|
-
const kernelOutput = makePrivateKernelPublicInputsFinal(0x10);
|
|
87
|
-
kernelOutput.end.publicCallStack = padArrayEnd(callStackHashes, Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX);
|
|
88
|
-
kernelOutput.end.privateCallStack = padArrayEnd([], Fr.ZERO, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX);
|
|
89
|
-
const tx = new Tx(kernelOutput, proof, TxL2Logs.random(2, 3), TxL2Logs.random(3, 2), callRequests, [
|
|
90
|
-
ExtendedContractData.random(),
|
|
91
|
-
]);
|
|
92
|
-
publicExecutor.simulate.mockImplementation(execution => {
|
|
93
|
-
for (const request of callRequests) {
|
|
94
|
-
if (execution.contractAddress.equals(request.contractAddress)) {
|
|
95
|
-
return Promise.resolve(makePublicExecutionResultFromRequest(request));
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
throw new Error(`Unexpected execution request: ${execution}`);
|
|
99
|
-
});
|
|
100
|
-
const [processed, failed] = await processor.process([tx]);
|
|
101
|
-
expect(processed).toHaveLength(1);
|
|
102
|
-
expect(processed).toEqual([await expectedTxByHash(tx)]);
|
|
103
|
-
expect(failed).toHaveLength(0);
|
|
104
|
-
expect(publicExecutor.simulate).toHaveBeenCalledTimes(2);
|
|
105
|
-
});
|
|
106
|
-
it('runs a tx with an enqueued public call with nested execution', async function () {
|
|
107
|
-
const callRequest = makePublicCallRequest(0x100);
|
|
108
|
-
const callStackItem = await callRequest.toPublicCallStackItem();
|
|
109
|
-
const callStackHash = computeCallStackItemHash(wasm, callStackItem);
|
|
110
|
-
const kernelOutput = makePrivateKernelPublicInputsFinal(0x10);
|
|
111
|
-
kernelOutput.end.publicCallStack = padArrayEnd([callStackHash], Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX);
|
|
112
|
-
kernelOutput.end.privateCallStack = padArrayEnd([], Fr.ZERO, MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX);
|
|
113
|
-
const tx = new Tx(kernelOutput, proof, TxL2Logs.random(2, 3), TxL2Logs.random(3, 2), [callRequest], [ExtendedContractData.random()]);
|
|
114
|
-
const publicExecutionResult = makePublicExecutionResultFromRequest(callRequest);
|
|
115
|
-
publicExecutionResult.nestedExecutions = [
|
|
116
|
-
makePublicExecutionResult(publicExecutionResult.execution.contractAddress, {
|
|
117
|
-
to: makeAztecAddress(30),
|
|
118
|
-
functionData: new FunctionData(makeSelector(5), false, false, false),
|
|
119
|
-
args: new Array(ARGS_LENGTH).fill(Fr.ZERO),
|
|
120
|
-
}),
|
|
121
|
-
];
|
|
122
|
-
publicExecutor.simulate.mockResolvedValue(publicExecutionResult);
|
|
123
|
-
const [processed, failed] = await processor.process([tx]);
|
|
124
|
-
expect(processed).toHaveLength(1);
|
|
125
|
-
expect(processed).toEqual([await expectedTxByHash(tx)]);
|
|
126
|
-
expect(failed).toHaveLength(0);
|
|
127
|
-
expect(publicExecutor.simulate).toHaveBeenCalledTimes(1);
|
|
128
|
-
});
|
|
129
|
-
});
|
|
130
|
-
});
|
|
131
|
-
function makePublicExecutionResultFromRequest(item) {
|
|
132
|
-
return {
|
|
133
|
-
execution: item,
|
|
134
|
-
nestedExecutions: [],
|
|
135
|
-
returnValues: [new Fr(1n)],
|
|
136
|
-
newCommitments: [],
|
|
137
|
-
newL2ToL1Messages: [],
|
|
138
|
-
newNullifiers: [],
|
|
139
|
-
contractStorageReads: [],
|
|
140
|
-
contractStorageUpdateRequests: [],
|
|
141
|
-
unencryptedLogs: new FunctionL2Logs([]),
|
|
142
|
-
};
|
|
143
|
-
}
|
|
144
|
-
function makePublicExecutionResult(from, tx, nestedExecutions = []) {
|
|
145
|
-
const callContext = new CallContext(from, tx.to, EthAddress.ZERO, false, false, false);
|
|
146
|
-
const execution = {
|
|
147
|
-
callContext,
|
|
148
|
-
contractAddress: tx.to,
|
|
149
|
-
functionData: tx.functionData,
|
|
150
|
-
args: tx.args,
|
|
151
|
-
};
|
|
152
|
-
return {
|
|
153
|
-
execution,
|
|
154
|
-
nestedExecutions,
|
|
155
|
-
returnValues: [],
|
|
156
|
-
newCommitments: [],
|
|
157
|
-
newNullifiers: [],
|
|
158
|
-
newL2ToL1Messages: [],
|
|
159
|
-
contractStorageReads: [],
|
|
160
|
-
contractStorageUpdateRequests: [],
|
|
161
|
-
unencryptedLogs: new FunctionL2Logs([]),
|
|
162
|
-
};
|
|
163
|
-
}
|
|
164
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.test.js","sourceRoot":"","sources":["../../src/sequencer/public_processor.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sequencer.test.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.test.ts"],"names":[],"mappings":""}
|