@aztec/archiver 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.76.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.
- package/dest/archiver/archiver.d.ts +186 -0
- package/dest/archiver/archiver.d.ts.map +1 -0
- package/dest/archiver/archiver.js +711 -729
- package/dest/archiver/archiver_store.d.ts +217 -0
- package/dest/archiver/archiver_store.d.ts.map +1 -0
- package/dest/archiver/archiver_store.js +2 -4
- package/dest/archiver/archiver_store_test_suite.d.ts +8 -0
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -0
- package/dest/archiver/archiver_store_test_suite.js +224 -385
- package/dest/archiver/config.d.ts +37 -0
- package/dest/archiver/config.d.ts.map +1 -0
- package/dest/archiver/config.js +15 -9
- package/dest/archiver/data_retrieval.d.ts +71 -0
- package/dest/archiver/data_retrieval.d.ts.map +1 -0
- package/dest/archiver/data_retrieval.js +67 -77
- package/dest/archiver/errors.d.ts +4 -0
- package/dest/archiver/errors.d.ts.map +1 -0
- package/dest/archiver/errors.js +2 -1
- package/dest/archiver/index.d.ts +8 -0
- package/dest/archiver/index.d.ts.map +1 -0
- package/dest/archiver/index.js +1 -0
- package/dest/archiver/instrumentation.d.ts +27 -0
- package/dest/archiver/instrumentation.d.ts.map +1 -0
- package/dest/archiver/instrumentation.js +17 -29
- package/dest/archiver/kv_archiver_store/block_store.d.ts +87 -0
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/block_store.js +127 -118
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts +17 -0
- package/dest/archiver/kv_archiver_store/contract_class_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/contract_class_store.js +37 -43
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts +13 -0
- package/dest/archiver/kv_archiver_store/contract_instance_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/contract_instance_store.js +12 -7
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +147 -0
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +158 -135
- package/dest/archiver/kv_archiver_store/log_store.d.ts +47 -0
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/log_store.js +256 -271
- package/dest/archiver/kv_archiver_store/message_store.d.ts +33 -0
- package/dest/archiver/kv_archiver_store/message_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/message_store.js +48 -42
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts +12 -0
- package/dest/archiver/kv_archiver_store/nullifier_store.d.ts.map +1 -0
- package/dest/archiver/kv_archiver_store/nullifier_store.js +42 -35
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts +23 -0
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.d.ts.map +1 -0
- package/dest/archiver/memory_archiver_store/l1_to_l2_message_store.js +24 -15
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +168 -0
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -0
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +231 -227
- package/dest/archiver/structs/data_retrieval.d.ts +27 -0
- package/dest/archiver/structs/data_retrieval.d.ts.map +1 -0
- package/dest/archiver/structs/data_retrieval.js +2 -5
- package/dest/archiver/structs/published.d.ts +11 -0
- package/dest/archiver/structs/published.d.ts.map +1 -0
- package/dest/archiver/structs/published.js +2 -1
- package/dest/factory.d.ts +10 -0
- package/dest/factory.d.ts.map +1 -0
- package/dest/factory.js +24 -32
- package/dest/index.d.ts +5 -0
- package/dest/index.d.ts.map +1 -0
- package/dest/index.js +1 -0
- package/dest/rpc/index.d.ts +9 -0
- package/dest/rpc/index.d.ts.map +1 -0
- package/dest/rpc/index.js +8 -7
- package/dest/test/index.d.ts +4 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +1 -0
- package/dest/test/mock_archiver.d.ts +22 -0
- package/dest/test/mock_archiver.d.ts.map +1 -0
- package/dest/test/mock_archiver.js +13 -8
- package/dest/test/mock_l1_to_l2_message_source.d.ts +16 -0
- package/dest/test/mock_l1_to_l2_message_source.d.ts.map +1 -0
- package/dest/test/mock_l1_to_l2_message_source.js +4 -4
- package/dest/test/mock_l2_block_source.d.ts +80 -0
- package/dest/test/mock_l2_block_source.d.ts.map +1 -0
- package/dest/test/mock_l2_block_source.js +67 -68
- package/package.json +15 -14
- package/src/archiver/config.ts +7 -1
- package/src/archiver/index.ts +1 -1
- package/src/factory.ts +7 -3
- package/src/rpc/index.ts +16 -3
|
@@ -1,340 +1,266 @@
|
|
|
1
1
|
import { InboxLeaf, L2Block, LogId, TxEffect, TxHash, wrapInBlock } from '@aztec/circuit-types';
|
|
2
2
|
import '@aztec/circuit-types/jest';
|
|
3
|
-
import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, MAX_NULLIFIERS_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PrivateLog, PublicLog, SerializableContractInstance, computePublicBytecodeCommitment } from '@aztec/circuits.js';
|
|
4
|
-
import { makeContractClassPublic, makeExecutablePrivateFunctionWithMembershipProof, makeUnconstrainedFunctionWithMembershipProof } from '@aztec/circuits.js/testing';
|
|
3
|
+
import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT, MAX_NULLIFIERS_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS, PUBLIC_LOG_DATA_SIZE_IN_FIELDS, PrivateLog, PublicLog, SerializableContractInstance, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
|
|
4
|
+
import { makeContractClassPublic, makeExecutablePrivateFunctionWithMembershipProof, makeUnconstrainedFunctionWithMembershipProof, } from '@aztec/circuits.js/testing';
|
|
5
5
|
import { times, timesParallel } from '@aztec/foundation/collection';
|
|
6
6
|
import { randomInt } from '@aztec/foundation/crypto';
|
|
7
7
|
/**
|
|
8
8
|
* @param testName - The name of the test suite.
|
|
9
9
|
* @param getStore - Returns an instance of a store that's already been initialized.
|
|
10
|
-
*/
|
|
11
|
-
|
|
10
|
+
*/
|
|
11
|
+
export function describeArchiverDataStore(testName, getStore) {
|
|
12
|
+
describe(testName, () => {
|
|
12
13
|
let store;
|
|
13
14
|
let blocks;
|
|
14
15
|
const blockTests = [
|
|
15
|
-
[
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
],
|
|
20
|
-
[
|
|
21
|
-
10,
|
|
22
|
-
1,
|
|
23
|
-
()=>blocks.slice(9, 10)
|
|
24
|
-
],
|
|
25
|
-
[
|
|
26
|
-
1,
|
|
27
|
-
10,
|
|
28
|
-
()=>blocks.slice(0, 10)
|
|
29
|
-
],
|
|
30
|
-
[
|
|
31
|
-
2,
|
|
32
|
-
5,
|
|
33
|
-
()=>blocks.slice(1, 6)
|
|
34
|
-
],
|
|
35
|
-
[
|
|
36
|
-
5,
|
|
37
|
-
2,
|
|
38
|
-
()=>blocks.slice(4, 6)
|
|
39
|
-
]
|
|
16
|
+
[1, 1, () => blocks.slice(0, 1)],
|
|
17
|
+
[10, 1, () => blocks.slice(9, 10)],
|
|
18
|
+
[1, 10, () => blocks.slice(0, 10)],
|
|
19
|
+
[2, 5, () => blocks.slice(1, 6)],
|
|
20
|
+
[5, 2, () => blocks.slice(4, 6)],
|
|
40
21
|
];
|
|
41
|
-
const makeL1Published = (block, l1BlockNumber)=>({
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
beforeEach(async ()=>{
|
|
22
|
+
const makeL1Published = (block, l1BlockNumber) => ({
|
|
23
|
+
data: block,
|
|
24
|
+
l1: {
|
|
25
|
+
blockNumber: BigInt(l1BlockNumber),
|
|
26
|
+
blockHash: `0x${l1BlockNumber}`,
|
|
27
|
+
timestamp: BigInt(l1BlockNumber * 1000),
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
beforeEach(async () => {
|
|
50
31
|
store = await getStore();
|
|
51
|
-
blocks = await timesParallel(10, async (i)=>makeL1Published(await L2Block.random(i + 1), i + 10));
|
|
32
|
+
blocks = await timesParallel(10, async (i) => makeL1Published(await L2Block.random(i + 1), i + 10));
|
|
52
33
|
});
|
|
53
|
-
describe('addBlocks', ()=>{
|
|
54
|
-
it('returns success when adding blocks', async ()=>{
|
|
34
|
+
describe('addBlocks', () => {
|
|
35
|
+
it('returns success when adding blocks', async () => {
|
|
55
36
|
await expect(store.addBlocks(blocks)).resolves.toBe(true);
|
|
56
37
|
});
|
|
57
|
-
it('allows duplicate blocks', async ()=>{
|
|
38
|
+
it('allows duplicate blocks', async () => {
|
|
58
39
|
await store.addBlocks(blocks);
|
|
59
40
|
await expect(store.addBlocks(blocks)).resolves.toBe(true);
|
|
60
41
|
});
|
|
61
42
|
});
|
|
62
|
-
describe('unwindBlocks', ()=>{
|
|
63
|
-
it('unwinding blocks will remove blocks from the chain', async ()=>{
|
|
43
|
+
describe('unwindBlocks', () => {
|
|
44
|
+
it('unwinding blocks will remove blocks from the chain', async () => {
|
|
64
45
|
await store.addBlocks(blocks);
|
|
65
46
|
const blockNumber = await store.getSynchedL2BlockNumber();
|
|
66
|
-
expect(await store.getBlocks(blockNumber, 1)).toEqual([
|
|
67
|
-
blocks[blocks.length - 1]
|
|
68
|
-
]);
|
|
47
|
+
expect(await store.getBlocks(blockNumber, 1)).toEqual([blocks[blocks.length - 1]]);
|
|
69
48
|
await store.unwindBlocks(blockNumber, 1);
|
|
70
49
|
expect(await store.getSynchedL2BlockNumber()).toBe(blockNumber - 1);
|
|
71
50
|
expect(await store.getBlocks(blockNumber, 1)).toEqual([]);
|
|
72
51
|
});
|
|
73
|
-
it('can unwind multiple empty blocks', async ()=>{
|
|
74
|
-
const emptyBlocks = await timesParallel(10, async (i)=>makeL1Published(await L2Block.random(i + 1, 0), i + 10));
|
|
52
|
+
it('can unwind multiple empty blocks', async () => {
|
|
53
|
+
const emptyBlocks = await timesParallel(10, async (i) => makeL1Published(await L2Block.random(i + 1, 0), i + 10));
|
|
75
54
|
await store.addBlocks(emptyBlocks);
|
|
76
55
|
expect(await store.getSynchedL2BlockNumber()).toBe(10);
|
|
77
56
|
await store.unwindBlocks(10, 3);
|
|
78
57
|
expect(await store.getSynchedL2BlockNumber()).toBe(7);
|
|
79
|
-
expect((await store.getBlocks(1, 10)).map(
|
|
80
|
-
1,
|
|
81
|
-
2,
|
|
82
|
-
3,
|
|
83
|
-
4,
|
|
84
|
-
5,
|
|
85
|
-
6,
|
|
86
|
-
7
|
|
87
|
-
]);
|
|
58
|
+
expect((await store.getBlocks(1, 10)).map(b => b.data.number)).toEqual([1, 2, 3, 4, 5, 6, 7]);
|
|
88
59
|
});
|
|
89
|
-
it('refuses to unwind blocks if the tip is not the last block', async ()=>{
|
|
60
|
+
it('refuses to unwind blocks if the tip is not the last block', async () => {
|
|
90
61
|
await store.addBlocks(blocks);
|
|
91
62
|
await expect(store.unwindBlocks(5, 1)).rejects.toThrow(/can only unwind blocks from the tip/i);
|
|
92
63
|
});
|
|
93
64
|
});
|
|
94
|
-
describe('getBlocks', ()=>{
|
|
95
|
-
beforeEach(async ()=>{
|
|
65
|
+
describe('getBlocks', () => {
|
|
66
|
+
beforeEach(async () => {
|
|
96
67
|
await store.addBlocks(blocks);
|
|
97
68
|
});
|
|
98
|
-
it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks)=>{
|
|
69
|
+
it.each(blockTests)('retrieves previously stored blocks', async (start, limit, getExpectedBlocks) => {
|
|
99
70
|
await expect(store.getBlocks(start, limit)).resolves.toEqual(getExpectedBlocks());
|
|
100
71
|
});
|
|
101
|
-
it('returns an empty array if no blocks are found', async ()=>{
|
|
72
|
+
it('returns an empty array if no blocks are found', async () => {
|
|
102
73
|
await expect(store.getBlocks(12, 1)).resolves.toEqual([]);
|
|
103
74
|
});
|
|
104
|
-
it('throws an error if limit is invalid', async ()=>{
|
|
75
|
+
it('throws an error if limit is invalid', async () => {
|
|
105
76
|
await expect(store.getBlocks(1, 0)).rejects.toThrow('Invalid limit: 0');
|
|
106
77
|
});
|
|
107
|
-
it('throws an error if `from` it is out of range', async ()=>{
|
|
78
|
+
it('throws an error if `from` it is out of range', async () => {
|
|
108
79
|
await expect(store.getBlocks(INITIAL_L2_BLOCK_NUM - 100, 1)).rejects.toThrow('Invalid start: -99');
|
|
109
80
|
});
|
|
110
81
|
});
|
|
111
|
-
describe('getSyncedL2BlockNumber', ()=>{
|
|
112
|
-
it('returns the block number before INITIAL_L2_BLOCK_NUM if no blocks have been added', async ()=>{
|
|
82
|
+
describe('getSyncedL2BlockNumber', () => {
|
|
83
|
+
it('returns the block number before INITIAL_L2_BLOCK_NUM if no blocks have been added', async () => {
|
|
113
84
|
await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(INITIAL_L2_BLOCK_NUM - 1);
|
|
114
85
|
});
|
|
115
|
-
it("returns the most recently added block's number", async ()=>{
|
|
86
|
+
it("returns the most recently added block's number", async () => {
|
|
116
87
|
await store.addBlocks(blocks);
|
|
117
88
|
await expect(store.getSynchedL2BlockNumber()).resolves.toEqual(blocks.at(-1).data.number);
|
|
118
89
|
});
|
|
119
90
|
});
|
|
120
|
-
describe('getSynchPoint', ()=>{
|
|
121
|
-
it('returns undefined if no blocks have been added', async ()=>{
|
|
91
|
+
describe('getSynchPoint', () => {
|
|
92
|
+
it('returns undefined if no blocks have been added', async () => {
|
|
122
93
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
123
94
|
blocksSynchedTo: undefined,
|
|
124
|
-
messagesSynchedTo: undefined
|
|
95
|
+
messagesSynchedTo: undefined,
|
|
125
96
|
});
|
|
126
97
|
});
|
|
127
|
-
it('returns the L1 block number in which the most recent L2 block was published', async ()=>{
|
|
98
|
+
it('returns the L1 block number in which the most recent L2 block was published', async () => {
|
|
128
99
|
await store.addBlocks(blocks);
|
|
129
100
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
130
101
|
blocksSynchedTo: 19n,
|
|
131
|
-
messagesSynchedTo: undefined
|
|
102
|
+
messagesSynchedTo: undefined,
|
|
132
103
|
});
|
|
133
104
|
});
|
|
134
|
-
it('returns the L1 block number that most recently added messages from inbox', async ()=>{
|
|
105
|
+
it('returns the L1 block number that most recently added messages from inbox', async () => {
|
|
135
106
|
await store.addL1ToL2Messages({
|
|
136
107
|
lastProcessedL1BlockNumber: 1n,
|
|
137
|
-
retrievedData: [
|
|
138
|
-
new InboxLeaf(1n, Fr.ZERO)
|
|
139
|
-
]
|
|
108
|
+
retrievedData: [new InboxLeaf(1n, Fr.ZERO)],
|
|
140
109
|
});
|
|
141
110
|
await expect(store.getSynchPoint()).resolves.toEqual({
|
|
142
111
|
blocksSynchedTo: undefined,
|
|
143
|
-
messagesSynchedTo: 1n
|
|
112
|
+
messagesSynchedTo: 1n,
|
|
144
113
|
});
|
|
145
114
|
});
|
|
146
115
|
});
|
|
147
|
-
describe('addLogs', ()=>{
|
|
148
|
-
it('adds private & public logs', async ()=>{
|
|
116
|
+
describe('addLogs', () => {
|
|
117
|
+
it('adds private & public logs', async () => {
|
|
149
118
|
const block = blocks[0].data;
|
|
150
|
-
await expect(store.addLogs([
|
|
151
|
-
block
|
|
152
|
-
])).resolves.toEqual(true);
|
|
119
|
+
await expect(store.addLogs([block])).resolves.toEqual(true);
|
|
153
120
|
});
|
|
154
121
|
});
|
|
155
|
-
describe('deleteLogs', ()=>{
|
|
156
|
-
it('deletes private & public logs', async ()=>{
|
|
122
|
+
describe('deleteLogs', () => {
|
|
123
|
+
it('deletes private & public logs', async () => {
|
|
157
124
|
const block = blocks[0].data;
|
|
158
|
-
await store.addBlocks([
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
await
|
|
162
|
-
block
|
|
163
|
-
])).resolves.toEqual(true);
|
|
164
|
-
expect((await store.getPrivateLogs(1, 1)).length).toEqual(block.body.txEffects.map((txEffect)=>txEffect.privateLogs).flat().length);
|
|
165
|
-
expect((await store.getPublicLogs({
|
|
166
|
-
fromBlock: 1
|
|
167
|
-
})).logs.length).toEqual(block.body.txEffects.map((txEffect)=>txEffect.publicLogs).flat().length);
|
|
125
|
+
await store.addBlocks([blocks[0]]);
|
|
126
|
+
await expect(store.addLogs([block])).resolves.toEqual(true);
|
|
127
|
+
expect((await store.getPrivateLogs(1, 1)).length).toEqual(block.body.txEffects.map(txEffect => txEffect.privateLogs).flat().length);
|
|
128
|
+
expect((await store.getPublicLogs({ fromBlock: 1 })).logs.length).toEqual(block.body.txEffects.map(txEffect => txEffect.publicLogs).flat().length);
|
|
168
129
|
// This one is a pain for memory as we would never want to just delete memory in the middle.
|
|
169
|
-
await store.deleteLogs([
|
|
170
|
-
block
|
|
171
|
-
]);
|
|
130
|
+
await store.deleteLogs([block]);
|
|
172
131
|
expect((await store.getPrivateLogs(1, 1)).length).toEqual(0);
|
|
173
|
-
expect((await store.getPublicLogs({
|
|
174
|
-
fromBlock: 1
|
|
175
|
-
})).logs.length).toEqual(0);
|
|
132
|
+
expect((await store.getPublicLogs({ fromBlock: 1 })).logs.length).toEqual(0);
|
|
176
133
|
});
|
|
177
134
|
});
|
|
178
|
-
describe('getPrivateLogs', ()=>{
|
|
179
|
-
it('gets added private logs', async ()=>{
|
|
135
|
+
describe('getPrivateLogs', () => {
|
|
136
|
+
it('gets added private logs', async () => {
|
|
180
137
|
const block = blocks[0].data;
|
|
181
|
-
await store.addBlocks([
|
|
182
|
-
|
|
183
|
-
]);
|
|
184
|
-
await store.addLogs([
|
|
185
|
-
block
|
|
186
|
-
]);
|
|
138
|
+
await store.addBlocks([blocks[0]]);
|
|
139
|
+
await store.addLogs([block]);
|
|
187
140
|
const privateLogs = await store.getPrivateLogs(1, 1);
|
|
188
|
-
expect(privateLogs).toEqual(block.body.txEffects.map(
|
|
141
|
+
expect(privateLogs).toEqual(block.body.txEffects.map(txEffect => txEffect.privateLogs).flat());
|
|
189
142
|
});
|
|
190
143
|
});
|
|
191
|
-
describe('getTxEffect', ()=>{
|
|
192
|
-
beforeEach(async ()=>{
|
|
193
|
-
await store.addLogs(blocks.map(
|
|
144
|
+
describe('getTxEffect', () => {
|
|
145
|
+
beforeEach(async () => {
|
|
146
|
+
await store.addLogs(blocks.map(b => b.data));
|
|
194
147
|
await store.addBlocks(blocks);
|
|
195
148
|
});
|
|
196
149
|
it.each([
|
|
197
|
-
()=>wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
|
|
198
|
-
()=>wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
|
|
199
|
-
()=>wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
|
|
200
|
-
()=>wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
|
|
201
|
-
()=>wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data)
|
|
202
|
-
])('retrieves a previously stored transaction', async (getExpectedTx)=>{
|
|
150
|
+
() => wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
|
|
151
|
+
() => wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
|
|
152
|
+
() => wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
|
|
153
|
+
() => wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
|
|
154
|
+
() => wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data),
|
|
155
|
+
])('retrieves a previously stored transaction', async (getExpectedTx) => {
|
|
203
156
|
const expectedTx = await getExpectedTx();
|
|
204
157
|
const actualTx = await store.getTxEffect(expectedTx.data.txHash);
|
|
205
158
|
expect(actualTx).toEqual(expectedTx);
|
|
206
159
|
});
|
|
207
|
-
it('returns undefined if tx is not found', async ()=>{
|
|
160
|
+
it('returns undefined if tx is not found', async () => {
|
|
208
161
|
await expect(store.getTxEffect(TxHash.random())).resolves.toBeUndefined();
|
|
209
162
|
});
|
|
210
163
|
it.each([
|
|
211
|
-
()=>wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
|
|
212
|
-
()=>wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
|
|
213
|
-
()=>wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
|
|
214
|
-
()=>wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
|
|
215
|
-
()=>wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data)
|
|
216
|
-
])('tries to retrieves a previously stored transaction after deleted', async (getExpectedTx)=>{
|
|
164
|
+
() => wrapInBlock(blocks[0].data.body.txEffects[0], blocks[0].data),
|
|
165
|
+
() => wrapInBlock(blocks[9].data.body.txEffects[3], blocks[9].data),
|
|
166
|
+
() => wrapInBlock(blocks[3].data.body.txEffects[1], blocks[3].data),
|
|
167
|
+
() => wrapInBlock(blocks[5].data.body.txEffects[2], blocks[5].data),
|
|
168
|
+
() => wrapInBlock(blocks[1].data.body.txEffects[0], blocks[1].data),
|
|
169
|
+
])('tries to retrieves a previously stored transaction after deleted', async (getExpectedTx) => {
|
|
217
170
|
await store.unwindBlocks(blocks.length, blocks.length);
|
|
218
171
|
const expectedTx = await getExpectedTx();
|
|
219
172
|
const actualTx = await store.getTxEffect(expectedTx.data.txHash);
|
|
220
173
|
expect(actualTx).toEqual(undefined);
|
|
221
174
|
});
|
|
222
|
-
it('returns undefined if tx is not found', async ()=>{
|
|
175
|
+
it('returns undefined if tx is not found', async () => {
|
|
223
176
|
await expect(store.getTxEffect(TxHash.random())).resolves.toBeUndefined();
|
|
224
177
|
});
|
|
225
178
|
});
|
|
226
|
-
describe('L1 to L2 Messages', ()=>{
|
|
179
|
+
describe('L1 to L2 Messages', () => {
|
|
227
180
|
const l2BlockNumber = 13n;
|
|
228
181
|
const l1ToL2MessageSubtreeSize = 2 ** L1_TO_L2_MSG_SUBTREE_HEIGHT;
|
|
229
|
-
const generateBlockMessages = (blockNumber, numMessages)=>Array.from({
|
|
230
|
-
|
|
231
|
-
}, (_, i)=>new InboxLeaf(InboxLeaf.smallestIndexFromL2Block(blockNumber) + BigInt(i), Fr.random()));
|
|
232
|
-
it('returns messages in correct order', async ()=>{
|
|
182
|
+
const generateBlockMessages = (blockNumber, numMessages) => Array.from({ length: numMessages }, (_, i) => new InboxLeaf(InboxLeaf.smallestIndexFromL2Block(blockNumber) + BigInt(i), Fr.random()));
|
|
183
|
+
it('returns messages in correct order', async () => {
|
|
233
184
|
const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize);
|
|
234
|
-
const shuffledMessages = msgs.slice().sort(()=>randomInt(1) - 0.5);
|
|
235
|
-
await store.addL1ToL2Messages({
|
|
236
|
-
lastProcessedL1BlockNumber: 100n,
|
|
237
|
-
retrievedData: shuffledMessages
|
|
238
|
-
});
|
|
185
|
+
const shuffledMessages = msgs.slice().sort(() => randomInt(1) - 0.5);
|
|
186
|
+
await store.addL1ToL2Messages({ lastProcessedL1BlockNumber: 100n, retrievedData: shuffledMessages });
|
|
239
187
|
const retrievedMessages = await store.getL1ToL2Messages(l2BlockNumber);
|
|
240
|
-
const expectedLeavesOrder = msgs.map(
|
|
188
|
+
const expectedLeavesOrder = msgs.map(msg => msg.leaf);
|
|
241
189
|
expect(expectedLeavesOrder).toEqual(retrievedMessages);
|
|
242
190
|
});
|
|
243
|
-
it('throws if it is impossible to sequence messages correctly', async ()=>{
|
|
191
|
+
it('throws if it is impossible to sequence messages correctly', async () => {
|
|
244
192
|
const msgs = generateBlockMessages(l2BlockNumber, l1ToL2MessageSubtreeSize - 1);
|
|
245
193
|
// We replace a message with index 4 with a message with index at the end of the tree
|
|
246
194
|
// --> with that there will be a gap and it will be impossible to sequence the
|
|
247
195
|
// end of tree = start of next tree/block - 1
|
|
248
196
|
msgs[4] = new InboxLeaf(InboxLeaf.smallestIndexFromL2Block(l2BlockNumber + 1n) - 1n, Fr.random());
|
|
249
|
-
await store.addL1ToL2Messages({
|
|
250
|
-
|
|
251
|
-
retrievedData: msgs
|
|
252
|
-
});
|
|
253
|
-
await expect(async ()=>{
|
|
197
|
+
await store.addL1ToL2Messages({ lastProcessedL1BlockNumber: 100n, retrievedData: msgs });
|
|
198
|
+
await expect(async () => {
|
|
254
199
|
await store.getL1ToL2Messages(l2BlockNumber);
|
|
255
200
|
}).rejects.toThrow(`L1 to L2 message gap found in block ${l2BlockNumber}`);
|
|
256
201
|
});
|
|
257
202
|
});
|
|
258
|
-
describe('contractInstances', ()=>{
|
|
203
|
+
describe('contractInstances', () => {
|
|
259
204
|
let contractInstance;
|
|
260
205
|
const blockNum = 10;
|
|
261
|
-
beforeEach(async ()=>{
|
|
206
|
+
beforeEach(async () => {
|
|
262
207
|
const randomInstance = await SerializableContractInstance.random();
|
|
263
|
-
contractInstance = {
|
|
264
|
-
|
|
265
|
-
address: await AztecAddress.random()
|
|
266
|
-
};
|
|
267
|
-
await store.addContractInstances([
|
|
268
|
-
contractInstance
|
|
269
|
-
], blockNum);
|
|
208
|
+
contractInstance = { ...randomInstance, address: await AztecAddress.random() };
|
|
209
|
+
await store.addContractInstances([contractInstance], blockNum);
|
|
270
210
|
});
|
|
271
|
-
it('returns previously stored contract instances', async ()=>{
|
|
211
|
+
it('returns previously stored contract instances', async () => {
|
|
272
212
|
await expect(store.getContractInstance(contractInstance.address)).resolves.toMatchObject(contractInstance);
|
|
273
213
|
});
|
|
274
|
-
it('returns undefined if contract instance is not found', async ()=>{
|
|
214
|
+
it('returns undefined if contract instance is not found', async () => {
|
|
275
215
|
await expect(store.getContractInstance(await AztecAddress.random())).resolves.toBeUndefined();
|
|
276
216
|
});
|
|
277
|
-
it('returns undefined if previously stored contract instances was deleted', async ()=>{
|
|
278
|
-
await store.deleteContractInstances([
|
|
279
|
-
contractInstance
|
|
280
|
-
], blockNum);
|
|
217
|
+
it('returns undefined if previously stored contract instances was deleted', async () => {
|
|
218
|
+
await store.deleteContractInstances([contractInstance], blockNum);
|
|
281
219
|
await expect(store.getContractInstance(contractInstance.address)).resolves.toBeUndefined();
|
|
282
220
|
});
|
|
283
221
|
});
|
|
284
|
-
describe('contractClasses', ()=>{
|
|
222
|
+
describe('contractClasses', () => {
|
|
285
223
|
let contractClass;
|
|
286
224
|
const blockNum = 10;
|
|
287
|
-
beforeEach(async ()=>{
|
|
225
|
+
beforeEach(async () => {
|
|
288
226
|
contractClass = await makeContractClassPublic();
|
|
289
|
-
await store.addContractClasses([
|
|
290
|
-
contractClass
|
|
291
|
-
], [
|
|
292
|
-
await computePublicBytecodeCommitment(contractClass.packedBytecode)
|
|
293
|
-
], blockNum);
|
|
227
|
+
await store.addContractClasses([contractClass], [await computePublicBytecodeCommitment(contractClass.packedBytecode)], blockNum);
|
|
294
228
|
});
|
|
295
|
-
it('returns previously stored contract class', async ()=>{
|
|
229
|
+
it('returns previously stored contract class', async () => {
|
|
296
230
|
await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
|
|
297
231
|
});
|
|
298
|
-
it('returns undefined if the initial deployed contract class was deleted', async ()=>{
|
|
299
|
-
await store.deleteContractClasses([
|
|
300
|
-
contractClass
|
|
301
|
-
], blockNum);
|
|
232
|
+
it('returns undefined if the initial deployed contract class was deleted', async () => {
|
|
233
|
+
await store.deleteContractClasses([contractClass], blockNum);
|
|
302
234
|
await expect(store.getContractClass(contractClass.id)).resolves.toBeUndefined();
|
|
303
235
|
});
|
|
304
|
-
it('returns contract class if later "deployment" class was deleted', async ()=>{
|
|
305
|
-
await store.addContractClasses([
|
|
306
|
-
|
|
307
|
-
], [
|
|
308
|
-
await computePublicBytecodeCommitment(contractClass.packedBytecode)
|
|
309
|
-
], blockNum + 1);
|
|
310
|
-
await store.deleteContractClasses([
|
|
311
|
-
contractClass
|
|
312
|
-
], blockNum + 1);
|
|
236
|
+
it('returns contract class if later "deployment" class was deleted', async () => {
|
|
237
|
+
await store.addContractClasses([contractClass], [await computePublicBytecodeCommitment(contractClass.packedBytecode)], blockNum + 1);
|
|
238
|
+
await store.deleteContractClasses([contractClass], blockNum + 1);
|
|
313
239
|
await expect(store.getContractClass(contractClass.id)).resolves.toMatchObject(contractClass);
|
|
314
240
|
});
|
|
315
|
-
it('returns undefined if contract class is not found', async ()=>{
|
|
241
|
+
it('returns undefined if contract class is not found', async () => {
|
|
316
242
|
await expect(store.getContractClass(Fr.random())).resolves.toBeUndefined();
|
|
317
243
|
});
|
|
318
|
-
it('adds new private functions', async ()=>{
|
|
244
|
+
it('adds new private functions', async () => {
|
|
319
245
|
const fns = times(3, makeExecutablePrivateFunctionWithMembershipProof);
|
|
320
246
|
await store.addFunctions(contractClass.id, fns, []);
|
|
321
247
|
const stored = await store.getContractClass(contractClass.id);
|
|
322
248
|
expect(stored?.privateFunctions).toEqual(fns);
|
|
323
249
|
});
|
|
324
|
-
it('does not duplicate private functions', async ()=>{
|
|
250
|
+
it('does not duplicate private functions', async () => {
|
|
325
251
|
const fns = times(3, makeExecutablePrivateFunctionWithMembershipProof);
|
|
326
252
|
await store.addFunctions(contractClass.id, fns.slice(0, 1), []);
|
|
327
253
|
await store.addFunctions(contractClass.id, fns, []);
|
|
328
254
|
const stored = await store.getContractClass(contractClass.id);
|
|
329
255
|
expect(stored?.privateFunctions).toEqual(fns);
|
|
330
256
|
});
|
|
331
|
-
it('adds new unconstrained functions', async ()=>{
|
|
257
|
+
it('adds new unconstrained functions', async () => {
|
|
332
258
|
const fns = times(3, makeUnconstrainedFunctionWithMembershipProof);
|
|
333
259
|
await store.addFunctions(contractClass.id, [], fns);
|
|
334
260
|
const stored = await store.getContractClass(contractClass.id);
|
|
335
261
|
expect(stored?.unconstrainedFunctions).toEqual(fns);
|
|
336
262
|
});
|
|
337
|
-
it('does not duplicate unconstrained functions', async ()=>{
|
|
263
|
+
it('does not duplicate unconstrained functions', async () => {
|
|
338
264
|
const fns = times(3, makeUnconstrainedFunctionWithMembershipProof);
|
|
339
265
|
await store.addFunctions(contractClass.id, [], fns.slice(0, 1));
|
|
340
266
|
await store.addFunctions(contractClass.id, [], fns);
|
|
@@ -342,49 +268,46 @@ import { randomInt } from '@aztec/foundation/crypto';
|
|
|
342
268
|
expect(stored?.unconstrainedFunctions).toEqual(fns);
|
|
343
269
|
});
|
|
344
270
|
});
|
|
345
|
-
describe('getLogsByTags', ()=>{
|
|
271
|
+
describe('getLogsByTags', () => {
|
|
346
272
|
const numBlocks = 3;
|
|
347
273
|
const numTxsPerBlock = 4;
|
|
348
274
|
const numPrivateLogsPerTx = 3;
|
|
349
275
|
const numPublicLogsPerTx = 2;
|
|
350
276
|
let blocks;
|
|
351
|
-
const makeTag = (blockNumber, txIndex, logIndex, isPublic = false)=>new Fr((blockNumber * 100 + txIndex * 10 + logIndex) * (isPublic ? 123 : 1));
|
|
277
|
+
const makeTag = (blockNumber, txIndex, logIndex, isPublic = false) => new Fr((blockNumber * 100 + txIndex * 10 + logIndex) * (isPublic ? 123 : 1));
|
|
352
278
|
// See parseLogFromPublic
|
|
353
279
|
// Search the codebase for "disgusting encoding" to see other hardcoded instances of this encoding, that you might need to change if you ever find yourself here.
|
|
354
|
-
const makeLengthsField = (publicValuesLen, privateValuesLen)=>{
|
|
280
|
+
const makeLengthsField = (publicValuesLen, privateValuesLen) => {
|
|
355
281
|
const buf = Buffer.alloc(32);
|
|
356
282
|
buf.writeUint16BE(publicValuesLen, 27);
|
|
357
283
|
buf.writeUint16BE(privateValuesLen, 30);
|
|
358
284
|
return Fr.fromBuffer(buf);
|
|
359
285
|
};
|
|
360
|
-
const makePrivateLog = (tag)=>PrivateLog.fromFields([
|
|
361
|
-
tag,
|
|
362
|
-
...times(PRIVATE_LOG_SIZE_IN_FIELDS - 1, (i)=>new Fr(tag.toNumber() + i))
|
|
363
|
-
]);
|
|
286
|
+
const makePrivateLog = (tag) => PrivateLog.fromFields([tag, ...times(PRIVATE_LOG_SIZE_IN_FIELDS - 1, i => new Fr(tag.toNumber() + i))]);
|
|
364
287
|
// The tag lives in field 1, not 0, of a public log
|
|
365
288
|
// See extractTaggedLogsFromPublic and noir-projects/aztec-nr/aztec/src/macros/notes/mod.nr -> emit_log
|
|
366
|
-
const makePublicLog = (tag)=>PublicLog.fromFields([
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
const mockPrivateLogs = (blockNumber, txIndex)=>{
|
|
373
|
-
return times(numPrivateLogsPerTx, (logIndex)=>{
|
|
289
|
+
const makePublicLog = (tag) => PublicLog.fromFields([
|
|
290
|
+
AztecAddress.fromNumber(1).toField(), // log address
|
|
291
|
+
makeLengthsField(2, PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 3), // field 0
|
|
292
|
+
tag, // field 1
|
|
293
|
+
...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, i => new Fr(tag.toNumber() + i)), // fields 2 to end
|
|
294
|
+
]);
|
|
295
|
+
const mockPrivateLogs = (blockNumber, txIndex) => {
|
|
296
|
+
return times(numPrivateLogsPerTx, (logIndex) => {
|
|
374
297
|
const tag = makeTag(blockNumber, txIndex, logIndex);
|
|
375
298
|
return makePrivateLog(tag);
|
|
376
299
|
});
|
|
377
300
|
};
|
|
378
|
-
const mockPublicLogs = (blockNumber, txIndex)=>{
|
|
379
|
-
return times(numPublicLogsPerTx, (logIndex)=>{
|
|
301
|
+
const mockPublicLogs = (blockNumber, txIndex) => {
|
|
302
|
+
return times(numPublicLogsPerTx, (logIndex) => {
|
|
380
303
|
const tag = makeTag(blockNumber, txIndex, logIndex, /* isPublic */ true);
|
|
381
304
|
return makePublicLog(tag);
|
|
382
305
|
});
|
|
383
306
|
};
|
|
384
|
-
const mockBlockWithLogs = async (blockNumber)=>{
|
|
307
|
+
const mockBlockWithLogs = async (blockNumber) => {
|
|
385
308
|
const block = await L2Block.random(blockNumber);
|
|
386
309
|
block.header.globalVariables.blockNumber = new Fr(blockNumber);
|
|
387
|
-
block.body.txEffects = await timesParallel(numTxsPerBlock, async (txIndex)=>{
|
|
310
|
+
block.body.txEffects = await timesParallel(numTxsPerBlock, async (txIndex) => {
|
|
388
311
|
const txEffect = await TxEffect.random();
|
|
389
312
|
txEffect.privateLogs = mockPrivateLogs(blockNumber, txIndex);
|
|
390
313
|
txEffect.publicLogs = mockPublicLogs(blockNumber, txIndex);
|
|
@@ -392,242 +315,203 @@ import { randomInt } from '@aztec/foundation/crypto';
|
|
|
392
315
|
});
|
|
393
316
|
return {
|
|
394
317
|
data: block,
|
|
395
|
-
l1: {
|
|
396
|
-
blockNumber: BigInt(blockNumber),
|
|
397
|
-
blockHash: `0x${blockNumber}`,
|
|
398
|
-
timestamp: BigInt(blockNumber)
|
|
399
|
-
}
|
|
318
|
+
l1: { blockNumber: BigInt(blockNumber), blockHash: `0x${blockNumber}`, timestamp: BigInt(blockNumber) },
|
|
400
319
|
};
|
|
401
320
|
};
|
|
402
|
-
beforeEach(async ()=>{
|
|
403
|
-
blocks = await timesParallel(numBlocks, (index)=>mockBlockWithLogs(index));
|
|
321
|
+
beforeEach(async () => {
|
|
322
|
+
blocks = await timesParallel(numBlocks, (index) => mockBlockWithLogs(index));
|
|
404
323
|
await store.addBlocks(blocks);
|
|
405
|
-
await store.addLogs(blocks.map(
|
|
324
|
+
await store.addLogs(blocks.map(b => b.data));
|
|
406
325
|
});
|
|
407
|
-
it('is possible to batch request private logs via tags', async ()=>{
|
|
408
|
-
const tags = [
|
|
409
|
-
makeTag(1, 1, 2),
|
|
410
|
-
makeTag(0, 2, 0)
|
|
411
|
-
];
|
|
326
|
+
it('is possible to batch request private logs via tags', async () => {
|
|
327
|
+
const tags = [makeTag(1, 1, 2), makeTag(0, 2, 0)];
|
|
412
328
|
const logsByTags = await store.getLogsByTags(tags);
|
|
413
329
|
expect(logsByTags).toEqual([
|
|
414
330
|
[
|
|
415
331
|
expect.objectContaining({
|
|
416
332
|
blockNumber: 1,
|
|
417
333
|
logData: makePrivateLog(tags[0]).toBuffer(),
|
|
418
|
-
isFromPublic: false
|
|
419
|
-
})
|
|
334
|
+
isFromPublic: false,
|
|
335
|
+
}),
|
|
420
336
|
],
|
|
421
337
|
[
|
|
422
338
|
expect.objectContaining({
|
|
423
339
|
blockNumber: 0,
|
|
424
340
|
logData: makePrivateLog(tags[1]).toBuffer(),
|
|
425
|
-
isFromPublic: false
|
|
426
|
-
})
|
|
427
|
-
]
|
|
341
|
+
isFromPublic: false,
|
|
342
|
+
}),
|
|
343
|
+
],
|
|
428
344
|
]);
|
|
429
345
|
});
|
|
430
|
-
it('is possible to batch request all logs (private and public) via tags', async ()=>{
|
|
346
|
+
it('is possible to batch request all logs (private and public) via tags', async () => {
|
|
431
347
|
// Tag(0, 0, 0) is shared with the first private log and the first public log.
|
|
432
|
-
const tags = [
|
|
433
|
-
makeTag(0, 0, 0)
|
|
434
|
-
];
|
|
348
|
+
const tags = [makeTag(0, 0, 0)];
|
|
435
349
|
const logsByTags = await store.getLogsByTags(tags);
|
|
436
350
|
expect(logsByTags).toEqual([
|
|
437
351
|
[
|
|
438
352
|
expect.objectContaining({
|
|
439
353
|
blockNumber: 0,
|
|
440
354
|
logData: makePrivateLog(tags[0]).toBuffer(),
|
|
441
|
-
isFromPublic: false
|
|
355
|
+
isFromPublic: false,
|
|
442
356
|
}),
|
|
443
357
|
expect.objectContaining({
|
|
444
358
|
blockNumber: 0,
|
|
445
359
|
logData: makePublicLog(tags[0]).toBuffer(),
|
|
446
|
-
isFromPublic: true
|
|
447
|
-
})
|
|
448
|
-
]
|
|
360
|
+
isFromPublic: true,
|
|
361
|
+
}),
|
|
362
|
+
],
|
|
449
363
|
]);
|
|
450
364
|
});
|
|
451
|
-
it('is possible to batch request logs that have the same tag but different content', async ()=>{
|
|
452
|
-
const tags = [
|
|
453
|
-
makeTag(1, 2, 1)
|
|
454
|
-
];
|
|
365
|
+
it('is possible to batch request logs that have the same tag but different content', async () => {
|
|
366
|
+
const tags = [makeTag(1, 2, 1)];
|
|
455
367
|
// Create a block containing logs that have the same tag as the blocks before.
|
|
456
368
|
const newBlockNumber = numBlocks;
|
|
457
369
|
const newBlock = await mockBlockWithLogs(newBlockNumber);
|
|
458
370
|
const newLog = newBlock.data.body.txEffects[1].privateLogs[1];
|
|
459
371
|
newLog.fields[0] = tags[0];
|
|
460
372
|
newBlock.data.body.txEffects[1].privateLogs[1] = newLog;
|
|
461
|
-
await store.addBlocks([
|
|
462
|
-
|
|
463
|
-
]);
|
|
464
|
-
await store.addLogs([
|
|
465
|
-
newBlock.data
|
|
466
|
-
]);
|
|
373
|
+
await store.addBlocks([newBlock]);
|
|
374
|
+
await store.addLogs([newBlock.data]);
|
|
467
375
|
const logsByTags = await store.getLogsByTags(tags);
|
|
468
376
|
expect(logsByTags).toEqual([
|
|
469
377
|
[
|
|
470
378
|
expect.objectContaining({
|
|
471
379
|
blockNumber: 1,
|
|
472
380
|
logData: makePrivateLog(tags[0]).toBuffer(),
|
|
473
|
-
isFromPublic: false
|
|
381
|
+
isFromPublic: false,
|
|
474
382
|
}),
|
|
475
383
|
expect.objectContaining({
|
|
476
384
|
blockNumber: newBlockNumber,
|
|
477
385
|
logData: newLog.toBuffer(),
|
|
478
|
-
isFromPublic: false
|
|
479
|
-
})
|
|
480
|
-
]
|
|
386
|
+
isFromPublic: false,
|
|
387
|
+
}),
|
|
388
|
+
],
|
|
481
389
|
]);
|
|
482
390
|
});
|
|
483
|
-
it('is possible to request logs for non-existing tags and determine their position', async ()=>{
|
|
484
|
-
const tags = [
|
|
485
|
-
makeTag(99, 88, 77),
|
|
486
|
-
makeTag(1, 1, 1)
|
|
487
|
-
];
|
|
391
|
+
it('is possible to request logs for non-existing tags and determine their position', async () => {
|
|
392
|
+
const tags = [makeTag(99, 88, 77), makeTag(1, 1, 1)];
|
|
488
393
|
const logsByTags = await store.getLogsByTags(tags);
|
|
489
394
|
expect(logsByTags).toEqual([
|
|
490
|
-
[
|
|
395
|
+
[
|
|
396
|
+
// No logs for the first tag.
|
|
397
|
+
],
|
|
491
398
|
[
|
|
492
399
|
expect.objectContaining({
|
|
493
400
|
blockNumber: 1,
|
|
494
401
|
logData: makePrivateLog(tags[1]).toBuffer(),
|
|
495
|
-
isFromPublic: false
|
|
496
|
-
})
|
|
497
|
-
]
|
|
402
|
+
isFromPublic: false,
|
|
403
|
+
}),
|
|
404
|
+
],
|
|
498
405
|
]);
|
|
499
406
|
});
|
|
500
|
-
it('is not possible to add public logs by tag if they are invalid', async ()=>{
|
|
407
|
+
it('is not possible to add public logs by tag if they are invalid', async () => {
|
|
501
408
|
const tag = makeTag(99, 88, 77);
|
|
502
409
|
const invalidLogs = [
|
|
503
410
|
PublicLog.fromFields([
|
|
504
411
|
AztecAddress.fromNumber(1).toField(),
|
|
505
|
-
makeLengthsField(2, 3),
|
|
412
|
+
makeLengthsField(2, 3), // This field claims we have 5 items, but we actually have more
|
|
506
413
|
tag,
|
|
507
|
-
...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1,
|
|
414
|
+
...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, i => new Fr(tag.toNumber() + i)),
|
|
508
415
|
]),
|
|
509
416
|
PublicLog.fromFields([
|
|
510
417
|
AztecAddress.fromNumber(1).toField(),
|
|
511
|
-
makeLengthsField(2, PUBLIC_LOG_DATA_SIZE_IN_FIELDS),
|
|
418
|
+
makeLengthsField(2, PUBLIC_LOG_DATA_SIZE_IN_FIELDS), // This field claims we have more than the max items
|
|
512
419
|
tag,
|
|
513
|
-
...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1,
|
|
514
|
-
])
|
|
420
|
+
...times(PUBLIC_LOG_DATA_SIZE_IN_FIELDS - 1, i => new Fr(tag.toNumber() + i)),
|
|
421
|
+
]),
|
|
515
422
|
];
|
|
516
423
|
// Create a block containing these invalid logs
|
|
517
424
|
const newBlockNumber = numBlocks;
|
|
518
425
|
const newBlock = await mockBlockWithLogs(newBlockNumber);
|
|
519
426
|
newBlock.data.body.txEffects[0].publicLogs = invalidLogs;
|
|
520
|
-
await store.addBlocks([
|
|
521
|
-
|
|
522
|
-
]);
|
|
523
|
-
await store.addLogs([
|
|
524
|
-
newBlock.data
|
|
525
|
-
]);
|
|
526
|
-
const logsByTags = await store.getLogsByTags([
|
|
527
|
-
tag
|
|
528
|
-
]);
|
|
427
|
+
await store.addBlocks([newBlock]);
|
|
428
|
+
await store.addLogs([newBlock.data]);
|
|
429
|
+
const logsByTags = await store.getLogsByTags([tag]);
|
|
529
430
|
// Neither of the logs should have been added:
|
|
530
|
-
expect(logsByTags).toEqual([
|
|
531
|
-
[]
|
|
532
|
-
]);
|
|
431
|
+
expect(logsByTags).toEqual([[]]);
|
|
533
432
|
});
|
|
534
433
|
});
|
|
535
|
-
describe('getPublicLogs', ()=>{
|
|
434
|
+
describe('getPublicLogs', () => {
|
|
536
435
|
const txsPerBlock = 4;
|
|
537
436
|
const numPublicFunctionCalls = 3;
|
|
538
437
|
const numPublicLogs = 2;
|
|
539
438
|
const numBlocks = 10;
|
|
540
439
|
let blocks;
|
|
541
|
-
beforeEach(async ()=>{
|
|
542
|
-
blocks = await timesParallel(numBlocks, async (index)=>({
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
blockHash: `0x${index}`,
|
|
547
|
-
timestamp: BigInt(index)
|
|
548
|
-
}
|
|
549
|
-
}));
|
|
440
|
+
beforeEach(async () => {
|
|
441
|
+
blocks = await timesParallel(numBlocks, async (index) => ({
|
|
442
|
+
data: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
|
|
443
|
+
l1: { blockNumber: BigInt(index), blockHash: `0x${index}`, timestamp: BigInt(index) },
|
|
444
|
+
}));
|
|
550
445
|
await store.addBlocks(blocks);
|
|
551
|
-
await store.addLogs(blocks.map(
|
|
446
|
+
await store.addLogs(blocks.map(b => b.data));
|
|
552
447
|
});
|
|
553
|
-
it('no logs returned if deleted ("txHash" filter param is respected variant)', async ()=>{
|
|
448
|
+
it('no logs returned if deleted ("txHash" filter param is respected variant)', async () => {
|
|
554
449
|
// get random tx
|
|
555
450
|
const targetBlockIndex = randomInt(numBlocks);
|
|
556
451
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
557
452
|
const targetTxHash = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].txHash;
|
|
558
453
|
await Promise.all([
|
|
559
454
|
store.unwindBlocks(blocks.length, blocks.length),
|
|
560
|
-
store.deleteLogs(blocks.map(
|
|
455
|
+
store.deleteLogs(blocks.map(b => b.data)),
|
|
561
456
|
]);
|
|
562
|
-
const response = await store.getPublicLogs({
|
|
563
|
-
txHash: targetTxHash
|
|
564
|
-
});
|
|
457
|
+
const response = await store.getPublicLogs({ txHash: targetTxHash });
|
|
565
458
|
const logs = response.logs;
|
|
566
459
|
expect(response.maxLogsHit).toBeFalsy();
|
|
567
460
|
expect(logs.length).toEqual(0);
|
|
568
461
|
});
|
|
569
|
-
it('"txHash" filter param is respected', async ()=>{
|
|
462
|
+
it('"txHash" filter param is respected', async () => {
|
|
570
463
|
// get random tx
|
|
571
464
|
const targetBlockIndex = randomInt(numBlocks);
|
|
572
465
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
573
466
|
const targetTxHash = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].txHash;
|
|
574
|
-
const response = await store.getPublicLogs({
|
|
575
|
-
txHash: targetTxHash
|
|
576
|
-
});
|
|
467
|
+
const response = await store.getPublicLogs({ txHash: targetTxHash });
|
|
577
468
|
const logs = response.logs;
|
|
578
469
|
expect(response.maxLogsHit).toBeFalsy();
|
|
579
470
|
const expectedNumLogs = numPublicFunctionCalls * numPublicLogs;
|
|
580
471
|
expect(logs.length).toEqual(expectedNumLogs);
|
|
581
472
|
const targeBlockNumber = targetBlockIndex + INITIAL_L2_BLOCK_NUM;
|
|
582
|
-
for (const log of logs){
|
|
473
|
+
for (const log of logs) {
|
|
583
474
|
expect(log.id.blockNumber).toEqual(targeBlockNumber);
|
|
584
475
|
expect(log.id.txIndex).toEqual(targetTxIndex);
|
|
585
476
|
}
|
|
586
477
|
});
|
|
587
|
-
it('"fromBlock" and "toBlock" filter params are respected', async ()=>{
|
|
478
|
+
it('"fromBlock" and "toBlock" filter params are respected', async () => {
|
|
588
479
|
// Set "fromBlock" and "toBlock"
|
|
589
480
|
const fromBlock = 3;
|
|
590
481
|
const toBlock = 7;
|
|
591
|
-
const response = await store.getPublicLogs({
|
|
592
|
-
fromBlock,
|
|
593
|
-
toBlock
|
|
594
|
-
});
|
|
482
|
+
const response = await store.getPublicLogs({ fromBlock, toBlock });
|
|
595
483
|
const logs = response.logs;
|
|
596
484
|
expect(response.maxLogsHit).toBeFalsy();
|
|
597
485
|
const expectedNumLogs = txsPerBlock * numPublicFunctionCalls * numPublicLogs * (toBlock - fromBlock);
|
|
598
486
|
expect(logs.length).toEqual(expectedNumLogs);
|
|
599
|
-
for (const log of logs){
|
|
487
|
+
for (const log of logs) {
|
|
600
488
|
const blockNumber = log.id.blockNumber;
|
|
601
489
|
expect(blockNumber).toBeGreaterThanOrEqual(fromBlock);
|
|
602
490
|
expect(blockNumber).toBeLessThan(toBlock);
|
|
603
491
|
}
|
|
604
492
|
});
|
|
605
|
-
it('"contractAddress" filter param is respected', async ()=>{
|
|
493
|
+
it('"contractAddress" filter param is respected', async () => {
|
|
606
494
|
// Get a random contract address from the logs
|
|
607
495
|
const targetBlockIndex = randomInt(numBlocks);
|
|
608
496
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
609
497
|
const targetLogIndex = randomInt(numPublicLogs * numPublicFunctionCalls);
|
|
610
498
|
const targetContractAddress = blocks[targetBlockIndex].data.body.txEffects[targetTxIndex].publicLogs[targetLogIndex].contractAddress;
|
|
611
|
-
const response = await store.getPublicLogs({
|
|
612
|
-
contractAddress: targetContractAddress
|
|
613
|
-
});
|
|
499
|
+
const response = await store.getPublicLogs({ contractAddress: targetContractAddress });
|
|
614
500
|
expect(response.maxLogsHit).toBeFalsy();
|
|
615
|
-
for (const extendedLog of response.logs){
|
|
501
|
+
for (const extendedLog of response.logs) {
|
|
616
502
|
expect(extendedLog.log.contractAddress.equals(targetContractAddress)).toBeTruthy();
|
|
617
503
|
}
|
|
618
504
|
});
|
|
619
|
-
it('"afterLog" filter param is respected', async ()=>{
|
|
505
|
+
it('"afterLog" filter param is respected', async () => {
|
|
620
506
|
// Get a random log as reference
|
|
621
507
|
const targetBlockIndex = randomInt(numBlocks);
|
|
622
508
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
623
509
|
const targetLogIndex = randomInt(numPublicLogs);
|
|
624
510
|
const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
|
|
625
|
-
const response = await store.getPublicLogs({
|
|
626
|
-
afterLog
|
|
627
|
-
});
|
|
511
|
+
const response = await store.getPublicLogs({ afterLog });
|
|
628
512
|
const logs = response.logs;
|
|
629
513
|
expect(response.maxLogsHit).toBeFalsy();
|
|
630
|
-
for (const log of logs){
|
|
514
|
+
for (const log of logs) {
|
|
631
515
|
const logId = log.id;
|
|
632
516
|
expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
|
|
633
517
|
if (logId.blockNumber === afterLog.blockNumber) {
|
|
@@ -638,87 +522,48 @@ import { randomInt } from '@aztec/foundation/crypto';
|
|
|
638
522
|
}
|
|
639
523
|
}
|
|
640
524
|
});
|
|
641
|
-
it('"txHash" filter param is ignored when "afterLog" is set', async ()=>{
|
|
525
|
+
it('"txHash" filter param is ignored when "afterLog" is set', async () => {
|
|
642
526
|
// Get random txHash
|
|
643
527
|
const txHash = TxHash.random();
|
|
644
528
|
const afterLog = new LogId(1, 0, 0);
|
|
645
|
-
const response = await store.getPublicLogs({
|
|
646
|
-
txHash,
|
|
647
|
-
afterLog
|
|
648
|
-
});
|
|
529
|
+
const response = await store.getPublicLogs({ txHash, afterLog });
|
|
649
530
|
expect(response.logs.length).toBeGreaterThan(1);
|
|
650
531
|
});
|
|
651
|
-
it('intersecting works', async ()=>{
|
|
652
|
-
let logs = (await store.getPublicLogs({
|
|
653
|
-
fromBlock: -10,
|
|
654
|
-
toBlock: -5
|
|
655
|
-
})).logs;
|
|
532
|
+
it('intersecting works', async () => {
|
|
533
|
+
let logs = (await store.getPublicLogs({ fromBlock: -10, toBlock: -5 })).logs;
|
|
656
534
|
expect(logs.length).toBe(0);
|
|
657
535
|
// "fromBlock" gets correctly trimmed to range and "toBlock" is exclusive
|
|
658
|
-
logs = (await store.getPublicLogs({
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
})).logs;
|
|
662
|
-
let blockNumbers = new Set(logs.map((log)=>log.id.blockNumber));
|
|
663
|
-
expect(blockNumbers).toEqual(new Set([
|
|
664
|
-
1,
|
|
665
|
-
2,
|
|
666
|
-
3,
|
|
667
|
-
4
|
|
668
|
-
]));
|
|
536
|
+
logs = (await store.getPublicLogs({ fromBlock: -10, toBlock: 5 })).logs;
|
|
537
|
+
let blockNumbers = new Set(logs.map(log => log.id.blockNumber));
|
|
538
|
+
expect(blockNumbers).toEqual(new Set([1, 2, 3, 4]));
|
|
669
539
|
// "toBlock" should be exclusive
|
|
670
|
-
logs = (await store.getPublicLogs({
|
|
671
|
-
fromBlock: 1,
|
|
672
|
-
toBlock: 1
|
|
673
|
-
})).logs;
|
|
540
|
+
logs = (await store.getPublicLogs({ fromBlock: 1, toBlock: 1 })).logs;
|
|
674
541
|
expect(logs.length).toBe(0);
|
|
675
|
-
logs = (await store.getPublicLogs({
|
|
676
|
-
fromBlock: 10,
|
|
677
|
-
toBlock: 5
|
|
678
|
-
})).logs;
|
|
542
|
+
logs = (await store.getPublicLogs({ fromBlock: 10, toBlock: 5 })).logs;
|
|
679
543
|
expect(logs.length).toBe(0);
|
|
680
544
|
// both "fromBlock" and "toBlock" get correctly capped to range and logs from all blocks are returned
|
|
681
|
-
logs = (await store.getPublicLogs({
|
|
682
|
-
|
|
683
|
-
toBlock: +100
|
|
684
|
-
})).logs;
|
|
685
|
-
blockNumbers = new Set(logs.map((log)=>log.id.blockNumber));
|
|
545
|
+
logs = (await store.getPublicLogs({ fromBlock: -100, toBlock: +100 })).logs;
|
|
546
|
+
blockNumbers = new Set(logs.map(log => log.id.blockNumber));
|
|
686
547
|
expect(blockNumbers.size).toBe(numBlocks);
|
|
687
548
|
// intersecting with "afterLog" works
|
|
688
|
-
logs = (await store.getPublicLogs({
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
})).logs;
|
|
693
|
-
blockNumbers = new Set(logs.map((log)=>log.id.blockNumber));
|
|
694
|
-
expect(blockNumbers).toEqual(new Set([
|
|
695
|
-
4
|
|
696
|
-
]));
|
|
697
|
-
logs = (await store.getPublicLogs({
|
|
698
|
-
toBlock: 5,
|
|
699
|
-
afterLog: new LogId(5, 1, 0)
|
|
700
|
-
})).logs;
|
|
549
|
+
logs = (await store.getPublicLogs({ fromBlock: 2, toBlock: 5, afterLog: new LogId(4, 0, 0) })).logs;
|
|
550
|
+
blockNumbers = new Set(logs.map(log => log.id.blockNumber));
|
|
551
|
+
expect(blockNumbers).toEqual(new Set([4]));
|
|
552
|
+
logs = (await store.getPublicLogs({ toBlock: 5, afterLog: new LogId(5, 1, 0) })).logs;
|
|
701
553
|
expect(logs.length).toBe(0);
|
|
702
|
-
logs = (await store.getPublicLogs({
|
|
703
|
-
fromBlock: 2,
|
|
704
|
-
toBlock: 5,
|
|
705
|
-
afterLog: new LogId(100, 0, 0)
|
|
706
|
-
})).logs;
|
|
554
|
+
logs = (await store.getPublicLogs({ fromBlock: 2, toBlock: 5, afterLog: new LogId(100, 0, 0) })).logs;
|
|
707
555
|
expect(logs.length).toBe(0);
|
|
708
556
|
});
|
|
709
|
-
it('"txIndex" and "logIndex" are respected when "afterLog.blockNumber" is equal to "fromBlock"', async ()=>{
|
|
557
|
+
it('"txIndex" and "logIndex" are respected when "afterLog.blockNumber" is equal to "fromBlock"', async () => {
|
|
710
558
|
// Get a random log as reference
|
|
711
559
|
const targetBlockIndex = randomInt(numBlocks);
|
|
712
560
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
713
561
|
const targetLogIndex = randomInt(numPublicLogs);
|
|
714
562
|
const afterLog = new LogId(targetBlockIndex + INITIAL_L2_BLOCK_NUM, targetTxIndex, targetLogIndex);
|
|
715
|
-
const response = await store.getPublicLogs({
|
|
716
|
-
afterLog,
|
|
717
|
-
fromBlock: afterLog.blockNumber
|
|
718
|
-
});
|
|
563
|
+
const response = await store.getPublicLogs({ afterLog, fromBlock: afterLog.blockNumber });
|
|
719
564
|
const logs = response.logs;
|
|
720
565
|
expect(response.maxLogsHit).toBeFalsy();
|
|
721
|
-
for (const log of logs){
|
|
566
|
+
for (const log of logs) {
|
|
722
567
|
const logId = log.id;
|
|
723
568
|
expect(logId.blockNumber).toBeGreaterThanOrEqual(afterLog.blockNumber);
|
|
724
569
|
if (logId.blockNumber === afterLog.blockNumber) {
|
|
@@ -730,28 +575,24 @@ import { randomInt } from '@aztec/foundation/crypto';
|
|
|
730
575
|
}
|
|
731
576
|
});
|
|
732
577
|
});
|
|
733
|
-
describe('findNullifiersIndexesWithBlock', ()=>{
|
|
578
|
+
describe('findNullifiersIndexesWithBlock', () => {
|
|
734
579
|
let blocks;
|
|
735
580
|
const numBlocks = 10;
|
|
736
581
|
const nullifiersPerBlock = new Map();
|
|
737
|
-
beforeEach(async ()=>{
|
|
738
|
-
blocks = await timesParallel(numBlocks, (index)=>L2Block.random(index + 1, 1));
|
|
739
|
-
blocks.forEach((block, blockIndex)=>{
|
|
740
|
-
nullifiersPerBlock.set(blockIndex, block.body.txEffects.flatMap(
|
|
582
|
+
beforeEach(async () => {
|
|
583
|
+
blocks = await timesParallel(numBlocks, (index) => L2Block.random(index + 1, 1));
|
|
584
|
+
blocks.forEach((block, blockIndex) => {
|
|
585
|
+
nullifiersPerBlock.set(blockIndex, block.body.txEffects.flatMap(txEffect => txEffect.nullifiers));
|
|
741
586
|
});
|
|
742
587
|
});
|
|
743
|
-
it('returns wrapped nullifiers with blocks if they exist', async ()=>{
|
|
588
|
+
it('returns wrapped nullifiers with blocks if they exist', async () => {
|
|
744
589
|
await store.addNullifiers(blocks);
|
|
745
|
-
const nullifiersToRetrieve = [
|
|
746
|
-
...nullifiersPerBlock.get(0),
|
|
747
|
-
...nullifiersPerBlock.get(5),
|
|
748
|
-
Fr.random()
|
|
749
|
-
];
|
|
590
|
+
const nullifiersToRetrieve = [...nullifiersPerBlock.get(0), ...nullifiersPerBlock.get(5), Fr.random()];
|
|
750
591
|
const blockScopedNullifiers = await store.findNullifiersIndexesWithBlock(10, nullifiersToRetrieve);
|
|
751
592
|
expect(blockScopedNullifiers).toHaveLength(nullifiersToRetrieve.length);
|
|
752
593
|
const [undefinedNullifier] = blockScopedNullifiers.slice(-1);
|
|
753
594
|
const realNullifiers = blockScopedNullifiers.slice(0, -1);
|
|
754
|
-
realNullifiers.forEach((blockScopedNullifier, index)=>{
|
|
595
|
+
realNullifiers.forEach((blockScopedNullifier, index) => {
|
|
755
596
|
expect(blockScopedNullifier).not.toBeUndefined();
|
|
756
597
|
const { data, l2BlockNumber } = blockScopedNullifier;
|
|
757
598
|
expect(data).toEqual(expect.any(BigInt));
|
|
@@ -759,26 +600,24 @@ import { randomInt } from '@aztec/foundation/crypto';
|
|
|
759
600
|
});
|
|
760
601
|
expect(undefinedNullifier).toBeUndefined();
|
|
761
602
|
});
|
|
762
|
-
it('returns wrapped nullifiers filtering by blockNumber', async ()=>{
|
|
603
|
+
it('returns wrapped nullifiers filtering by blockNumber', async () => {
|
|
763
604
|
await store.addNullifiers(blocks);
|
|
764
|
-
const nullifiersToRetrieve = [
|
|
765
|
-
...nullifiersPerBlock.get(0),
|
|
766
|
-
...nullifiersPerBlock.get(5)
|
|
767
|
-
];
|
|
605
|
+
const nullifiersToRetrieve = [...nullifiersPerBlock.get(0), ...nullifiersPerBlock.get(5)];
|
|
768
606
|
const blockScopedNullifiers = await store.findNullifiersIndexesWithBlock(5, nullifiersToRetrieve);
|
|
769
607
|
expect(blockScopedNullifiers).toHaveLength(nullifiersToRetrieve.length);
|
|
770
608
|
const undefinedNullifiers = blockScopedNullifiers.slice(-MAX_NULLIFIERS_PER_TX);
|
|
771
609
|
const realNullifiers = blockScopedNullifiers.slice(0, -MAX_NULLIFIERS_PER_TX);
|
|
772
|
-
realNullifiers.forEach(
|
|
610
|
+
realNullifiers.forEach(blockScopedNullifier => {
|
|
773
611
|
expect(blockScopedNullifier).not.toBeUndefined();
|
|
774
612
|
const { data, l2BlockNumber } = blockScopedNullifier;
|
|
775
613
|
expect(data).toEqual(expect.any(BigInt));
|
|
776
614
|
expect(l2BlockNumber).toEqual(1);
|
|
777
615
|
});
|
|
778
|
-
undefinedNullifiers.forEach(
|
|
616
|
+
undefinedNullifiers.forEach(undefinedNullifier => {
|
|
779
617
|
expect(undefinedNullifier).toBeUndefined();
|
|
780
618
|
});
|
|
781
619
|
});
|
|
782
620
|
});
|
|
783
621
|
});
|
|
784
622
|
}
|
|
623
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver_store_test_suite.js","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"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"}
|