@aztec/archiver 0.31.0 → 0.32.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 +3 -3
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +4 -5
- package/dest/archiver/archiver_store.d.ts +3 -3
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.d.ts.map +1 -1
- package/dest/archiver/archiver_store_test_suite.js +4 -4
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +3 -3
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +1 -1
- package/dest/archiver/kv_archiver_store/log_store.d.ts +3 -3
- package/dest/archiver/kv_archiver_store/log_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/log_store.js +7 -5
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +3 -3
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts.map +1 -1
- package/dest/archiver/memory_archiver_store/memory_archiver_store.js +4 -4
- package/dest/rpc/archiver_client.d.ts.map +1 -1
- package/dest/rpc/archiver_client.js +4 -3
- package/dest/rpc/archiver_server.d.ts.map +1 -1
- package/dest/rpc/archiver_server.js +4 -3
- package/package.json +9 -9
- package/src/archiver/archiver.ts +8 -4
- package/src/archiver/archiver_store.ts +10 -3
- package/src/archiver/archiver_store_test_suite.ts +5 -7
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +10 -3
- package/src/archiver/kv_archiver_store/log_store.ts +23 -10
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +19 -7
- package/src/rpc/archiver_client.ts +5 -3
- package/src/rpc/archiver_server.ts +4 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetUnencryptedLogsResponse, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
1
|
+
import { FromLogType, GetUnencryptedLogsResponse, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
2
|
import { FunctionSelector } from '@aztec/circuits.js';
|
|
3
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
@@ -55,7 +55,7 @@ export declare class Archiver implements ArchiveSource {
|
|
|
55
55
|
*/
|
|
56
56
|
start(blockUntilSynced: boolean): Promise<void>;
|
|
57
57
|
/**
|
|
58
|
-
* Fetches
|
|
58
|
+
* Fetches logs from L1 contracts and processes them.
|
|
59
59
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
60
60
|
*/
|
|
61
61
|
private sync;
|
|
@@ -106,7 +106,7 @@ export declare class Archiver implements ArchiveSource {
|
|
|
106
106
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
107
107
|
* @returns The requested logs.
|
|
108
108
|
*/
|
|
109
|
-
getLogs(from: number, limit: number, logType:
|
|
109
|
+
getLogs<TLogType extends LogType>(from: number, limit: number, logType: TLogType): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]>;
|
|
110
110
|
/**
|
|
111
111
|
* Gets unencrypted logs based on the provided filter.
|
|
112
112
|
* @param filter - The filter to apply to the logs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,OAAO,EACP,aAAa,EACb,aAAa,EACb,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,EAEV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAgC,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AASpF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAqB,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,2BAA2B,EAE3B,cAAc,EAEf,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAA4B,MAAM,MAAM,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAQ7C;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,CAAC;AAEpG;;;;GAIG;AACH,qBAAa,QAAS,YAAW,aAAa;IAiB1C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,GAAG;IAvBtB;;OAEG;IACH,OAAO,CAAC,cAAc,CAAC,CAAiB;IAExC;;;;;;;;;OASG;gBAEgB,YAAY,EAAE,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,EAChD,aAAa,EAAE,UAAU,EACzB,yBAAyB,EAAE,UAAU,EACrC,YAAY,EAAE,UAAU,EACxB,eAAe,EAAE,UAAU,EAC3B,KAAK,EAAE,iBAAiB,EACxB,iBAAiB,SAAS,EAC1B,GAAG,GAAE,WAAiD;IAGzE;;;;;;OAMG;WACiB,aAAa,CAC/B,MAAM,EAAE,cAAc,EACtB,aAAa,EAAE,iBAAiB,EAChC,gBAAgB,UAAO,GACtB,OAAO,CAAC,QAAQ,CAAC;IAqBpB;;;OAGG;IACU,KAAK,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D;;;OAGG;YACW,IAAI;
|
|
1
|
+
{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { L2Block,
|
|
1
|
+
import { L2Block, } from '@aztec/circuit-types';
|
|
2
2
|
import { ContractClassRegisteredEvent } from '@aztec/circuits.js';
|
|
3
3
|
import { ContractInstanceDeployedEvent, PrivateFunctionBroadcastedEvent, UnconstrainedFunctionBroadcastedEvent, isValidPrivateFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof, } from '@aztec/circuits.js/contract';
|
|
4
4
|
import { createEthereumChain } from '@aztec/ethereum';
|
|
@@ -69,7 +69,7 @@ export class Archiver {
|
|
|
69
69
|
this.runningPromise.start();
|
|
70
70
|
}
|
|
71
71
|
/**
|
|
72
|
-
* Fetches
|
|
72
|
+
* Fetches logs from L1 contracts and processes them.
|
|
73
73
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
74
74
|
*/
|
|
75
75
|
async sync(blockUntilSynced) {
|
|
@@ -153,8 +153,7 @@ export class Archiver {
|
|
|
153
153
|
await Promise.all(retrievedBlocks.retrievedData.map(async (block) => {
|
|
154
154
|
const blockLogs = block.body.txEffects
|
|
155
155
|
.flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
|
|
156
|
-
.flatMap(txLog => txLog.unrollLogs())
|
|
157
|
-
.map(log => UnencryptedL2Log.fromBuffer(log));
|
|
156
|
+
.flatMap(txLog => txLog.unrollLogs());
|
|
158
157
|
await this.storeRegisteredContractClasses(blockLogs, block.number);
|
|
159
158
|
await this.storeDeployedContractInstances(blockLogs, block.number);
|
|
160
159
|
await this.storeBroadcastedIndividualFunctions(blockLogs, block.number);
|
|
@@ -325,4 +324,4 @@ export class Archiver {
|
|
|
325
324
|
return this.store.getContractClassIds();
|
|
326
325
|
}
|
|
327
326
|
}
|
|
328
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"archiver.js","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
|
|
327
|
+
//# 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
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { Body, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
|
+
import { Body, EncryptedL2BlockL2Logs, FromLogType, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types';
|
|
3
3
|
import { Fr } from '@aztec/circuits.js';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { ContractClassPublic, ContractInstanceWithAddress, ExecutablePrivateFunctionWithMembershipProof, UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts';
|
|
@@ -63,7 +63,7 @@ export interface ArchiverDataStore {
|
|
|
63
63
|
* @param blockNumber - The block for which to add the logs.
|
|
64
64
|
* @returns True if the operation is successful.
|
|
65
65
|
*/
|
|
66
|
-
addLogs(encryptedLogs:
|
|
66
|
+
addLogs(encryptedLogs: EncryptedL2BlockL2Logs | undefined, unencryptedLogs: UnencryptedL2BlockL2Logs | undefined, blockNumber: number): Promise<boolean>;
|
|
67
67
|
/**
|
|
68
68
|
* Append L1 to L2 messages to the store.
|
|
69
69
|
* @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
|
|
@@ -90,7 +90,7 @@ export interface ArchiverDataStore {
|
|
|
90
90
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
91
91
|
* @returns The requested logs.
|
|
92
92
|
*/
|
|
93
|
-
getLogs(from: number, limit: number, logType:
|
|
93
|
+
getLogs<TLogType extends LogType>(from: number, limit: number, logType: TLogType): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]>;
|
|
94
94
|
/**
|
|
95
95
|
* Gets unencrypted logs based on the provided filter.
|
|
96
96
|
* @param filter - The filter to apply to the logs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,EACJ,0BAA0B,EAC1B,SAAS,EACT,OAAO,EACP,aAAa,EACb,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,
|
|
1
|
+
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,EACJ,sBAAsB,EACtB,WAAW,EACX,0BAA0B,EAC1B,SAAS,EACT,OAAO,EACP,aAAa,EACb,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,EACT,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,4CAA4C,EAC5C,wCAAwC,EACzC,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,8DAA8D;IAC9D,eAAe,EAAE,MAAM,CAAC;IACxB,+EAA+E;IAC/E,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE5D;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAE5D;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAE3D;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC;IAE3D;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IAEpE;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,sBAAsB,GAAG,SAAS,EACjD,eAAe,EAAE,wBAAwB,GAAG,SAAS,EACrD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAExE;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE1F;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,SAAS,OAAO,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnD;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAE3E;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvF;;;OAGG;IACH,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAEnE;;;;;OAKG;IACH,oBAAoB,CAAC,IAAI,EAAE,2BAA2B,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEjG;;OAEG;IACH,YAAY,CACV,eAAe,EAAE,EAAE,EACnB,gBAAgB,EAAE,4CAA4C,EAAE,EAChE,sBAAsB,EAAE,wCAAwC,EAAE,GACjE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;OAGG;IACH,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAC;IAE7F,+DAA+D;IAC/D,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;CACtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AACA,OAAO,2BAA2B,CAAC;AAWnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"archiver_store_test_suite.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store_test_suite.ts"],"names":[],"mappings":"AACA,OAAO,2BAA2B,CAAC;AAWnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,QA6d5F"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { InboxLeaf, L2Block, L2BlockContext, LogId, LogType, TxHash
|
|
1
|
+
import { InboxLeaf, L2Block, L2BlockContext, LogId, LogType, TxHash } from '@aztec/circuit-types';
|
|
2
2
|
import '@aztec/circuit-types/jest';
|
|
3
3
|
import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
|
|
4
4
|
import { makeContractClassPublic, makeExecutablePrivateFunctionWithMembershipProof, makeUnconstrainedFunctionWithMembershipProof, } from '@aztec/circuits.js/testing';
|
|
@@ -276,7 +276,7 @@ export function describeArchiverDataStore(testName, getStore) {
|
|
|
276
276
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
277
277
|
const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
|
|
278
278
|
const targetLogIndex = randomInt(numUnencryptedLogs);
|
|
279
|
-
const targetContractAddress =
|
|
279
|
+
const targetContractAddress = blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[targetFunctionLogIndex].logs[targetLogIndex].contractAddress;
|
|
280
280
|
const response = await store.getUnencryptedLogs({ contractAddress: targetContractAddress });
|
|
281
281
|
expect(response.maxLogsHit).toBeFalsy();
|
|
282
282
|
for (const extendedLog of response.logs) {
|
|
@@ -289,7 +289,7 @@ export function describeArchiverDataStore(testName, getStore) {
|
|
|
289
289
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
290
290
|
const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
|
|
291
291
|
const targetLogIndex = randomInt(numUnencryptedLogs);
|
|
292
|
-
const targetSelector =
|
|
292
|
+
const targetSelector = blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[targetFunctionLogIndex].logs[targetLogIndex].selector;
|
|
293
293
|
const response = await store.getUnencryptedLogs({ selector: targetSelector });
|
|
294
294
|
expect(response.maxLogsHit).toBeFalsy();
|
|
295
295
|
for (const extendedLog of response.logs) {
|
|
@@ -371,4 +371,4 @@ export function describeArchiverDataStore(testName, getStore) {
|
|
|
371
371
|
});
|
|
372
372
|
});
|
|
373
373
|
}
|
|
374
|
-
//# 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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"}
|
|
374
|
+
//# 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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { Body, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
|
+
import { Body, EncryptedL2BlockL2Logs, FromLogType, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types';
|
|
3
3
|
import { Fr } from '@aztec/circuits.js';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { AztecKVStore } from '@aztec/kv-store';
|
|
@@ -64,7 +64,7 @@ export declare class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
64
64
|
* @param blockNumber - The block for which to add the logs.
|
|
65
65
|
* @returns True if the operation is successful.
|
|
66
66
|
*/
|
|
67
|
-
addLogs(encryptedLogs:
|
|
67
|
+
addLogs(encryptedLogs: EncryptedL2BlockL2Logs | undefined, unencryptedLogs: UnencryptedL2BlockL2Logs | undefined, blockNumber: number): Promise<boolean>;
|
|
68
68
|
/**
|
|
69
69
|
* Append L1 to L2 messages to the store.
|
|
70
70
|
* @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
|
|
@@ -91,7 +91,7 @@ export declare class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
91
91
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
92
92
|
* @returns The requested logs.
|
|
93
93
|
*/
|
|
94
|
-
getLogs(start: number, limit: number, logType:
|
|
94
|
+
getLogs<TLogType extends LogType>(start: number, limit: number, logType: TLogType): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]>;
|
|
95
95
|
/**
|
|
96
96
|
* Gets unencrypted logs based on the provided filter.
|
|
97
97
|
* @param filter - The filter to apply to the logs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,EACJ,0BAA0B,EAC1B,SAAS,EACT,OAAO,EACP,aAAa,EACb,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,
|
|
1
|
+
{"version":3,"file":"kv_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,EACJ,sBAAsB,EACtB,WAAW,EACX,0BAA0B,EAC1B,SAAS,EACT,OAAO,EACP,aAAa,EACb,SAAS,EACT,OAAO,EACP,QAAQ,EACR,MAAM,EACN,SAAS,EACT,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,4CAA4C,EAC5C,wCAAwC,EACzC,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAQrD;;GAEG;AACH,qBAAa,mBAAoB,YAAW,iBAAiB;;gBAU/C,EAAE,EAAE,YAAY,EAAE,eAAe,GAAE,MAAa;IAS5D,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAIlE,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAItF,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7F,YAAY,CACV,eAAe,EAAE,EAAE,EACnB,gBAAgB,EAAE,4CAA4C,EAAE,EAChE,sBAAsB,EAAE,wCAAwC,EAAE,GACjE,OAAO,CAAC,OAAO,CAAC;IAIb,oBAAoB,CAAC,IAAI,EAAE,2BAA2B,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvG;;;;OAIG;IACH,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrD;;;;;OAKG;IACH,cAAc,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAI3D;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAI3D;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAS3D;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAI1D;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAInE;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,sBAAsB,GAAG,SAAS,EACjD,eAAe,EAAE,wBAAwB,GAAG,SAAS,EACrD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAInB;;;;OAIG;IACH,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvE;;;;;OAKG;IACH,qBAAqB,CAAC,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIzF;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;IAQrD;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,SAAS,OAAO,EAC9B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;IAQlD;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAQ1E;;;OAGG;IACH,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1C;;OAEG;IACH,aAAa,IAAI,OAAO,CAAC,oBAAoB,CAAC;CAM/C"}
|
|
@@ -187,4 +187,4 @@ export class KVArchiverDataStore {
|
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
_KVArchiverDataStore_blockStore = new WeakMap(), _KVArchiverDataStore_blockBodyStore = new WeakMap(), _KVArchiverDataStore_logStore = new WeakMap(), _KVArchiverDataStore_messageStore = new WeakMap(), _KVArchiverDataStore_contractClassStore = new WeakMap(), _KVArchiverDataStore_contractInstanceStore = new WeakMap(), _KVArchiverDataStore_log = new WeakMap();
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia3ZfYXJjaGl2ZXJfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUva3ZfYXJjaGl2ZXJfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFpQkEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFXMUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUMvRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDMUMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLG1CQUFtQjtJQVU5QixZQUFZLEVBQWdCLEVBQUUsa0JBQTBCLElBQUk7UUFUNUQsa0RBQXdCO1FBQ3hCLHNEQUFnQztRQUNoQyxnREFBb0I7UUFDcEIsb0RBQTRCO1FBQzVCLDBEQUF3QztRQUN4Qyw2REFBOEM7UUFFOUMsbUNBQU8saUJBQWlCLENBQUMsMkJBQTJCLENBQUMsRUFBQztRQUdwRCx1QkFBQSxJQUFJLHVDQUFtQixJQUFJLGNBQWMsQ0FBQyxFQUFFLENBQUMsTUFBQSxDQUFDO1FBQzlDLHVCQUFBLElBQUksbUNBQWUsSUFBSSxVQUFVLENBQUMsRUFBRSxFQUFFLHVCQUFBLElBQUksMkNBQWdCLENBQUMsTUFBQSxDQUFDO1FBQzVELHVCQUFBLElBQUksaUNBQWEsSUFBSSxRQUFRLENBQUMsRUFBRSxFQUFFLHVCQUFBLElBQUksdUNBQVksRUFBRSxlQUFlLENBQUMsTUFBQSxDQUFDO1FBQ3JFLHVCQUFBLElBQUks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
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetUnencryptedLogsResponse, L2BlockL2Logs, LogFilter, LogType } from '@aztec/circuit-types';
|
|
1
|
+
import { EncryptedL2BlockL2Logs, FromLogType, GetUnencryptedLogsResponse, L2BlockL2Logs, LogFilter, LogType, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types';
|
|
2
2
|
import { AztecKVStore } from '@aztec/kv-store';
|
|
3
3
|
import { BlockStore } from './block_store.js';
|
|
4
4
|
/**
|
|
@@ -16,7 +16,7 @@ export declare class LogStore {
|
|
|
16
16
|
* @param blockNumber - The block for which to add the logs.
|
|
17
17
|
* @returns True if the operation is successful.
|
|
18
18
|
*/
|
|
19
|
-
addLogs(encryptedLogs:
|
|
19
|
+
addLogs(encryptedLogs: EncryptedL2BlockL2Logs | undefined, unencryptedLogs: UnencryptedL2BlockL2Logs | undefined, blockNumber: number): Promise<boolean>;
|
|
20
20
|
/**
|
|
21
21
|
* Gets up to `limit` amount of logs starting from `from`.
|
|
22
22
|
* @param start - Number of the L2 block to which corresponds the first logs to be returned.
|
|
@@ -24,7 +24,7 @@ export declare class LogStore {
|
|
|
24
24
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
25
25
|
* @returns The requested logs.
|
|
26
26
|
*/
|
|
27
|
-
getLogs(start: number, limit: number, logType:
|
|
27
|
+
getLogs<TLogType extends LogType>(start: number, limit: number, logType: TLogType): IterableIterator<L2BlockL2Logs<FromLogType<TLogType>>>;
|
|
28
28
|
/**
|
|
29
29
|
* Gets unencrypted logs based on the provided filter.
|
|
30
30
|
* @param filter - The filter to apply to the logs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/log_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,WAAW,EACX,0BAA0B,EAC1B,aAAa,EACb,SAAS,EAET,OAAO,EACP,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;GAEG;AACH,qBAAa,QAAQ;;IAMP,OAAO,CAAC,EAAE;IAAgB,OAAO,CAAC,UAAU;gBAApC,EAAE,EAAE,YAAY,EAAU,UAAU,EAAE,UAAU,EAAE,eAAe,GAAE,MAAa;IAOpG;;;;;;OAMG;IACH,OAAO,CACL,aAAa,EAAE,sBAAsB,GAAG,SAAS,EACjD,eAAe,EAAE,wBAAwB,GAAG,SAAS,EACrD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC;IAcnB;;;;;;OAMG;IACF,OAAO,CAAC,QAAQ,SAAS,OAAO,EAC/B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,QAAQ,GAChB,gBAAgB,CAAC,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IAQzD;;;;OAIG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,0BAA0B;CAuGlE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var _LogStore_instances, _LogStore_encryptedLogs, _LogStore_unencryptedLogs, _LogStore_logsMaxPageSize, _LogStore_log, _LogStore_filterUnencryptedLogsOfTx, _LogStore_filterUnencryptedLogsBetweenBlocks, _LogStore_accumulateLogs, _LogStore_getBlockLogs;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import {
|
|
3
|
+
import { EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, LogId, LogType, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
4
4
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
|
|
5
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
6
6
|
/**
|
|
@@ -46,6 +46,7 @@ export class LogStore {
|
|
|
46
46
|
*/
|
|
47
47
|
*getLogs(start, limit, logType) {
|
|
48
48
|
const logMap = logType === LogType.ENCRYPTED ? __classPrivateFieldGet(this, _LogStore_encryptedLogs, "f") : __classPrivateFieldGet(this, _LogStore_unencryptedLogs, "f");
|
|
49
|
+
const L2BlockL2Logs = logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
|
|
49
50
|
for (const buffer of logMap.values({ start, limit })) {
|
|
50
51
|
yield L2BlockL2Logs.fromBuffer(buffer);
|
|
51
52
|
}
|
|
@@ -76,7 +77,7 @@ _LogStore_encryptedLogs = new WeakMap(), _LogStore_unencryptedLogs = new WeakMap
|
|
|
76
77
|
return { logs: [], maxLogsHit: false };
|
|
77
78
|
}
|
|
78
79
|
const unencryptedLogsInBlock = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_getBlockLogs).call(this, blockNumber, LogType.UNENCRYPTED);
|
|
79
|
-
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs()
|
|
80
|
+
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
80
81
|
const logs = [];
|
|
81
82
|
const maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
82
83
|
return { logs, maxLogsHit };
|
|
@@ -92,9 +93,9 @@ _LogStore_encryptedLogs = new WeakMap(), _LogStore_unencryptedLogs = new WeakMap
|
|
|
92
93
|
const logs = [];
|
|
93
94
|
let maxLogsHit = false;
|
|
94
95
|
loopOverBlocks: for (const [blockNumber, logBuffer] of __classPrivateFieldGet(this, _LogStore_unencryptedLogs, "f").entries({ start, end })) {
|
|
95
|
-
const unencryptedLogsInBlock =
|
|
96
|
+
const unencryptedLogsInBlock = UnencryptedL2BlockL2Logs.fromBuffer(logBuffer);
|
|
96
97
|
for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < unencryptedLogsInBlock.txLogs.length; txIndex++) {
|
|
97
|
-
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs()
|
|
98
|
+
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
98
99
|
maxLogsHit = __classPrivateFieldGet(this, _LogStore_instances, "m", _LogStore_accumulateLogs).call(this, logs, blockNumber, txIndex, txLogs, filter);
|
|
99
100
|
if (maxLogsHit) {
|
|
100
101
|
__classPrivateFieldGet(this, _LogStore_log, "f").call(this, `Max logs hit at block ${blockNumber}`);
|
|
@@ -123,10 +124,11 @@ _LogStore_encryptedLogs = new WeakMap(), _LogStore_unencryptedLogs = new WeakMap
|
|
|
123
124
|
return maxLogsHit;
|
|
124
125
|
}, _LogStore_getBlockLogs = function _LogStore_getBlockLogs(blockNumber, logType) {
|
|
125
126
|
const logMap = logType === LogType.ENCRYPTED ? __classPrivateFieldGet(this, _LogStore_encryptedLogs, "f") : __classPrivateFieldGet(this, _LogStore_unencryptedLogs, "f");
|
|
127
|
+
const L2BlockL2Logs = logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
|
|
126
128
|
const buffer = logMap.get(blockNumber);
|
|
127
129
|
if (!buffer) {
|
|
128
130
|
return new L2BlockL2Logs([]);
|
|
129
131
|
}
|
|
130
132
|
return L2BlockL2Logs.fromBuffer(buffer);
|
|
131
133
|
};
|
|
132
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FyY2hpdmVyL2t2X2FyY2hpdmVyX3N0b3JlL2xvZ19zdG9yZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLE9BQU8sRUFDTCxzQkFBc0IsRUFDdEIsd0JBQXdCLEVBS3hCLEtBQUssRUFDTCxPQUFPLEVBQ1Asd0JBQXdCLEdBRXpCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDcEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFLMUQ7O0dBRUc7QUFDSCxNQUFNLE9BQU8sUUFBUTtJQU1uQixZQUFvQixFQUFnQixFQUFVLFVBQXNCLEVBQUUsa0JBQTBCLElBQUk7O1FBQWhGLE9BQUUsR0FBRixFQUFFLENBQWM7UUFBVSxlQUFVLEdBQVYsVUFBVSxDQUFZO1FBTHBFLDBDQUF5QztRQUN6Qyw0Q0FBMkM7UUFDM0MsNENBQXlCO1FBQ3pCLHdCQUFPLGlCQUFpQixDQUFDLDBCQUEwQixDQUFDLEVBQUM7UUFHbkQsdUJBQUEsSUFBSSwyQkFBa0IsRUFBRSxDQUFDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxNQUFBLENBQUM7UUFDNUQsdUJBQUEsSUFBSSw2QkFBb0IsRUFBRSxDQUFDLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxNQUFBLENBQUM7UUFFaEUsdUJBQUEsSUFBSSw2QkFBb0IsZUFBZSxNQUFBLENBQUM7SUFDMUMsQ0FBQztJQUVEOzs7Ozs7T0FNRztJQUNILE9BQU8sQ0FDTCxhQUFpRCxFQUNqRCxlQUFxRCxFQUNyRCxXQUFtQjtRQUVuQixPQUFPLElBQUksQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRTtZQUM5QixJQUFJLGFBQWEsRUFBRSxDQUFDO2dCQUNsQixLQUFLLHVCQUFBLElBQUksK0JBQWUsQ0FBQyxHQUFHLENBQUMsV0FB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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { Body, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
|
+
import { Body, EncryptedL2BlockL2Logs, FromLogType, GetUnencryptedLogsResponse, InboxLeaf, L2Block, L2BlockL2Logs, LogFilter, LogType, TxEffect, TxHash, TxReceipt, UnencryptedL2BlockL2Logs } from '@aztec/circuit-types';
|
|
3
3
|
import { Fr } from '@aztec/circuits.js';
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { ContractClassPublic, ContractInstanceWithAddress, ExecutablePrivateFunctionWithMembershipProof, UnconstrainedFunctionWithMembershipProof } from '@aztec/types/contracts';
|
|
@@ -78,7 +78,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
78
78
|
* @param blockNumber - The block for which to add the logs.
|
|
79
79
|
* @returns True if the operation is successful.
|
|
80
80
|
*/
|
|
81
|
-
addLogs(encryptedLogs:
|
|
81
|
+
addLogs(encryptedLogs: EncryptedL2BlockL2Logs, unencryptedLogs: UnencryptedL2BlockL2Logs, blockNumber: number): Promise<boolean>;
|
|
82
82
|
/**
|
|
83
83
|
* Append L1 to L2 messages to the store.
|
|
84
84
|
* @param messages - The L1 to L2 messages to be added to the store and the last processed L1 block.
|
|
@@ -125,7 +125,7 @@ export declare class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
125
125
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
126
126
|
* @returns The requested logs.
|
|
127
127
|
*/
|
|
128
|
-
getLogs(from: number, limit: number, logType:
|
|
128
|
+
getLogs<TLogType extends LogType>(from: number, limit: number, logType: TLogType): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]>;
|
|
129
129
|
/**
|
|
130
130
|
* Gets unencrypted logs based on the provided filter.
|
|
131
131
|
* @param filter - The filter to apply to the logs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,IAAI,
|
|
1
|
+
{"version":3,"file":"memory_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExtendedUnencryptedL2Log, L2BlockContext, LogId, LogType, TxReceipt, TxStatus,
|
|
1
|
+
import { ExtendedUnencryptedL2Log, L2BlockContext, LogId, LogType, TxReceipt, TxStatus, } from '@aztec/circuit-types';
|
|
2
2
|
import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
3
3
|
import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
|
|
4
4
|
/**
|
|
@@ -220,7 +220,7 @@ export class MemoryArchiverStore {
|
|
|
220
220
|
if (from < INITIAL_L2_BLOCK_NUM || limit < 1) {
|
|
221
221
|
throw new Error(`Invalid limit: ${limit}`);
|
|
222
222
|
}
|
|
223
|
-
const logs = logType === LogType.ENCRYPTED ? this.encryptedLogsPerBlock : this.unencryptedLogsPerBlock;
|
|
223
|
+
const logs = (logType === LogType.ENCRYPTED ? this.encryptedLogsPerBlock : this.unencryptedLogsPerBlock);
|
|
224
224
|
if (from > logs.length) {
|
|
225
225
|
return Promise.resolve([]);
|
|
226
226
|
}
|
|
@@ -276,7 +276,7 @@ export class MemoryArchiverStore {
|
|
|
276
276
|
const blockContext = this.l2BlockContexts[fromBlockIndex];
|
|
277
277
|
const blockLogs = this.unencryptedLogsPerBlock[fromBlockIndex];
|
|
278
278
|
for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
|
|
279
|
-
const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs()
|
|
279
|
+
const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
|
|
280
280
|
for (; logIndexInTx < txLogs.length; logIndexInTx++) {
|
|
281
281
|
const log = txLogs[logIndexInTx];
|
|
282
282
|
if ((!txHash || blockContext.getTxHash(txIndexInBlock).equals(txHash)) &&
|
|
@@ -317,4 +317,4 @@ export class MemoryArchiverStore {
|
|
|
317
317
|
});
|
|
318
318
|
}
|
|
319
319
|
}
|
|
320
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
320
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"memory_archiver_store.js","sourceRoot":"","sources":["../../../src/archiver/memory_archiver_store/memory_archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_client.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver_client.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_client.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,eAAO,MAAM,oBAAoB,QAAS,MAAM,qGAAuC,aAenE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExtendedUnencryptedL2Log, L2Block,
|
|
1
|
+
import { EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, L2Block, NullifierMembershipWitness, TxReceipt, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
2
2
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
4
4
|
export const createArchiverClient = (url, fetch = makeFetch([1, 2, 3], true)) => createJsonRpcClient(url, {
|
|
@@ -6,6 +6,7 @@ export const createArchiverClient = (url, fetch = makeFetch([1, 2, 3], true)) =>
|
|
|
6
6
|
ExtendedUnencryptedL2Log,
|
|
7
7
|
Fr,
|
|
8
8
|
L2Block,
|
|
9
|
-
|
|
9
|
+
EncryptedL2BlockL2Logs,
|
|
10
|
+
UnencryptedL2BlockL2Logs,
|
|
10
11
|
}, { TxReceipt, NullifierMembershipWitness }, false, 'archiver', fetch);
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JwYy9hcmNoaXZlcl9jbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHNCQUFzQixFQUN0Qix3QkFBd0IsRUFDeEIsT0FBTyxFQUNQLDBCQUEwQixFQUMxQixTQUFTLEVBQ1Qsd0JBQXdCLEdBQ3pCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFJbkYsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQUcsQ0FBQyxHQUFXLEVBQUUsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLEVBQWlCLEVBQUUsQ0FDckcsbUJBQW1CLENBQ2pCLEdBQUcsRUFDSDtJQUNFLFVBQVU7SUFDVix3QkFBd0I7SUFDeEIsRUFBRTtJQUNGLE9BQU87SUFDUCxzQkFBc0I7SUFDdEIsd0JBQXdCO0NBQ3pCLEVBQ0QsRUFBRSxTQUFTLEVBQUUsMEJBQTBCLEVBQUUsRUFDekMsS0FBSyxFQUNMLFVBQVUsRUFDVixLQUFLLENBQ1csQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_server.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"archiver_server.d.ts","sourceRoot":"","sources":["../../src/rpc/archiver_server.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,QAAQ,GAAG,aAAa,CAehF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ExtendedUnencryptedL2Log, L2Block,
|
|
1
|
+
import { EncryptedL2BlockL2Logs, ExtendedUnencryptedL2Log, L2Block, NullifierMembershipWitness, TxEffect, TxReceipt, UnencryptedL2BlockL2Logs, } from '@aztec/circuit-types';
|
|
2
2
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
3
3
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
4
4
|
/**
|
|
@@ -12,8 +12,9 @@ export function createArchiverRpcServer(archiverService) {
|
|
|
12
12
|
ExtendedUnencryptedL2Log,
|
|
13
13
|
Fr,
|
|
14
14
|
L2Block,
|
|
15
|
-
|
|
15
|
+
EncryptedL2BlockL2Logs,
|
|
16
|
+
UnencryptedL2BlockL2Logs,
|
|
16
17
|
TxEffect,
|
|
17
18
|
}, { TxReceipt, NullifierMembershipWitness }, ['start', 'stop']);
|
|
18
19
|
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJjaGl2ZXJfc2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JwYy9hcmNoaXZlcl9zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHNCQUFzQixFQUN0Qix3QkFBd0IsRUFDeEIsT0FBTyxFQUNQLDBCQUEwQixFQUMxQixRQUFRLEVBQ1IsU0FBUyxFQUNULHdCQUF3QixHQUN6QixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDcEQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSWxFOzs7O0dBSUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsZUFBeUI7SUFDL0QsT0FBTyxJQUFJLGFBQWEsQ0FDdEIsZUFBZSxFQUNmO1FBQ0UsVUFBVTtRQUNWLHdCQUF3QjtRQUN4QixFQUFFO1FBQ0YsT0FBTztRQUNQLHNCQUFzQjtRQUN0Qix3QkFBd0I7UUFDeEIsUUFBUTtLQUNULEVBQ0QsRUFBRSxTQUFTLEVBQUUsMEJBQTBCLEVBQUUsRUFDekMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQ2xCLENBQUM7QUFDSixDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.32.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": "./dest/index.js",
|
|
6
6
|
"typedocOptions": {
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
"workerThreads": true
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@aztec/circuit-types": "0.
|
|
39
|
-
"@aztec/circuits.js": "0.
|
|
40
|
-
"@aztec/ethereum": "0.
|
|
41
|
-
"@aztec/foundation": "0.
|
|
42
|
-
"@aztec/kv-store": "0.
|
|
43
|
-
"@aztec/l1-artifacts": "0.
|
|
44
|
-
"@aztec/protocol-contracts": "0.
|
|
45
|
-
"@aztec/types": "0.
|
|
38
|
+
"@aztec/circuit-types": "0.32.0",
|
|
39
|
+
"@aztec/circuits.js": "0.32.0",
|
|
40
|
+
"@aztec/ethereum": "0.32.0",
|
|
41
|
+
"@aztec/foundation": "0.32.0",
|
|
42
|
+
"@aztec/kv-store": "0.32.0",
|
|
43
|
+
"@aztec/l1-artifacts": "0.32.0",
|
|
44
|
+
"@aztec/protocol-contracts": "0.32.0",
|
|
45
|
+
"@aztec/types": "0.32.0",
|
|
46
46
|
"debug": "^4.3.4",
|
|
47
47
|
"lmdb": "^2.9.2",
|
|
48
48
|
"lodash.groupby": "^4.6.0",
|
package/src/archiver/archiver.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {
|
|
2
|
+
FromLogType,
|
|
2
3
|
GetUnencryptedLogsResponse,
|
|
3
4
|
L1ToL2MessageSource,
|
|
4
5
|
L2Block,
|
|
@@ -136,7 +137,7 @@ export class Archiver implements ArchiveSource {
|
|
|
136
137
|
}
|
|
137
138
|
|
|
138
139
|
/**
|
|
139
|
-
* Fetches
|
|
140
|
+
* Fetches logs from L1 contracts and processes them.
|
|
140
141
|
* @param blockUntilSynced - If true, blocks until the archiver has fully synced.
|
|
141
142
|
*/
|
|
142
143
|
private async sync(blockUntilSynced: boolean) {
|
|
@@ -276,8 +277,7 @@ export class Archiver implements ArchiveSource {
|
|
|
276
277
|
retrievedBlocks.retrievedData.map(async block => {
|
|
277
278
|
const blockLogs = block.body.txEffects
|
|
278
279
|
.flatMap(txEffect => (txEffect ? [txEffect.unencryptedLogs] : []))
|
|
279
|
-
.flatMap(txLog => txLog.unrollLogs())
|
|
280
|
-
.map(log => UnencryptedL2Log.fromBuffer(log));
|
|
280
|
+
.flatMap(txLog => txLog.unrollLogs());
|
|
281
281
|
await this.storeRegisteredContractClasses(blockLogs, block.number);
|
|
282
282
|
await this.storeDeployedContractInstances(blockLogs, block.number);
|
|
283
283
|
await this.storeBroadcastedIndividualFunctions(blockLogs, block.number);
|
|
@@ -437,7 +437,11 @@ export class Archiver implements ArchiveSource {
|
|
|
437
437
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
438
438
|
* @returns The requested logs.
|
|
439
439
|
*/
|
|
440
|
-
public getLogs
|
|
440
|
+
public getLogs<TLogType extends LogType>(
|
|
441
|
+
from: number,
|
|
442
|
+
limit: number,
|
|
443
|
+
logType: TLogType,
|
|
444
|
+
): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]> {
|
|
441
445
|
return this.store.getLogs(from, limit, logType);
|
|
442
446
|
}
|
|
443
447
|
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Body,
|
|
3
|
+
EncryptedL2BlockL2Logs,
|
|
4
|
+
FromLogType,
|
|
3
5
|
GetUnencryptedLogsResponse,
|
|
4
6
|
InboxLeaf,
|
|
5
7
|
L2Block,
|
|
@@ -9,6 +11,7 @@ import {
|
|
|
9
11
|
TxEffect,
|
|
10
12
|
TxHash,
|
|
11
13
|
TxReceipt,
|
|
14
|
+
UnencryptedL2BlockL2Logs,
|
|
12
15
|
} from '@aztec/circuit-types';
|
|
13
16
|
import { Fr } from '@aztec/circuits.js';
|
|
14
17
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -88,8 +91,8 @@ export interface ArchiverDataStore {
|
|
|
88
91
|
* @returns True if the operation is successful.
|
|
89
92
|
*/
|
|
90
93
|
addLogs(
|
|
91
|
-
encryptedLogs:
|
|
92
|
-
unencryptedLogs:
|
|
94
|
+
encryptedLogs: EncryptedL2BlockL2Logs | undefined,
|
|
95
|
+
unencryptedLogs: UnencryptedL2BlockL2Logs | undefined,
|
|
93
96
|
blockNumber: number,
|
|
94
97
|
): Promise<boolean>;
|
|
95
98
|
|
|
@@ -122,7 +125,11 @@ export interface ArchiverDataStore {
|
|
|
122
125
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
123
126
|
* @returns The requested logs.
|
|
124
127
|
*/
|
|
125
|
-
getLogs
|
|
128
|
+
getLogs<TLogType extends LogType>(
|
|
129
|
+
from: number,
|
|
130
|
+
limit: number,
|
|
131
|
+
logType: TLogType,
|
|
132
|
+
): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]>;
|
|
126
133
|
|
|
127
134
|
/**
|
|
128
135
|
* Gets unencrypted logs based on the provided filter.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { InboxLeaf, L2Block, L2BlockContext, LogId, LogType, TxHash
|
|
1
|
+
import { InboxLeaf, L2Block, L2BlockContext, LogId, LogType, TxHash } from '@aztec/circuit-types';
|
|
2
2
|
import '@aztec/circuit-types/jest';
|
|
3
3
|
import { AztecAddress, Fr, INITIAL_L2_BLOCK_NUM, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
|
|
4
4
|
import {
|
|
@@ -367,11 +367,10 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
367
367
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
368
368
|
const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
|
|
369
369
|
const targetLogIndex = randomInt(numUnencryptedLogs);
|
|
370
|
-
const targetContractAddress =
|
|
370
|
+
const targetContractAddress =
|
|
371
371
|
blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[
|
|
372
372
|
targetFunctionLogIndex
|
|
373
|
-
].logs[targetLogIndex]
|
|
374
|
-
).contractAddress;
|
|
373
|
+
].logs[targetLogIndex].contractAddress;
|
|
375
374
|
|
|
376
375
|
const response = await store.getUnencryptedLogs({ contractAddress: targetContractAddress });
|
|
377
376
|
|
|
@@ -388,11 +387,10 @@ export function describeArchiverDataStore(testName: string, getStore: () => Arch
|
|
|
388
387
|
const targetTxIndex = randomInt(txsPerBlock);
|
|
389
388
|
const targetFunctionLogIndex = randomInt(numPublicFunctionCalls);
|
|
390
389
|
const targetLogIndex = randomInt(numUnencryptedLogs);
|
|
391
|
-
const targetSelector =
|
|
390
|
+
const targetSelector =
|
|
392
391
|
blocks.retrievedData[targetBlockIndex].body.txEffects[targetTxIndex].unencryptedLogs.functionLogs[
|
|
393
392
|
targetFunctionLogIndex
|
|
394
|
-
].logs[targetLogIndex]
|
|
395
|
-
).selector;
|
|
393
|
+
].logs[targetLogIndex].selector;
|
|
396
394
|
|
|
397
395
|
const response = await store.getUnencryptedLogs({ selector: targetSelector });
|
|
398
396
|
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Body,
|
|
3
|
+
EncryptedL2BlockL2Logs,
|
|
4
|
+
FromLogType,
|
|
3
5
|
GetUnencryptedLogsResponse,
|
|
4
6
|
InboxLeaf,
|
|
5
7
|
L2Block,
|
|
@@ -9,6 +11,7 @@ import {
|
|
|
9
11
|
TxEffect,
|
|
10
12
|
TxHash,
|
|
11
13
|
TxReceipt,
|
|
14
|
+
UnencryptedL2BlockL2Logs,
|
|
12
15
|
} from '@aztec/circuit-types';
|
|
13
16
|
import { Fr } from '@aztec/circuits.js';
|
|
14
17
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -150,8 +153,8 @@ export class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
150
153
|
* @returns True if the operation is successful.
|
|
151
154
|
*/
|
|
152
155
|
addLogs(
|
|
153
|
-
encryptedLogs:
|
|
154
|
-
unencryptedLogs:
|
|
156
|
+
encryptedLogs: EncryptedL2BlockL2Logs | undefined,
|
|
157
|
+
unencryptedLogs: UnencryptedL2BlockL2Logs | undefined,
|
|
155
158
|
blockNumber: number,
|
|
156
159
|
): Promise<boolean> {
|
|
157
160
|
return this.#logStore.addLogs(encryptedLogs, unencryptedLogs, blockNumber);
|
|
@@ -196,7 +199,11 @@ export class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
196
199
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
197
200
|
* @returns The requested logs.
|
|
198
201
|
*/
|
|
199
|
-
getLogs
|
|
202
|
+
getLogs<TLogType extends LogType>(
|
|
203
|
+
start: number,
|
|
204
|
+
limit: number,
|
|
205
|
+
logType: TLogType,
|
|
206
|
+
): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]> {
|
|
200
207
|
try {
|
|
201
208
|
return Promise.resolve(Array.from(this.#logStore.getLogs(start, limit, logType)));
|
|
202
209
|
} catch (err) {
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import {
|
|
2
|
+
EncryptedL2BlockL2Logs,
|
|
2
3
|
ExtendedUnencryptedL2Log,
|
|
4
|
+
FromLogType,
|
|
3
5
|
GetUnencryptedLogsResponse,
|
|
4
6
|
L2BlockL2Logs,
|
|
5
7
|
LogFilter,
|
|
6
8
|
LogId,
|
|
7
9
|
LogType,
|
|
10
|
+
UnencryptedL2BlockL2Logs,
|
|
8
11
|
UnencryptedL2Log,
|
|
9
12
|
} from '@aztec/circuit-types';
|
|
10
13
|
import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
|
|
@@ -37,8 +40,8 @@ export class LogStore {
|
|
|
37
40
|
* @returns True if the operation is successful.
|
|
38
41
|
*/
|
|
39
42
|
addLogs(
|
|
40
|
-
encryptedLogs:
|
|
41
|
-
unencryptedLogs:
|
|
43
|
+
encryptedLogs: EncryptedL2BlockL2Logs | undefined,
|
|
44
|
+
unencryptedLogs: UnencryptedL2BlockL2Logs | undefined,
|
|
42
45
|
blockNumber: number,
|
|
43
46
|
): Promise<boolean> {
|
|
44
47
|
return this.db.transaction(() => {
|
|
@@ -61,10 +64,15 @@ export class LogStore {
|
|
|
61
64
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
62
65
|
* @returns The requested logs.
|
|
63
66
|
*/
|
|
64
|
-
*getLogs
|
|
67
|
+
*getLogs<TLogType extends LogType>(
|
|
68
|
+
start: number,
|
|
69
|
+
limit: number,
|
|
70
|
+
logType: TLogType,
|
|
71
|
+
): IterableIterator<L2BlockL2Logs<FromLogType<TLogType>>> {
|
|
65
72
|
const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
|
|
73
|
+
const L2BlockL2Logs = logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
|
|
66
74
|
for (const buffer of logMap.values({ start, limit })) {
|
|
67
|
-
yield L2BlockL2Logs.fromBuffer(buffer)
|
|
75
|
+
yield L2BlockL2Logs.fromBuffer(buffer) as L2BlockL2Logs<FromLogType<TLogType>>;
|
|
68
76
|
}
|
|
69
77
|
}
|
|
70
78
|
|
|
@@ -94,7 +102,7 @@ export class LogStore {
|
|
|
94
102
|
}
|
|
95
103
|
|
|
96
104
|
const unencryptedLogsInBlock = this.#getBlockLogs(blockNumber, LogType.UNENCRYPTED);
|
|
97
|
-
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs()
|
|
105
|
+
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
98
106
|
|
|
99
107
|
const logs: ExtendedUnencryptedL2Log[] = [];
|
|
100
108
|
const maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
|
|
@@ -118,9 +126,9 @@ export class LogStore {
|
|
|
118
126
|
|
|
119
127
|
let maxLogsHit = false;
|
|
120
128
|
loopOverBlocks: for (const [blockNumber, logBuffer] of this.#unencryptedLogs.entries({ start, end })) {
|
|
121
|
-
const unencryptedLogsInBlock =
|
|
129
|
+
const unencryptedLogsInBlock = UnencryptedL2BlockL2Logs.fromBuffer(logBuffer);
|
|
122
130
|
for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < unencryptedLogsInBlock.txLogs.length; txIndex++) {
|
|
123
|
-
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs()
|
|
131
|
+
const txLogs = unencryptedLogsInBlock.txLogs[txIndex].unrollLogs();
|
|
124
132
|
maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
|
|
125
133
|
if (maxLogsHit) {
|
|
126
134
|
this.#log(`Max logs hit at block ${blockNumber}`);
|
|
@@ -161,14 +169,19 @@ export class LogStore {
|
|
|
161
169
|
return maxLogsHit;
|
|
162
170
|
}
|
|
163
171
|
|
|
164
|
-
#getBlockLogs
|
|
172
|
+
#getBlockLogs<TLogType extends LogType>(
|
|
173
|
+
blockNumber: number,
|
|
174
|
+
logType: TLogType,
|
|
175
|
+
): L2BlockL2Logs<FromLogType<TLogType>> {
|
|
165
176
|
const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
|
|
177
|
+
const L2BlockL2Logs: typeof EncryptedL2BlockL2Logs | typeof UnencryptedL2BlockL2Logs =
|
|
178
|
+
logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
|
|
166
179
|
const buffer = logMap.get(blockNumber);
|
|
167
180
|
|
|
168
181
|
if (!buffer) {
|
|
169
|
-
return new L2BlockL2Logs([])
|
|
182
|
+
return new L2BlockL2Logs([]) as L2BlockL2Logs<FromLogType<TLogType>>;
|
|
170
183
|
}
|
|
171
184
|
|
|
172
|
-
return L2BlockL2Logs.fromBuffer(buffer)
|
|
185
|
+
return L2BlockL2Logs.fromBuffer(buffer) as L2BlockL2Logs<FromLogType<TLogType>>;
|
|
173
186
|
}
|
|
174
187
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Body,
|
|
3
|
+
EncryptedL2BlockL2Logs,
|
|
3
4
|
ExtendedUnencryptedL2Log,
|
|
5
|
+
FromLogType,
|
|
4
6
|
GetUnencryptedLogsResponse,
|
|
5
7
|
InboxLeaf,
|
|
6
8
|
L2Block,
|
|
@@ -13,7 +15,7 @@ import {
|
|
|
13
15
|
TxHash,
|
|
14
16
|
TxReceipt,
|
|
15
17
|
TxStatus,
|
|
16
|
-
|
|
18
|
+
UnencryptedL2BlockL2Logs,
|
|
17
19
|
} from '@aztec/circuit-types';
|
|
18
20
|
import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
19
21
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -51,13 +53,13 @@ export class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
51
53
|
* An array containing all the encrypted logs that have been fetched so far.
|
|
52
54
|
* Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
|
|
53
55
|
*/
|
|
54
|
-
private encryptedLogsPerBlock:
|
|
56
|
+
private encryptedLogsPerBlock: EncryptedL2BlockL2Logs[] = [];
|
|
55
57
|
|
|
56
58
|
/**
|
|
57
59
|
* An array containing all the unencrypted logs that have been fetched so far.
|
|
58
60
|
* Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
|
|
59
61
|
*/
|
|
60
|
-
private unencryptedLogsPerBlock:
|
|
62
|
+
private unencryptedLogsPerBlock: UnencryptedL2BlockL2Logs[] = [];
|
|
61
63
|
|
|
62
64
|
/**
|
|
63
65
|
* Contains all L1 to L2 messages.
|
|
@@ -183,7 +185,11 @@ export class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
183
185
|
* @param blockNumber - The block for which to add the logs.
|
|
184
186
|
* @returns True if the operation is successful.
|
|
185
187
|
*/
|
|
186
|
-
addLogs(
|
|
188
|
+
addLogs(
|
|
189
|
+
encryptedLogs: EncryptedL2BlockL2Logs,
|
|
190
|
+
unencryptedLogs: UnencryptedL2BlockL2Logs,
|
|
191
|
+
blockNumber: number,
|
|
192
|
+
): Promise<boolean> {
|
|
187
193
|
if (encryptedLogs) {
|
|
188
194
|
this.encryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = encryptedLogs;
|
|
189
195
|
}
|
|
@@ -288,11 +294,17 @@ export class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
288
294
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
289
295
|
* @returns The requested logs.
|
|
290
296
|
*/
|
|
291
|
-
getLogs
|
|
297
|
+
getLogs<TLogType extends LogType>(
|
|
298
|
+
from: number,
|
|
299
|
+
limit: number,
|
|
300
|
+
logType: TLogType,
|
|
301
|
+
): Promise<L2BlockL2Logs<FromLogType<TLogType>>[]> {
|
|
292
302
|
if (from < INITIAL_L2_BLOCK_NUM || limit < 1) {
|
|
293
303
|
throw new Error(`Invalid limit: ${limit}`);
|
|
294
304
|
}
|
|
295
|
-
const logs =
|
|
305
|
+
const logs = (
|
|
306
|
+
logType === LogType.ENCRYPTED ? this.encryptedLogsPerBlock : this.unencryptedLogsPerBlock
|
|
307
|
+
) as L2BlockL2Logs<FromLogType<TLogType>>[];
|
|
296
308
|
if (from > logs.length) {
|
|
297
309
|
return Promise.resolve([]);
|
|
298
310
|
}
|
|
@@ -355,7 +367,7 @@ export class MemoryArchiverStore implements ArchiverDataStore {
|
|
|
355
367
|
const blockContext = this.l2BlockContexts[fromBlockIndex];
|
|
356
368
|
const blockLogs = this.unencryptedLogsPerBlock[fromBlockIndex];
|
|
357
369
|
for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
|
|
358
|
-
const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs()
|
|
370
|
+
const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
|
|
359
371
|
for (; logIndexInTx < txLogs.length; logIndexInTx++) {
|
|
360
372
|
const log = txLogs[logIndexInTx];
|
|
361
373
|
if (
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
|
+
EncryptedL2BlockL2Logs,
|
|
2
3
|
ExtendedUnencryptedL2Log,
|
|
3
4
|
L2Block,
|
|
4
|
-
L2BlockL2Logs,
|
|
5
5
|
NullifierMembershipWitness,
|
|
6
6
|
TxReceipt,
|
|
7
|
+
UnencryptedL2BlockL2Logs,
|
|
7
8
|
} from '@aztec/circuit-types';
|
|
8
9
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
9
10
|
import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
|
|
@@ -18,10 +19,11 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
|
|
|
18
19
|
ExtendedUnencryptedL2Log,
|
|
19
20
|
Fr,
|
|
20
21
|
L2Block,
|
|
21
|
-
|
|
22
|
+
EncryptedL2BlockL2Logs,
|
|
23
|
+
UnencryptedL2BlockL2Logs,
|
|
22
24
|
},
|
|
23
25
|
{ TxReceipt, NullifierMembershipWitness },
|
|
24
26
|
false,
|
|
25
27
|
'archiver',
|
|
26
28
|
fetch,
|
|
27
|
-
);
|
|
29
|
+
) as ArchiveSource;
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
|
+
EncryptedL2BlockL2Logs,
|
|
2
3
|
ExtendedUnencryptedL2Log,
|
|
3
4
|
L2Block,
|
|
4
|
-
L2BlockL2Logs,
|
|
5
5
|
NullifierMembershipWitness,
|
|
6
6
|
TxEffect,
|
|
7
7
|
TxReceipt,
|
|
8
|
+
UnencryptedL2BlockL2Logs,
|
|
8
9
|
} from '@aztec/circuit-types';
|
|
9
10
|
import { EthAddress, Fr } from '@aztec/circuits.js';
|
|
10
11
|
import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
|
|
@@ -24,7 +25,8 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
|
|
|
24
25
|
ExtendedUnencryptedL2Log,
|
|
25
26
|
Fr,
|
|
26
27
|
L2Block,
|
|
27
|
-
|
|
28
|
+
EncryptedL2BlockL2Logs,
|
|
29
|
+
UnencryptedL2BlockL2Logs,
|
|
28
30
|
TxEffect,
|
|
29
31
|
},
|
|
30
32
|
{ TxReceipt, NullifierMembershipWitness },
|