@aztec/archiver 0.1.0-alpha17 → 0.1.0-alpha21
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/.tsbuildinfo +1 -1
- package/dest/archiver/archiver.d.ts +7 -13
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +11 -19
- package/dest/archiver/archiver.test.js +4 -4
- package/dest/archiver/archiver_store.d.ts +22 -44
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store.js +17 -40
- package/package.json +5 -5
- package/src/archiver/archiver.test.ts +10 -3
- package/src/archiver/archiver.ts +10 -19
- package/src/archiver/archiver_store.ts +26 -63
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { DebugLogger } from '@aztec/foundation/log';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
|
-
import { L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs } from '@aztec/types';
|
|
5
|
+
import { L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs, LogType } from '@aztec/types';
|
|
6
6
|
import { ContractData, ContractPublicData, ContractDataSource, EncodedContractFunction, L2Block, L2BlockSource, L2LogsSource } from '@aztec/types';
|
|
7
7
|
import { Chain, HttpTransport, PublicClient } from 'viem';
|
|
8
8
|
import { Fr } from '@aztec/foundation/fields';
|
|
@@ -113,19 +113,13 @@ export declare class Archiver implements L2BlockSource, L2LogsSource, ContractDa
|
|
|
113
113
|
*/
|
|
114
114
|
getPublicFunction(contractAddress: AztecAddress, functionSelector: Buffer): Promise<EncodedContractFunction | undefined>;
|
|
115
115
|
/**
|
|
116
|
-
* Gets the `take` amount of
|
|
117
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
118
|
-
* @param take - The number of
|
|
119
|
-
* @
|
|
116
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
117
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
118
|
+
* @param take - The number of logs to return.
|
|
119
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
120
|
+
* @returns The requested logs.
|
|
120
121
|
*/
|
|
121
|
-
|
|
122
|
-
/**
|
|
123
|
-
* Gets the `take` amount of unencrypted logs starting from `from`.
|
|
124
|
-
* @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
|
|
125
|
-
* @param take - The number of unencrypted logs to return.
|
|
126
|
-
* @returns The requested unencrypted logs.
|
|
127
|
-
*/
|
|
128
|
-
getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
|
|
122
|
+
getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
|
|
129
123
|
/**
|
|
130
124
|
* Gets the number of the latest L2 block processed by the block source implementation.
|
|
131
125
|
* @returns The number of the latest L2 block processed by the block source implementation.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAwB,aAAa,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import omit from 'lodash.omit';
|
|
2
2
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
3
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
4
|
-
import { INITIAL_L2_BLOCK_NUM } from '@aztec/types';
|
|
4
|
+
import { INITIAL_L2_BLOCK_NUM, LogType } from '@aztec/types';
|
|
5
5
|
import { L2Block, } from '@aztec/types';
|
|
6
6
|
import { createPublicClient, http } from 'viem';
|
|
7
7
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
@@ -125,12 +125,12 @@ export class Archiver {
|
|
|
125
125
|
const encryptedLogs = retrievedBlocks.retrievedData.map(block => {
|
|
126
126
|
return block.newEncryptedLogs;
|
|
127
127
|
});
|
|
128
|
-
await this.store.
|
|
128
|
+
await this.store.addLogs(encryptedLogs, LogType.ENCRYPTED);
|
|
129
129
|
// store unencrypted logs from L2 Blocks that we have retrieved
|
|
130
130
|
const unencryptedLogs = retrievedBlocks.retrievedData.map(block => {
|
|
131
131
|
return block.newUnencryptedLogs;
|
|
132
132
|
});
|
|
133
|
-
await this.store.
|
|
133
|
+
await this.store.addLogs(unencryptedLogs, LogType.UNENCRYPTED);
|
|
134
134
|
// store contracts for which we have retrieved L2 blocks
|
|
135
135
|
const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
|
|
136
136
|
retrievedContracts.retrievedData.forEach(async ([contracts, l2BlockNum], index) => {
|
|
@@ -216,22 +216,14 @@ export class Archiver {
|
|
|
216
216
|
return result;
|
|
217
217
|
}
|
|
218
218
|
/**
|
|
219
|
-
* Gets the `take` amount of
|
|
220
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
221
|
-
* @param take - The number of
|
|
222
|
-
* @
|
|
219
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
220
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
221
|
+
* @param take - The number of logs to return.
|
|
222
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
223
|
+
* @returns The requested logs.
|
|
223
224
|
*/
|
|
224
|
-
|
|
225
|
-
return this.store.
|
|
226
|
-
}
|
|
227
|
-
/**
|
|
228
|
-
* Gets the `take` amount of unencrypted logs starting from `from`.
|
|
229
|
-
* @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
|
|
230
|
-
* @param take - The number of unencrypted logs to return.
|
|
231
|
-
* @returns The requested unencrypted logs.
|
|
232
|
-
*/
|
|
233
|
-
getUnencryptedLogs(from, take) {
|
|
234
|
-
return this.store.getUnencryptedLogs(from, take);
|
|
225
|
+
getLogs(from, take, logType) {
|
|
226
|
+
return this.store.getLogs(from, take, logType);
|
|
235
227
|
}
|
|
236
228
|
/**
|
|
237
229
|
* Gets the number of the latest L2 block processed by the block source implementation.
|
|
@@ -257,4 +249,4 @@ export class Archiver {
|
|
|
257
249
|
return this.store.getConfirmedL1ToL2Message(messageKey);
|
|
258
250
|
}
|
|
259
251
|
}
|
|
260
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
252
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
2
|
-
import { ContractData, ContractPublicData, EncodedContractFunction, L2Block, L2BlockL2Logs } from '@aztec/types';
|
|
2
|
+
import { ContractData, ContractPublicData, EncodedContractFunction, L2Block, L2BlockL2Logs, LogType, } from '@aztec/types';
|
|
3
3
|
import { mock } from 'jest-mock-extended';
|
|
4
4
|
import { encodeFunctionData, toHex } from 'viem';
|
|
5
5
|
import { Archiver } from './archiver.js';
|
|
@@ -75,14 +75,14 @@ describe('Archiver', () => {
|
|
|
75
75
|
const actualPendingMessageKeys = (await archiver.getPendingL1ToL2Messages(10)).map(key => key.toString(true));
|
|
76
76
|
expect(expectedPendingMessageKeys).toEqual(actualPendingMessageKeys);
|
|
77
77
|
// Expect logs to correspond to what is set by L2Block.random(...)
|
|
78
|
-
const encryptedLogs = await archiver.
|
|
78
|
+
const encryptedLogs = await archiver.getLogs(1, 100, LogType.ENCRYPTED);
|
|
79
79
|
expect(encryptedLogs.length).toEqual(blockNums.length);
|
|
80
80
|
for (const [index, x] of blockNums.entries()) {
|
|
81
81
|
const expectedTotalNumEncryptedLogs = 4 * x * (x * 2);
|
|
82
82
|
const totalNumEncryptedLogs = L2BlockL2Logs.unrollLogs([encryptedLogs[index]]).length;
|
|
83
83
|
expect(totalNumEncryptedLogs).toEqual(expectedTotalNumEncryptedLogs);
|
|
84
84
|
}
|
|
85
|
-
const unencryptedLogs = await archiver.
|
|
85
|
+
const unencryptedLogs = await archiver.getLogs(1, 100, LogType.UNENCRYPTED);
|
|
86
86
|
expect(unencryptedLogs.length).toEqual(blockNums.length);
|
|
87
87
|
blockNums.forEach((x, index) => {
|
|
88
88
|
const expectedTotalNumUnencryptedLogs = 4 * (x + 1) * (x * 3);
|
|
@@ -185,4 +185,4 @@ function makeRollupTx(l2Block) {
|
|
|
185
185
|
const input = encodeFunctionData({ abi: RollupAbi, functionName: 'process', args: [proof, block] });
|
|
186
186
|
return { input };
|
|
187
187
|
}
|
|
188
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
188
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.test.js","sourceRoot":"","sources":["../../src/archiver/archiver.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ContractPublicData, L2Block, ContractData, L1ToL2Message, L2BlockL2Logs } from '@aztec/types';
|
|
1
|
+
import { ContractPublicData, L2Block, ContractData, L1ToL2Message, L2BlockL2Logs, LogType } from '@aztec/types';
|
|
2
2
|
import { Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
4
|
/**
|
|
@@ -20,17 +20,12 @@ export interface ArchiverDataStore {
|
|
|
20
20
|
*/
|
|
21
21
|
getL2Blocks(from: number, take: number): Promise<L2Block[]>;
|
|
22
22
|
/**
|
|
23
|
-
* Append new
|
|
24
|
-
* @param data - The
|
|
23
|
+
* Append new logs to the store's list.
|
|
24
|
+
* @param data - The logs to be added to the store.
|
|
25
|
+
* @param logType - The type of the logs to be added to the store.
|
|
25
26
|
* @returns True if the operation is successful.
|
|
26
27
|
*/
|
|
27
|
-
|
|
28
|
-
/**
|
|
29
|
-
* Append new unencrypted logs to the store's list.
|
|
30
|
-
* @param data - The unencrypted logs to be added to the store.
|
|
31
|
-
* @returns True if the operation is successful.
|
|
32
|
-
*/
|
|
33
|
-
addUnencryptedLogs(data: L2BlockL2Logs[]): Promise<boolean>;
|
|
28
|
+
addLogs(data: L2BlockL2Logs[], logType: LogType): Promise<boolean>;
|
|
34
29
|
/**
|
|
35
30
|
* Append new pending L1 to L2 messages to the store.
|
|
36
31
|
* @param messages - The L1 to L2 messages to be added to the store.
|
|
@@ -63,19 +58,13 @@ export interface ArchiverDataStore {
|
|
|
63
58
|
*/
|
|
64
59
|
getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
|
|
65
60
|
/**
|
|
66
|
-
* Gets the `take` amount of
|
|
67
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
68
|
-
* @param take - The number of
|
|
69
|
-
* @
|
|
61
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
62
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
63
|
+
* @param take - The number of logs to return.
|
|
64
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
65
|
+
* @returns The requested logs.
|
|
70
66
|
*/
|
|
71
|
-
|
|
72
|
-
/**
|
|
73
|
-
* Gets the `take` amount of unencrypted logs starting from `from`.
|
|
74
|
-
* @param from - Number of the L2 block to which corresponds the first `unencryptedLogs` to be returned.
|
|
75
|
-
* @param take - The number of unencrypted logs to return.
|
|
76
|
-
* @returns The requested unencrypted logs.
|
|
77
|
-
*/
|
|
78
|
-
getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
|
|
67
|
+
getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
|
|
79
68
|
/**
|
|
80
69
|
* Store new Contract Public Data from an L2 block to the store's list.
|
|
81
70
|
* @param data - List of contracts' data to be added.
|
|
@@ -159,17 +148,12 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
159
148
|
*/
|
|
160
149
|
addL2Blocks(blocks: L2Block[]): Promise<boolean>;
|
|
161
150
|
/**
|
|
162
|
-
* Append new
|
|
163
|
-
* @param data - The
|
|
164
|
-
* @
|
|
165
|
-
|
|
166
|
-
addEncryptedLogs(data: L2BlockL2Logs[]): Promise<boolean>;
|
|
167
|
-
/**
|
|
168
|
-
* Append new unencrypted logs data to the store's list.
|
|
169
|
-
* @param data - The unencrypted logs to be added to the store.
|
|
170
|
-
* @returns True if the operation is successful (always in this implementation).
|
|
151
|
+
* Append new logs to the store's list.
|
|
152
|
+
* @param data - The logs to be added to the store.
|
|
153
|
+
* @param logType - The type of the logs to be added to the store.
|
|
154
|
+
* @returns True if the operation is successful.
|
|
171
155
|
*/
|
|
172
|
-
|
|
156
|
+
addLogs(data: L2BlockL2Logs[], logType: LogType): Promise<boolean>;
|
|
173
157
|
/**
|
|
174
158
|
* Append new pending L1 to L2 messages to the store.
|
|
175
159
|
* @param messages - The L1 to L2 messages to be added to the store.
|
|
@@ -216,19 +200,13 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
216
200
|
*/
|
|
217
201
|
getConfirmedL1ToL2Message(messageKey: Fr): Promise<L1ToL2Message>;
|
|
218
202
|
/**
|
|
219
|
-
* Gets the `take` amount of
|
|
220
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
221
|
-
* @param take - The number of
|
|
222
|
-
* @
|
|
223
|
-
|
|
224
|
-
getEncryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
|
|
225
|
-
/**
|
|
226
|
-
* Gets the 'take' amount of unencrypted logs starting from 'from'.
|
|
227
|
-
* @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
|
|
228
|
-
* @param take - The number of unencrypted logs to return.
|
|
229
|
-
* @returns The requested unencrypted logs.
|
|
203
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
204
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
205
|
+
* @param take - The number of logs to return.
|
|
206
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
207
|
+
* @returns The requested logs.
|
|
230
208
|
*/
|
|
231
|
-
|
|
209
|
+
getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
|
|
232
210
|
/**
|
|
233
211
|
* Lookup the L2 contract data for a contract address.
|
|
234
212
|
* @param contractAddress - The contract data address.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,OAAO,EAEP,YAAY,EACZ,aAAa,EACb,aAAa,
|
|
1
|
+
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { INITIAL_L2_BLOCK_NUM, } from '@aztec/types';
|
|
1
|
+
import { INITIAL_L2_BLOCK_NUM, LogType, } from '@aztec/types';
|
|
2
2
|
import { NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP } from '@aztec/circuits.js';
|
|
3
3
|
import { L1ToL2MessageStore, PendingL1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
4
4
|
/**
|
|
@@ -44,21 +44,13 @@ export class MemoryArchiverStore {
|
|
|
44
44
|
return Promise.resolve(true);
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
47
|
-
* Append new
|
|
48
|
-
* @param data - The
|
|
49
|
-
* @
|
|
50
|
-
|
|
51
|
-
addEncryptedLogs(data) {
|
|
52
|
-
this.encryptedLogs.push(...data);
|
|
53
|
-
return Promise.resolve(true);
|
|
54
|
-
}
|
|
55
|
-
/**
|
|
56
|
-
* Append new unencrypted logs data to the store's list.
|
|
57
|
-
* @param data - The unencrypted logs to be added to the store.
|
|
58
|
-
* @returns True if the operation is successful (always in this implementation).
|
|
47
|
+
* Append new logs to the store's list.
|
|
48
|
+
* @param data - The logs to be added to the store.
|
|
49
|
+
* @param logType - The type of the logs to be added to the store.
|
|
50
|
+
* @returns True if the operation is successful.
|
|
59
51
|
*/
|
|
60
|
-
|
|
61
|
-
this.unencryptedLogs.push(...data);
|
|
52
|
+
addLogs(data, logType) {
|
|
53
|
+
logType === LogType.ENCRYPTED ? this.encryptedLogs.push(...data) : this.unencryptedLogs.push(...data);
|
|
62
54
|
return Promise.resolve(true);
|
|
63
55
|
}
|
|
64
56
|
/**
|
|
@@ -149,38 +141,23 @@ export class MemoryArchiverStore {
|
|
|
149
141
|
return Promise.resolve(message);
|
|
150
142
|
}
|
|
151
143
|
/**
|
|
152
|
-
* Gets the `take` amount of
|
|
153
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
154
|
-
* @param take - The number of
|
|
155
|
-
* @
|
|
156
|
-
|
|
157
|
-
getEncryptedLogs(from, take) {
|
|
158
|
-
if (from < INITIAL_L2_BLOCK_NUM) {
|
|
159
|
-
throw new Error(`Invalid block range ${from}`);
|
|
160
|
-
}
|
|
161
|
-
if (from > this.encryptedLogs.length) {
|
|
162
|
-
return Promise.resolve([]);
|
|
163
|
-
}
|
|
164
|
-
const startIndex = from - INITIAL_L2_BLOCK_NUM;
|
|
165
|
-
const endIndex = from + take;
|
|
166
|
-
return Promise.resolve(this.encryptedLogs.slice(startIndex, endIndex));
|
|
167
|
-
}
|
|
168
|
-
/**
|
|
169
|
-
* Gets the 'take' amount of unencrypted logs starting from 'from'.
|
|
170
|
-
* @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
|
|
171
|
-
* @param take - The number of unencrypted logs to return.
|
|
172
|
-
* @returns The requested unencrypted logs.
|
|
144
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
145
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
146
|
+
* @param take - The number of logs to return.
|
|
147
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
148
|
+
* @returns The requested logs.
|
|
173
149
|
*/
|
|
174
|
-
|
|
150
|
+
getLogs(from, take, logType) {
|
|
175
151
|
if (from < INITIAL_L2_BLOCK_NUM) {
|
|
176
152
|
throw new Error(`Invalid block range ${from}`);
|
|
177
153
|
}
|
|
178
|
-
|
|
154
|
+
const logs = logType === LogType.ENCRYPTED ? this.encryptedLogs : this.unencryptedLogs;
|
|
155
|
+
if (from > logs.length) {
|
|
179
156
|
return Promise.resolve([]);
|
|
180
157
|
}
|
|
181
158
|
const startIndex = from - INITIAL_L2_BLOCK_NUM;
|
|
182
159
|
const endIndex = from + take;
|
|
183
|
-
return Promise.resolve(
|
|
160
|
+
return Promise.resolve(logs.slice(startIndex, endIndex));
|
|
184
161
|
}
|
|
185
162
|
/**
|
|
186
163
|
* Lookup the L2 contract data for a contract address.
|
|
@@ -256,4 +233,4 @@ export class MemoryArchiverStore {
|
|
|
256
233
|
return this.l2Blocks.length;
|
|
257
234
|
}
|
|
258
235
|
}
|
|
259
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXJjaGl2ZXIvYXJjaGl2ZXJfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLG9CQUFvQixFQUlwQixPQUFPLEdBQ1IsTUFBTSxjQUFjLENBQUM7QUFDdEIsT0FBTyxFQUFNLG1DQUFtQyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFN0UsT0FBTyxFQUFFLGtCQUFrQixFQUFFLHlCQUF5QixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUE4SDVGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQWtDOUI7UUFqQ0E7O1dBRUc7UUFDSyxhQUFRLEdBQWMsRUFBRSxDQUFDO1FBRWpDOzs7V0FHRztRQUNLLGtCQUFhLEdBQW9CLEVBQUUsQ0FBQztRQUU1Qzs7O1dBR0c7UUFDSyxvQkFBZSxHQUFvQixFQUFFLENBQUM7UUFFOUM7O1dBRUc7UUFDSyx1QkFBa0IsR0FBeUMsRUFBRSxDQUFDO1FBRXRFOzs7V0FHRztRQUNLLDRCQUF1QixHQUF1QixJQUFJLGtCQUFrQixFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSywwQkFBcUIsR0FBOEIsSUFBSSx5QkFBeUIsRUFBRSxDQUFDO0lBRTVFLENBQUM7SUFFaEI7Ozs7T0FJRztJQUNJLFdBQVcsQ0FBQyxNQUFpQjtRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxPQUFPLENBQUMsSUFBcUIsRUFBRSxPQUFnQjtRQUM3QyxPQUFPLEtBQUssT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMs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
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "0.1.0-
|
|
3
|
+
"version": "0.1.0-alpha21",
|
|
4
4
|
"exports": "./dest/index.js",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
7
|
-
"@aztec/ethereum": "0.1.0-
|
|
8
|
-
"@aztec/foundation": "0.1.0-
|
|
9
|
-
"@aztec/l1-artifacts": "0.1.0-
|
|
10
|
-
"@aztec/types": "0.1.0-
|
|
7
|
+
"@aztec/ethereum": "0.1.0-alpha21",
|
|
8
|
+
"@aztec/foundation": "0.1.0-alpha21",
|
|
9
|
+
"@aztec/l1-artifacts": "0.1.0-alpha21",
|
|
10
|
+
"@aztec/types": "0.1.0-alpha21",
|
|
11
11
|
"@types/lodash.omit": "^4.5.7",
|
|
12
12
|
"debug": "^4.3.4",
|
|
13
13
|
"lodash.omit": "^4.5.0",
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { InboxAbi, RollupAbi, ContractDeploymentEmitterAbi } from '@aztec/l1-artifacts';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
ContractData,
|
|
4
|
+
ContractPublicData,
|
|
5
|
+
EncodedContractFunction,
|
|
6
|
+
L2Block,
|
|
7
|
+
L2BlockL2Logs,
|
|
8
|
+
LogType,
|
|
9
|
+
} from '@aztec/types';
|
|
3
10
|
import { MockProxy, mock } from 'jest-mock-extended';
|
|
4
11
|
import { Chain, HttpTransport, Log, PublicClient, Transaction, encodeFunctionData, toHex } from 'viem';
|
|
5
12
|
import { Archiver } from './archiver.js';
|
|
@@ -104,7 +111,7 @@ describe('Archiver', () => {
|
|
|
104
111
|
expect(expectedPendingMessageKeys).toEqual(actualPendingMessageKeys);
|
|
105
112
|
|
|
106
113
|
// Expect logs to correspond to what is set by L2Block.random(...)
|
|
107
|
-
const encryptedLogs = await archiver.
|
|
114
|
+
const encryptedLogs = await archiver.getLogs(1, 100, LogType.ENCRYPTED);
|
|
108
115
|
expect(encryptedLogs.length).toEqual(blockNums.length);
|
|
109
116
|
|
|
110
117
|
for (const [index, x] of blockNums.entries()) {
|
|
@@ -113,7 +120,7 @@ describe('Archiver', () => {
|
|
|
113
120
|
expect(totalNumEncryptedLogs).toEqual(expectedTotalNumEncryptedLogs);
|
|
114
121
|
}
|
|
115
122
|
|
|
116
|
-
const unencryptedLogs = await archiver.
|
|
123
|
+
const unencryptedLogs = await archiver.getLogs(1, 100, LogType.UNENCRYPTED);
|
|
117
124
|
expect(unencryptedLogs.length).toEqual(blockNums.length);
|
|
118
125
|
|
|
119
126
|
blockNums.forEach((x, index) => {
|
package/src/archiver/archiver.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
|
|
|
3
3
|
import { RunningPromise } from '@aztec/foundation/running-promise';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
5
5
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
6
|
-
import { INITIAL_L2_BLOCK_NUM, L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs } from '@aztec/types';
|
|
6
|
+
import { INITIAL_L2_BLOCK_NUM, L1ToL2Message, L1ToL2MessageSource, L2BlockL2Logs, LogType } from '@aztec/types';
|
|
7
7
|
import {
|
|
8
8
|
ContractData,
|
|
9
9
|
ContractPublicData,
|
|
@@ -204,13 +204,13 @@ export class Archiver implements L2BlockSource, L2LogsSource, ContractDataSource
|
|
|
204
204
|
const encryptedLogs = retrievedBlocks.retrievedData.map(block => {
|
|
205
205
|
return block.newEncryptedLogs!;
|
|
206
206
|
});
|
|
207
|
-
await this.store.
|
|
207
|
+
await this.store.addLogs(encryptedLogs, LogType.ENCRYPTED);
|
|
208
208
|
|
|
209
209
|
// store unencrypted logs from L2 Blocks that we have retrieved
|
|
210
210
|
const unencryptedLogs = retrievedBlocks.retrievedData.map(block => {
|
|
211
211
|
return block.newUnencryptedLogs!;
|
|
212
212
|
});
|
|
213
|
-
await this.store.
|
|
213
|
+
await this.store.addLogs(unencryptedLogs, LogType.UNENCRYPTED);
|
|
214
214
|
|
|
215
215
|
// store contracts for which we have retrieved L2 blocks
|
|
216
216
|
const lastKnownL2BlockNum = retrievedBlocks.retrievedData[retrievedBlocks.retrievedData.length - 1].number;
|
|
@@ -316,23 +316,14 @@ export class Archiver implements L2BlockSource, L2LogsSource, ContractDataSource
|
|
|
316
316
|
}
|
|
317
317
|
|
|
318
318
|
/**
|
|
319
|
-
* Gets the `take` amount of
|
|
320
|
-
* @param from - Number of the L2 block to which corresponds the first
|
|
321
|
-
* @param take - The number of
|
|
322
|
-
* @
|
|
319
|
+
* Gets the `take` amount of logs starting from `from`.
|
|
320
|
+
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
321
|
+
* @param take - The number of logs to return.
|
|
322
|
+
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
323
|
+
* @returns The requested logs.
|
|
323
324
|
*/
|
|
324
|
-
public
|
|
325
|
-
return this.store.
|
|
326
|
-
}
|
|
327
|
-
|
|
328
|
-
/**
|
|
329
|
-
* Gets the `take` amount of unencrypted logs starting from `from`.
|
|
330
|
-
* @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
|
|
331
|
-
* @param take - The number of unencrypted logs to return.
|
|
332
|
-
* @returns The requested unencrypted logs.
|
|
333
|
-
*/
|
|
334
|
-
public getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]> {
|
|
335
|
-
return this.store.getUnencryptedLogs(from, take);
|
|
325
|
+
public getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]> {
|
|
326
|
+
return this.store.getLogs(from, take, logType);
|
|
336
327
|
}
|
|
337
328
|
|
|
338
329
|
/**
|