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