@aztec/archiver 0.66.0 → 0.67.1-devnet
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 +7 -10
- package/dest/archiver/archiver.d.ts.map +1 -1
- package/dest/archiver/archiver.js +566 -559
- package/dest/archiver/archiver_store.d.ts +2 -2
- package/dest/archiver/archiver_store.d.ts.map +1 -1
- package/dest/archiver/config.d.ts +2 -0
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +6 -1
- package/dest/archiver/data_retrieval.d.ts +3 -3
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +38 -17
- package/dest/archiver/instrumentation.d.ts +5 -2
- package/dest/archiver/instrumentation.d.ts.map +1 -1
- package/dest/archiver/instrumentation.js +17 -18
- package/dest/archiver/kv_archiver_store/block_store.d.ts +2 -2
- package/dest/archiver/kv_archiver_store/block_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/block_store.js +6 -6
- package/dest/archiver/kv_archiver_store/contract_class_store.js +2 -2
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts +2 -2
- package/dest/archiver/kv_archiver_store/kv_archiver_store.d.ts.map +1 -1
- package/dest/archiver/kv_archiver_store/kv_archiver_store.js +3 -3
- package/dest/archiver/kv_archiver_store/log_store.js +3 -3
- package/dest/archiver/kv_archiver_store/message_store.js +3 -3
- package/dest/archiver/kv_archiver_store/nullifier_store.js +3 -3
- package/dest/archiver/memory_archiver_store/memory_archiver_store.d.ts +2 -2
- 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/factory.d.ts.map +1 -1
- package/dest/factory.js +8 -6
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/test/mock_l2_block_source.d.ts +2 -2
- package/dest/test/mock_l2_block_source.d.ts.map +1 -1
- package/dest/test/mock_l2_block_source.js +3 -3
- package/package.json +17 -12
- package/src/archiver/archiver.ts +19 -24
- package/src/archiver/archiver_store.ts +2 -2
- package/src/archiver/config.ts +8 -0
- package/src/archiver/data_retrieval.ts +58 -25
- package/src/archiver/instrumentation.ts +25 -21
- package/src/archiver/kv_archiver_store/block_store.ts +6 -6
- package/src/archiver/kv_archiver_store/contract_class_store.ts +1 -1
- package/src/archiver/kv_archiver_store/kv_archiver_store.ts +4 -4
- package/src/archiver/kv_archiver_store/log_store.ts +2 -2
- package/src/archiver/kv_archiver_store/message_store.ts +2 -2
- package/src/archiver/kv_archiver_store/nullifier_store.ts +2 -2
- package/src/archiver/memory_archiver_store/memory_archiver_store.ts +5 -5
- package/src/factory.ts +7 -5
- package/src/index.ts +1 -4
- package/src/test/mock_l2_block_source.ts +4 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type GetUnencryptedLogsResponse, type InBlock, type InboxLeaf, type L2Block, type LogFilter, type TxEffect, type TxHash, type TxReceipt, type TxScopedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type Fr, type
|
|
2
|
+
import { type BlockHeader, type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type Fr, type PrivateLog, type UnconstrainedFunctionWithMembershipProof } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact, type FunctionSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { type DataRetrieval } from './structs/data_retrieval.js';
|
|
@@ -47,7 +47,7 @@ export interface ArchiverDataStore {
|
|
|
47
47
|
* @param limit - The number of blocks to return.
|
|
48
48
|
* @returns The requested L2 block headers.
|
|
49
49
|
*/
|
|
50
|
-
getBlockHeaders(from: number, limit: number): Promise<
|
|
50
|
+
getBlockHeaders(from: number, limit: number): Promise<BlockHeader[]>;
|
|
51
51
|
/**
|
|
52
52
|
* Gets a tx effect.
|
|
53
53
|
* @param txHash - The txHash of the tx corresponding to the tx effect.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAChC,KAAK,4CAA4C,EACjD,KAAK,EAAE,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"archiver_store.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver_store.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
|
12
12
|
export type ArchiverConfig = {
|
|
13
13
|
/** URL for an archiver service. If set, will return an archiver client as opposed to starting a new one. */
|
|
14
14
|
archiverUrl?: string;
|
|
15
|
+
/** URL for an L1 consensus client */
|
|
16
|
+
l1ConsensusClientUrl: string;
|
|
15
17
|
/** The polling interval in ms for retrieving new L2 blocks and encrypted logs. */
|
|
16
18
|
archiverPollingIntervalMS?: number;
|
|
17
19
|
/** The number of L2 blocks the archiver will attempt to download at a time. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,CAAC;AAEpB,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAGpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,4GAA4G;IAC5G,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,qCAAqC;IACrC,oBAAoB,EAAE,MAAM,CAAC;IAE7B,kFAAkF;IAClF,yBAAyB,CAAC,EAAE,MAAM,CAAC;IAEnC,+EAA+E;IAC/E,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2CAA2C;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAE/B,yCAAyC;IACzC,WAAW,EAAE,mBAAmB,CAAC;IAEjC,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,CAAC;AAEpB,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAiCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
|
package/dest/archiver/config.js
CHANGED
|
@@ -5,6 +5,11 @@ export const archiverConfigMappings = {
|
|
|
5
5
|
env: 'ARCHIVER_URL',
|
|
6
6
|
description: 'URL for an archiver service. If set, will return an archiver client as opposed to starting a new one.',
|
|
7
7
|
},
|
|
8
|
+
l1ConsensusClientUrl: {
|
|
9
|
+
env: 'L1_CONSENSUS_CLIENT_URL',
|
|
10
|
+
description: 'URL for an L1 consensus client.',
|
|
11
|
+
parseEnv: (val) => (val ? val : 'http://localhost:5052'),
|
|
12
|
+
},
|
|
8
13
|
archiverPollingIntervalMS: {
|
|
9
14
|
env: 'ARCHIVER_POLLING_INTERVAL_MS',
|
|
10
15
|
description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
|
|
@@ -36,4 +41,4 @@ export const archiverConfigMappings = {
|
|
|
36
41
|
export function getArchiverConfigFromEnv() {
|
|
37
42
|
return getConfigFromMappings(archiverConfigMappings);
|
|
38
43
|
}
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBSUwseUJBQXlCLEVBQ3pCLHNCQUFzQixHQUN2QixNQUFNLGlCQUFpQixDQUFDO0FBQ3pCLE9BQU8sRUFBMkIscUJBQXFCLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQW9DOUcsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQXVDO0lBQ3hFLFdBQVcsRUFBRTtRQUNYLEdBQUcsRUFBRSxjQUFjO1FBQ25CLFdBQVcsRUFDVCx1R0FBdUc7S0FDMUc7SUFDRCxvQkFBb0IsRUFBRTtRQUNwQixHQUFHLEVBQUUseUJBQXlCO1FBQzlCLFdBQVcsRUFBRSxpQ0FBaUM7UUFDOUMsUUFBUSxFQUFFLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQztLQUNqRTtJQUNELHlCQUF5QixFQUFFO1FBQ3pCLEdBQUcsRUFBRSw4QkFBOEI7UUFDbkMsV0FBVyxFQUFFLDZFQUE2RTtRQUMxRixHQUFHLGtCQUFrQixDQUFDLElBQUssQ0FBQztLQUM3QjtJQUNELGlCQUFpQixFQUFFO1FBQ2pCLEdBQUcsRUFBRSxxQkFBcUI7UUFDMUIsV0FBVyxFQUFFLDBFQUEwRTtRQUN2RixHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQztLQUMzQjtJQUNELE9BQU8sRUFBRTtRQUNQLEdBQUcsRUFBRSxtQkFBbUI7UUFDeEIsV0FBVyxFQUFFLDZFQUE2RTtRQUMxRixHQUFHLGtCQUFrQixDQUFDLElBQUssQ0FBQztLQUM3QjtJQUNELEdBQUcsc0JBQXNCO0lBQ3pCLHFCQUFxQixFQUFFO1FBQ3JCLEdBQUcsRUFBRSxtQ0FBbUM7UUFDeEMsV0FBVyxFQUFFLHNDQUFzQztRQUNuRCxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FBQztLQUM1QjtJQUNELEdBQUcseUJBQXlCO0NBQzdCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsTUFBTSxVQUFVLHdCQUF3QjtJQUN0QyxPQUFPLHFCQUFxQixDQUFpQixzQkFBc0IsQ0FBQyxDQUFDO0FBQ3ZFLENBQUMifQ==
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
import { InboxLeaf, L2Block } from '@aztec/circuit-types';
|
|
4
4
|
import { Fr, Proof } from '@aztec/circuits.js';
|
|
5
5
|
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
6
|
-
import { type
|
|
6
|
+
import { type Logger } from '@aztec/foundation/log';
|
|
7
7
|
import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
8
8
|
import { type Chain, type GetContractEventsReturnType, type GetContractReturnType, type Hex, type HttpTransport, type PublicClient } from 'viem';
|
|
9
9
|
import { type DataRetrieval } from './structs/data_retrieval.js';
|
|
@@ -17,7 +17,7 @@ import { type L1Published } from './structs/published.js';
|
|
|
17
17
|
* @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
|
|
18
18
|
* @returns An array of block; as well as the next eth block to search from.
|
|
19
19
|
*/
|
|
20
|
-
export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, searchStartBlock: bigint, searchEndBlock: bigint, logger?:
|
|
20
|
+
export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, searchStartBlock: bigint, searchEndBlock: bigint, logger?: Logger): Promise<L1Published<L2Block>[]>;
|
|
21
21
|
/**
|
|
22
22
|
* Processes newly received L2BlockProposed logs.
|
|
23
23
|
* @param rollup - The rollup contract
|
|
@@ -25,7 +25,7 @@ export declare function retrieveBlocksFromRollup(rollup: GetContractReturnType<t
|
|
|
25
25
|
* @param logs - L2BlockProposed logs.
|
|
26
26
|
* @returns - An array blocks.
|
|
27
27
|
*/
|
|
28
|
-
export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger:
|
|
28
|
+
export declare function processL2BlockProposedLogs(rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>, publicClient: PublicClient, logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>, logger: Logger): Promise<L1Published<L2Block>[]>;
|
|
29
29
|
export declare function getL1BlockTime(publicClient: PublicClient, blockNumber: bigint): Promise<bigint>;
|
|
30
30
|
/**
|
|
31
31
|
* Fetch L1 to L2 messages.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAQ,SAAS,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Body, InboxLeaf, L2Block } from '@aztec/circuit-types';
|
|
2
|
-
import { AppendOnlyTreeSnapshot,
|
|
2
|
+
import { AppendOnlyTreeSnapshot, BlockHeader, Fr, Proof } from '@aztec/circuits.js';
|
|
3
3
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
4
|
-
import {
|
|
4
|
+
import { Blob } from '@aztec/foundation/blob';
|
|
5
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
6
|
import { numToUInt32BE } from '@aztec/foundation/serialize';
|
|
6
7
|
import { RollupAbi } from '@aztec/l1-artifacts';
|
|
7
8
|
import { decodeFunctionData, getAbiItem, hexToBytes, } from 'viem';
|
|
@@ -14,16 +15,16 @@ import { decodeFunctionData, getAbiItem, hexToBytes, } from 'viem';
|
|
|
14
15
|
* @param expectedNextL2BlockNum - The next L2 block number that we expect to find.
|
|
15
16
|
* @returns An array of block; as well as the next eth block to search from.
|
|
16
17
|
*/
|
|
17
|
-
export async function retrieveBlocksFromRollup(rollup, publicClient, searchStartBlock, searchEndBlock, logger =
|
|
18
|
+
export async function retrieveBlocksFromRollup(rollup, publicClient, searchStartBlock, searchEndBlock, logger = createLogger('archiver')) {
|
|
18
19
|
const retrievedBlocks = [];
|
|
19
20
|
do {
|
|
20
21
|
if (searchStartBlock > searchEndBlock) {
|
|
21
22
|
break;
|
|
22
23
|
}
|
|
23
|
-
const l2BlockProposedLogs = await rollup.getEvents.L2BlockProposed({}, {
|
|
24
|
+
const l2BlockProposedLogs = (await rollup.getEvents.L2BlockProposed({}, {
|
|
24
25
|
fromBlock: searchStartBlock,
|
|
25
|
-
toBlock: searchEndBlock
|
|
26
|
-
});
|
|
26
|
+
toBlock: searchEndBlock,
|
|
27
|
+
})).filter(log => log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
|
|
27
28
|
if (l2BlockProposedLogs.length === 0) {
|
|
28
29
|
break;
|
|
29
30
|
}
|
|
@@ -87,9 +88,29 @@ async function getBlockFromRollupTx(publicClient, txHash, l2BlockNum) {
|
|
|
87
88
|
if (!allowedMethods.includes(functionName)) {
|
|
88
89
|
throw new Error(`Unexpected method called ${functionName}`);
|
|
89
90
|
}
|
|
90
|
-
|
|
91
|
-
const
|
|
91
|
+
// TODO(#9101): 'bodyHex' will be removed from below
|
|
92
|
+
const [decodedArgs, , bodyHex, blobInputs] = args;
|
|
93
|
+
const header = BlockHeader.fromBuffer(Buffer.from(hexToBytes(decodedArgs.header)));
|
|
94
|
+
// TODO(#9101): Retreiving the block body from calldata is a temporary soln before we have
|
|
95
|
+
// either a beacon chain client or link to some blob store. Web2 is ok because we will
|
|
96
|
+
// verify the block body vs the blob as below.
|
|
92
97
|
const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
|
|
98
|
+
const blockFields = blockBody.toBlobFields();
|
|
99
|
+
// TODO(#9101): The below reconstruction is currently redundant, but once we extract blobs will be the way to construct blocks.
|
|
100
|
+
// The blob source will give us blockFields, and we must construct the body from them:
|
|
101
|
+
// TODO(#8954): When logs are refactored into fields, we won't need to inject them here.
|
|
102
|
+
const reconstructedBlock = Body.fromBlobFields(blockFields, blockBody.unencryptedLogs, blockBody.contractClassLogs);
|
|
103
|
+
if (!reconstructedBlock.toBuffer().equals(blockBody.toBuffer())) {
|
|
104
|
+
// TODO(#9101): Remove below check (without calldata there will be nothing to check against)
|
|
105
|
+
throw new Error(`Block reconstructed from blob fields does not match`);
|
|
106
|
+
}
|
|
107
|
+
// TODO(#9101): Once we stop publishing calldata, we will still need the blobCheck below to ensure that the block we are building does correspond to the blob fields
|
|
108
|
+
const blobCheck = Blob.getBlobs(blockFields);
|
|
109
|
+
if (Blob.getEthBlobEvaluationInputs(blobCheck) !== blobInputs) {
|
|
110
|
+
// NB: We can just check the blobhash here, which is the first 32 bytes of blobInputs
|
|
111
|
+
// A mismatch means that the fields published in the blob in propose() do NOT match those in the extracted block.
|
|
112
|
+
throw new Error(`Block body mismatched with blob for block number ${l2BlockNum}. \nExpected: ${Blob.getEthBlobEvaluationInputs(blobCheck)} \nGot: ${blobInputs}`);
|
|
113
|
+
}
|
|
93
114
|
const blockNumberFromHeader = header.globalVariables.blockNumber.toBigInt();
|
|
94
115
|
if (blockNumberFromHeader !== l2BlockNum) {
|
|
95
116
|
throw new Error(`Block number mismatch: expected ${l2BlockNum} but got ${blockNumberFromHeader}`);
|
|
@@ -115,16 +136,16 @@ export async function retrieveL1ToL2Messages(inbox, searchStartBlock, searchEndB
|
|
|
115
136
|
if (searchStartBlock > searchEndBlock) {
|
|
116
137
|
break;
|
|
117
138
|
}
|
|
118
|
-
const messageSentLogs = await inbox.getEvents.MessageSent({}, {
|
|
139
|
+
const messageSentLogs = (await inbox.getEvents.MessageSent({}, {
|
|
119
140
|
fromBlock: searchStartBlock,
|
|
120
|
-
toBlock: searchEndBlock
|
|
121
|
-
});
|
|
141
|
+
toBlock: searchEndBlock,
|
|
142
|
+
})).filter(log => log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
|
|
122
143
|
if (messageSentLogs.length === 0) {
|
|
123
144
|
break;
|
|
124
145
|
}
|
|
125
146
|
for (const log of messageSentLogs) {
|
|
126
147
|
const { index, hash } = log.args;
|
|
127
|
-
retrievedL1ToL2Messages.push(new InboxLeaf(index, Fr.
|
|
148
|
+
retrievedL1ToL2Messages.push(new InboxLeaf(index, Fr.fromHexString(hash)));
|
|
128
149
|
}
|
|
129
150
|
// handles the case when there are no new messages:
|
|
130
151
|
searchStartBlock = (messageSentLogs.findLast(msgLog => !!msgLog)?.blockNumber || searchStartBlock) + 1n;
|
|
@@ -136,14 +157,14 @@ export async function retrieveL2ProofVerifiedEvents(publicClient, rollupAddress,
|
|
|
136
157
|
const logs = await publicClient.getLogs({
|
|
137
158
|
address: rollupAddress.toString(),
|
|
138
159
|
fromBlock: searchStartBlock,
|
|
139
|
-
toBlock: searchEndBlock ? searchEndBlock
|
|
160
|
+
toBlock: searchEndBlock ? searchEndBlock : undefined,
|
|
140
161
|
strict: true,
|
|
141
162
|
event: getAbiItem({ abi: RollupAbi, name: 'L2ProofVerified' }),
|
|
142
163
|
});
|
|
143
164
|
return logs.map(log => ({
|
|
144
165
|
l1BlockNumber: log.blockNumber,
|
|
145
166
|
l2BlockNumber: log.args.blockNumber,
|
|
146
|
-
proverId: Fr.
|
|
167
|
+
proverId: Fr.fromHexString(log.args.proverId),
|
|
147
168
|
txHash: log.transactionHash,
|
|
148
169
|
}));
|
|
149
170
|
}
|
|
@@ -180,8 +201,8 @@ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedPr
|
|
|
180
201
|
if (functionName === 'submitEpochRootProof') {
|
|
181
202
|
const [decodedArgs] = args;
|
|
182
203
|
aggregationObject = Buffer.from(hexToBytes(decodedArgs.aggregationObject));
|
|
183
|
-
proverId = Fr.
|
|
184
|
-
archiveRoot = Fr.
|
|
204
|
+
proverId = Fr.fromHexString(decodedArgs.args[6]);
|
|
205
|
+
archiveRoot = Fr.fromHexString(decodedArgs.args[1]);
|
|
185
206
|
proof = Proof.fromBuffer(Buffer.from(hexToBytes(decodedArgs.proof)));
|
|
186
207
|
}
|
|
187
208
|
else {
|
|
@@ -197,4 +218,4 @@ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedPr
|
|
|
197
218
|
proof,
|
|
198
219
|
};
|
|
199
220
|
}
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_retrieval.js","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
|
221
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_retrieval.js","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAG9C,OAAO,EAAe,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAiB,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE/D,OAAO,EAOL,kBAAkB,EAClB,UAAU,EACV,UAAU,GACX,MAAM,MAAM,CAAC;AAKd;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,MAAmF,EACnF,YAA0B,EAC1B,gBAAwB,EACxB,cAAsB,EACtB,SAAiB,YAAY,CAAC,UAAU,CAAC;IAEzC,MAAM,eAAe,GAA2B,EAAE,CAAC;IACnD,GAAG,CAAC;QACF,IAAI,gBAAgB,GAAG,cAAc,EAAE,CAAC;YACtC,MAAM;QACR,CAAC;QACD,MAAM,mBAAmB,GAAG,CAC1B,MAAM,MAAM,CAAC,SAAS,CAAC,eAAe,CACpC,EAAE,EACF;YACE,SAAS,EAAE,gBAAgB;YAC3B,OAAO,EAAE,cAAc;SACxB,CACF,CACF,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAY,IAAI,gBAAgB,IAAI,GAAG,CAAC,WAAY,IAAI,cAAc,CAAC,CAAC;QAE5F,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpE,MAAM,CAAC,KAAK,CACV,OAAO,mBAAmB,CAAC,MAAM,0CAA0C,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,WAAW,sBAAsB,gBAAgB,IAAI,cAAc,EAAE,CACzM,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;QACtG,eAAe,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;QACnC,gBAAgB,GAAG,OAAO,CAAC,WAAY,GAAG,EAAE,CAAC;IAC/C,CAAC,QAAQ,gBAAgB,IAAI,cAAc,EAAE;IAC7C,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAmF,EACnF,YAA0B,EAC1B,IAAsE,EACtE,MAAc;IAEd,MAAM,eAAe,GAA2B,EAAE,CAAC;IACnD,MAAM,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;QACpC,MAAM,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,WAAY,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAQ,CAAC;QAClC,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;QAEtE,sFAAsF;QACtF,IAAI,OAAO,KAAK,gBAAgB,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,YAAY,EAAE,GAAG,CAAC,eAAgB,EAAE,aAAa,CAAC,CAAC;YAE5F,MAAM,EAAE,GAAoB;gBAC1B,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,SAAS,EAAE,MAAM,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,CAAC;aAC/D,CAAC;YAEF,eAAe,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,qBAAqB,aAAa,+BAA+B,EAAE;gBAC7E,MAAM,EAAE,OAAO;gBACf,QAAQ,EAAE,gBAAgB;aAC3B,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,YAA0B,EAAE,WAAmB;IAClF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,KAAK,EAAE,CAAC,CAAC;IACvF,OAAO,KAAK,CAAC,SAAS,CAAC;AACzB,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,oBAAoB,CACjC,YAA0B,EAC1B,MAAqB,EACrB,UAAkB;IAElB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAEtD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,oDAAoD;IACpD,MAAM,CAAC,WAAW,EAAE,AAAD,EAAG,OAAO,EAAE,UAAU,CAAC,GAAG,IAc5C,CAAC;IAEF,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnF,0FAA0F;IAC1F,sFAAsF;IACtF,8CAA8C;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;IAC7C,+HAA+H;IAC/H,sFAAsF;IACtF,wFAAwF;IACxF,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAEpH,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QAChE,4FAA4F;QAC5F,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,oKAAoK;IACpK,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAI,IAAI,CAAC,0BAA0B,CAAC,SAAS,CAAC,KAAK,UAAU,EAAE,CAAC;QAC9D,qFAAqF;QACrF,iHAAiH;QACjH,MAAM,IAAI,KAAK,CACb,oDAAoD,UAAU,iBAAiB,IAAI,CAAC,0BAA0B,CAC5G,SAAS,CACV,WAAW,UAAU,EAAE,CACzB,CAAC;IACJ,CAAC;IAED,MAAM,qBAAqB,GAAG,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;IAE5E,IAAI,qBAAqB,KAAK,UAAU,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,mCAAmC,UAAU,YAAY,qBAAqB,EAAE,CAAC,CAAC;IACpG,CAAC;IAED,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,CAC/C,MAAM,CAAC,MAAM,CAAC;QACZ,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,uBAAuB;QACrE,aAAa,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC,EAAE,yCAAyC;KAClF,CAAC,CACH,CAAC;IAEF,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,KAAiF,EACjF,gBAAwB,EACxB,cAAsB;IAEtB,MAAM,uBAAuB,GAAgB,EAAE,CAAC;IAChD,GAAG,CAAC;QACF,IAAI,gBAAgB,GAAG,cAAc,EAAE,CAAC;YACtC,MAAM;QACR,CAAC;QAED,MAAM,eAAe,GAAG,CACtB,MAAM,KAAK,CAAC,SAAS,CAAC,WAAW,CAC/B,EAAE,EACF;YACE,SAAS,EAAE,gBAAgB;YAC3B,OAAO,EAAE,cAAc;SACxB,CACF,CACF,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,WAAY,IAAI,gBAAgB,IAAI,GAAG,CAAC,WAAY,IAAI,cAAc,CAAC,CAAC;QAE5F,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM;QACR,CAAC;QAED,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;YAClC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACjC,uBAAuB,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,KAAM,EAAE,EAAE,CAAC,aAAa,CAAC,IAAK,CAAC,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED,mDAAmD;QACnD,gBAAgB,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,WAAW,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC;IAC1G,CAAC,QAAQ,gBAAgB,IAAI,cAAc,EAAE;IAC7C,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,GAAG,EAAE,EAAE,aAAa,EAAE,uBAAuB,EAAE,CAAC;AACvG,CAAC;AAED,iEAAiE;AACjE,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,YAA0B,EAC1B,aAAyB,EACzB,gBAAwB,EACxB,cAAuB;IAEvB,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC;QACtC,OAAO,EAAE,aAAa,CAAC,QAAQ,EAAE;QACjC,SAAS,EAAE,gBAAgB;QAC3B,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;QACpD,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;KAC/D,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtB,aAAa,EAAE,GAAG,CAAC,WAAW;QAC9B,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW;QACnC,QAAQ,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC7C,MAAM,EAAE,GAAG,CAAC,eAAe;KAC5B,CAAC,CAAC,CAAC;AACN,CAAC;AAED,yDAAyD;AACzD,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,YAA0B,EAC1B,aAAyB,EACzB,gBAAwB,EACxB,cAAuB;IAEvB,MAAM,IAAI,GAAG,MAAM,6BAA6B,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAChH,MAAM,aAAa,GAAmF,EAAE,CAAC;IACzG,MAAM,0BAA0B,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,aAAa,CAAC,CAAC,CAAC,gBAAgB,GAAG,EAAE,CAAC;IAExG,KAAK,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,IAAI,EAAE,CAAC;QACvD,MAAM,SAAS,GAAG,MAAM,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClF,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC;IACtG,CAAC;IACD,OAAO;QACL,aAAa;QACb,0BAA0B;KAC3B,CAAC;AACJ,CAAC;AASD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,YAA0B,EAC1B,MAAqB,EACrB,gBAAoB;IAEpB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,IAAI,QAAY,CAAC;IACjB,IAAI,WAAe,CAAC;IACpB,IAAI,iBAAyB,CAAC;IAC9B,IAAI,KAAY,CAAC;IAEjB,IAAI,YAAY,KAAK,sBAAsB,EAAE,CAAC;QAC5C,MAAM,CAAC,WAAW,CAAC,GAAG,IAQrB,CAAC;QAEF,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC3E,QAAQ,GAAG,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,kCAAkC,YAAY,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,gCAAgC,gBAAgB,YAAY,QAAQ,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO;QACL,QAAQ;QACR,iBAAiB;QACjB,WAAW;QACX,KAAK;KACN,CAAC;AACJ,CAAC"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { type L2Block } from '@aztec/circuit-types';
|
|
2
|
-
import { type LmdbStatsCallback, type TelemetryClient } from '@aztec/telemetry-client';
|
|
2
|
+
import { type LmdbStatsCallback, type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
|
|
3
3
|
export declare class ArchiverInstrumentation {
|
|
4
4
|
private telemetry;
|
|
5
|
+
readonly tracer: Tracer;
|
|
5
6
|
private blockHeight;
|
|
6
7
|
private blockSize;
|
|
7
8
|
private syncDuration;
|
|
9
|
+
private l1BlocksSynced;
|
|
8
10
|
private proofsSubmittedDelay;
|
|
9
11
|
private proofsSubmittedCount;
|
|
10
12
|
private dbMetrics;
|
|
11
13
|
private log;
|
|
12
|
-
constructor(
|
|
14
|
+
private constructor();
|
|
15
|
+
static new(telemetry: TelemetryClient, lmdbStats?: LmdbStatsCallback): Promise<ArchiverInstrumentation>;
|
|
13
16
|
isEnabled(): boolean;
|
|
14
17
|
processNewBlocks(syncTimePerBlock: number, blocks: L2Block[]): void;
|
|
15
18
|
updateLastProvenBlock(blockNumber: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/archiver/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,
|
|
1
|
+
{"version":3,"file":"instrumentation.d.ts","sourceRoot":"","sources":["../../src/archiver/instrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAKL,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,uBAAuB;IAad,OAAO,CAAC,SAAS;IAZrC,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,YAAY,CAAY;IAChC,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAgB;IAC5C,OAAO,CAAC,SAAS,CAAc;IAE/B,OAAO,CAAC,GAAG,CAA4C;IAEvD,OAAO;WA4Ca,GAAG,CAAC,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,iBAAiB;IAU1E,SAAS,IAAI,OAAO;IAIpB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAS5D,qBAAqB,CAAC,WAAW,EAAE,MAAM;IAIzC,qBAAqB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE;CAYhG"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Attributes, LmdbMetrics, Metrics, ValueType,
|
|
1
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
2
|
+
import { Attributes, LmdbMetrics, Metrics, ValueType, } from '@aztec/telemetry-client';
|
|
3
3
|
export class ArchiverInstrumentation {
|
|
4
4
|
constructor(telemetry, lmdbStats) {
|
|
5
5
|
this.telemetry = telemetry;
|
|
6
|
-
this.log =
|
|
6
|
+
this.log = createLogger('archiver:instrumentation');
|
|
7
|
+
this.tracer = telemetry.getTracer('Archiver');
|
|
7
8
|
const meter = telemetry.getMeter('Archiver');
|
|
8
9
|
this.blockHeight = meter.createGauge(Metrics.ARCHIVER_BLOCK_HEIGHT, {
|
|
9
10
|
description: 'The height of the latest block processed by the archiver',
|
|
@@ -17,9 +18,6 @@ export class ArchiverInstrumentation {
|
|
|
17
18
|
unit: 'ms',
|
|
18
19
|
description: 'Duration to sync a block',
|
|
19
20
|
valueType: ValueType.INT,
|
|
20
|
-
advice: {
|
|
21
|
-
explicitBucketBoundaries: exponentialBuckets(1, 16),
|
|
22
|
-
},
|
|
23
21
|
});
|
|
24
22
|
this.proofsSubmittedCount = meter.createUpDownCounter(Metrics.ARCHIVER_ROLLUP_PROOF_COUNT, {
|
|
25
23
|
description: 'Number of proofs submitted',
|
|
@@ -29,27 +27,28 @@ export class ArchiverInstrumentation {
|
|
|
29
27
|
unit: 'ms',
|
|
30
28
|
description: 'Time after a block is submitted until its proof is published',
|
|
31
29
|
valueType: ValueType.INT,
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
30
|
+
});
|
|
31
|
+
this.l1BlocksSynced = meter.createUpDownCounter(Metrics.ARCHIVER_L1_BLOCKS_SYNCED, {
|
|
32
|
+
description: 'Number of blocks synced from L1',
|
|
33
|
+
valueType: ValueType.INT,
|
|
35
34
|
});
|
|
36
35
|
this.dbMetrics = new LmdbMetrics(meter, {
|
|
37
|
-
|
|
38
|
-
description: 'Database map size for the archiver',
|
|
39
|
-
}, {
|
|
40
|
-
name: Metrics.ARCHIVER_DB_USED_SIZE,
|
|
41
|
-
description: 'Database used size for the archiver',
|
|
42
|
-
}, {
|
|
43
|
-
name: Metrics.ARCHIVER_DB_NUM_ITEMS,
|
|
44
|
-
description: 'Num items in the archiver database',
|
|
36
|
+
[Attributes.DB_DATA_TYPE]: 'archiver',
|
|
45
37
|
}, lmdbStats);
|
|
46
38
|
}
|
|
39
|
+
static async new(telemetry, lmdbStats) {
|
|
40
|
+
const instance = new ArchiverInstrumentation(telemetry, lmdbStats);
|
|
41
|
+
instance.l1BlocksSynced.add(0);
|
|
42
|
+
await instance.telemetry.flush();
|
|
43
|
+
return instance;
|
|
44
|
+
}
|
|
47
45
|
isEnabled() {
|
|
48
46
|
return this.telemetry.isEnabled();
|
|
49
47
|
}
|
|
50
48
|
processNewBlocks(syncTimePerBlock, blocks) {
|
|
51
49
|
this.syncDuration.record(Math.ceil(syncTimePerBlock));
|
|
52
50
|
this.blockHeight.record(Math.max(...blocks.map(b => b.number)));
|
|
51
|
+
this.l1BlocksSynced.add(blocks.length);
|
|
53
52
|
for (const block of blocks) {
|
|
54
53
|
this.blockSize.record(block.body.txEffects.length);
|
|
55
54
|
}
|
|
@@ -70,4 +69,4 @@ export class ArchiverInstrumentation {
|
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1bWVudGF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2luc3RydW1lbnRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUNMLFVBQVUsRUFHVixXQUFXLEVBRVgsT0FBTyxFQUlQLFNBQVMsR0FDVixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE1BQU0sT0FBTyx1QkFBdUI7SUFhbEMsWUFBNEIsU0FBMEIsRUFBRSxTQUE2QjtRQUF6RCxjQUFTLEdBQVQsU0FBUyxDQUFpQjtRQUY5QyxRQUFHLEdBQUcsWUFBWSxDQUFDLDBCQUEwQixDQUFDLENBQUM7UUFHckQsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzlDLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDN0MsSUFBSSxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsRUFBRTtZQUNsRSxXQUFXLEVBQUUsMERBQTBEO1lBQ3ZFLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztTQUN6QixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsU0FBUyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLG1CQUFtQixFQUFFO1lBQzlELFdBQVcsRUFBRSx1Q0FBdUM7WUFDcEQsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsc0JBQXNCLEVBQUU7WUFDeEUsSUFBSSxFQUFFLElBQUk7WUFDVixXQUFXLEVBQUUsMEJBQTBCO1lBQ3ZDLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FB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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type InBlock, L2Block, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
|
|
2
|
-
import { type AztecAddress,
|
|
2
|
+
import { type AztecAddress, BlockHeader } from '@aztec/circuits.js';
|
|
3
3
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
4
4
|
import { type L1Published } from '../structs/published.js';
|
|
5
5
|
/**
|
|
@@ -42,7 +42,7 @@ export declare class BlockStore {
|
|
|
42
42
|
* @param limit - The number of blocks to return.
|
|
43
43
|
* @returns The requested L2 block headers
|
|
44
44
|
*/
|
|
45
|
-
getBlockHeaders(start: number, limit: number): IterableIterator<
|
|
45
|
+
getBlockHeaders(start: number, limit: number): IterableIterator<BlockHeader>;
|
|
46
46
|
private getBlockFromBlockStorage;
|
|
47
47
|
/**
|
|
48
48
|
* Gets a tx effect.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,OAAO,EAAe,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvH,OAAO,EAA0B,KAAK,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"block_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,OAAO,EAAe,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvH,OAAO,EAA0B,KAAK,YAAY,EAAE,WAAW,EAAwB,MAAM,oBAAoB,CAAC;AAElH,OAAO,EAAE,KAAK,YAAY,EAAkD,MAAM,iBAAiB,CAAC;AAEpG,OAAO,EAAE,KAAK,WAAW,EAAwB,MAAM,yBAAyB,CAAC;AAUjF;;GAEG;AACH,qBAAa,UAAU;;IAwBT,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,YAAY;IAUpC;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0B3D;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IA2BjD;;;;;OAKG;IACF,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAMhF;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,SAAS;IAS/D;;;;;OAKG;IACF,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC;IAM7E,OAAO,CAAC,wBAAwB;IAgBhC;;;;OAIG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,SAAS;IAkB1D;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAmB1D;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,SAAS;IAIjF;;;;OAIG;IACH,mBAAmB,CAAC,eAAe,EAAE,YAAY,GAAG,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,SAAS;IAIpG;;;OAGG;IACH,uBAAuB,IAAI,MAAM;IAKjC;;;OAGG;IACH,uBAAuB,IAAI,MAAM,GAAG,SAAS;IAI7C,uBAAuB,CAAC,aAAa,EAAE,MAAM;IAI7C,sBAAsB,IAAI,MAAM;IAIhC,sBAAsB,CAAC,WAAW,EAAE,MAAM;IAI1C,sBAAsB,IAAI,MAAM,GAAG,SAAS;IAI5C,sBAAsB,CAAC,WAAW,EAAE,MAAM;CAgB3C"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
var _BlockStore_instances, _BlockStore_blocks, _BlockStore_blockBodies, _BlockStore_lastSynchedL1Block, _BlockStore_lastProvenL2Block, _BlockStore_lastProvenL2Epoch, _BlockStore_txIndex, _BlockStore_contractIndex, _BlockStore_log, _BlockStore_computeBlockRange;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { Body, L2Block, L2BlockHash, TxReceipt } from '@aztec/circuit-types';
|
|
4
|
-
import { AppendOnlyTreeSnapshot,
|
|
5
|
-
import {
|
|
4
|
+
import { AppendOnlyTreeSnapshot, BlockHeader, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
|
|
5
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
6
6
|
/**
|
|
7
7
|
* LMDB implementation of the ArchiverDataStore interface.
|
|
8
8
|
*/
|
|
@@ -24,7 +24,7 @@ export class BlockStore {
|
|
|
24
24
|
_BlockStore_txIndex.set(this, void 0);
|
|
25
25
|
/** Index mapping a contract's address (as a string) to its location in a block */
|
|
26
26
|
_BlockStore_contractIndex.set(this, void 0);
|
|
27
|
-
_BlockStore_log.set(this,
|
|
27
|
+
_BlockStore_log.set(this, createLogger('archiver:block_store'));
|
|
28
28
|
__classPrivateFieldSet(this, _BlockStore_blocks, db.openMap('archiver_blocks'), "f");
|
|
29
29
|
__classPrivateFieldSet(this, _BlockStore_blockBodies, db.openMap('archiver_block_bodies'), "f");
|
|
30
30
|
__classPrivateFieldSet(this, _BlockStore_txIndex, db.openMap('archiver_tx_index'), "f");
|
|
@@ -119,11 +119,11 @@ export class BlockStore {
|
|
|
119
119
|
*/
|
|
120
120
|
*getBlockHeaders(start, limit) {
|
|
121
121
|
for (const blockStorage of __classPrivateFieldGet(this, _BlockStore_blocks, "f").values(__classPrivateFieldGet(this, _BlockStore_instances, "m", _BlockStore_computeBlockRange).call(this, start, limit))) {
|
|
122
|
-
yield
|
|
122
|
+
yield BlockHeader.fromBuffer(blockStorage.header);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
125
125
|
getBlockFromBlockStorage(blockStorage) {
|
|
126
|
-
const header =
|
|
126
|
+
const header = BlockHeader.fromBuffer(blockStorage.header);
|
|
127
127
|
const archive = AppendOnlyTreeSnapshot.fromBuffer(blockStorage.archive);
|
|
128
128
|
const blockHash = header.hash().toString();
|
|
129
129
|
const blockBodyBuffer = __classPrivateFieldGet(this, _BlockStore_blockBodies, "f").get(blockHash);
|
|
@@ -225,4 +225,4 @@ _BlockStore_blocks = new WeakMap(), _BlockStore_blockBodies = new WeakMap(), _Bl
|
|
|
225
225
|
const end = start + limit;
|
|
226
226
|
return { start, end };
|
|
227
227
|
};
|
|
228
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
228
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"block_store.js","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/block_store.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAgB,OAAO,EAAE,WAAW,EAA8B,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACvH,OAAO,EAAE,sBAAsB,EAAqB,WAAW,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAClH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAarD;;GAEG;AACH,MAAM,OAAO,UAAU;IAwBrB,YAAoB,EAAgB;;QAAhB,OAAE,GAAF,EAAE,CAAc;QAvBpC,qCAAqC;QACrC,qCAAwC;QAExC,mCAAmC;QACnC,0CAAuC;QAEvC,+EAA+E;QAC/E,iDAA4C;QAE5C,sDAAsD;QACtD,gDAA2C;QAE3C,sDAAsD;QACtD,gDAA2C;QAE3C,8EAA8E;QAC9E,sCAA4C;QAE5C,kFAAkF;QAClF,4CAAkD;QAElD,0BAAO,YAAY,CAAC,sBAAsB,CAAC,EAAC;QAG1C,uBAAA,IAAI,sBAAW,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAA,CAAC;QAC7C,uBAAA,IAAI,2BAAgB,EAAE,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAA,CAAC;QACxD,uBAAA,IAAI,uBAAY,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAA,CAAC;QAChD,uBAAA,IAAI,6BAAkB,EAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,MAAA,CAAC;QAC5D,uBAAA,IAAI,kCAAuB,EAAE,CAAC,aAAa,CAAC,gCAAgC,CAAC,MAAA,CAAC;QAC9E,uBAAA,IAAI,iCAAsB,EAAE,CAAC,aAAa,CAAC,+BAA+B,CAAC,MAAA,CAAC;QAC5E,uBAAA,IAAI,iCAAsB,EAAE,CAAC,aAAa,CAAC,+BAA+B,CAAC,MAAA,CAAC;IAC9E,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,MAA8B;QACtC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC9B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,KAAK,uBAAA,IAAI,0BAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE;oBACvC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;oBACpC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;oBACtC,EAAE,EAAE,KAAK,CAAC,EAAE;iBACb,CAAC,CAAC;gBAEH,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;oBAC1C,KAAK,uBAAA,IAAI,2BAAS,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;gBACvE,CAAC,CAAC,CAAC;gBAEH,KAAK,uBAAA,IAAI,+BAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvF,CAAC;YAED,KAAK,uBAAA,IAAI,sCAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;YAE5E,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,YAAY,CAAC,IAAY,EAAE,cAAsB;QAC/C,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC5C,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,uBAAuB,IAAI,GAAG,CAAC,CAAC;YACxG,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC;gBAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAEzC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,uBAAuB,WAAW,mCAAmC,CAAC,CAAC;gBACzF,CAAC;gBACD,KAAK,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACrC,KAAK,uBAAA,IAAI,2BAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC;gBACH,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/C,KAAK,uBAAA,IAAI,+BAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACzC,uBAAA,IAAI,uBAAK,CAAC,KAAK,CAAC,iBAAiB,WAAW,IAAI,SAAS,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,CAAC,SAAS,CAAC,KAAa,EAAE,KAAa;QACrC,KAAK,MAAM,YAAY,IAAI,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC,uBAAA,IAAI,4DAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,WAAmB;QAC1B,MAAM,YAAY,GAAG,uBAAA,IAAI,0BAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;IACrD,CAAC;IAED;;;;;OAKG;IACH,CAAC,eAAe,CAAC,KAAa,EAAE,KAAa;QAC3C,KAAK,MAAM,YAAY,IAAI,uBAAA,IAAI,0BAAQ,CAAC,MAAM,CAAC,uBAAA,IAAI,4DAAmB,MAAvB,IAAI,EAAoB,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACtF,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,YAA0B;QACzD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC3C,MAAM,eAAe,GAAG,uBAAA,IAAI,+BAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,qCAAqC,MAAM,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,SAAS,EAAE,CAClG,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAE9C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACnD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAC,MAAc;QACxB,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnE,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACxC,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;YAChC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;SAC1C,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,MAAc;QAChC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACnE,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAE,CAAC;QAC1C,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE9C,OAAO,IAAI,SAAS,CAClB,MAAM,EACN,SAAS,CAAC,oBAAoB,CAAC,EAAE,CAAC,UAAU,CAAC,EAC7C,EAAE,EACF,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,EAC5B,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EACxC,KAAK,CAAC,IAAI,CAAC,MAAM,CAClB,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAc;QAC1B,OAAO,uBAAA,IAAI,2BAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,eAA6B;QAC/C,OAAO,uBAAA,IAAI,iCAAe,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,uBAAuB;QACrB,MAAM,CAAC,eAAe,CAAC,GAAG,uBAAA,IAAI,0BAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QACzE,OAAO,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED;;;OAGG;IACH,uBAAuB;QACrB,OAAO,uBAAA,IAAI,sCAAoB,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC;IAED,uBAAuB,CAAC,aAAqB;QAC3C,KAAK,uBAAA,IAAI,sCAAoB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC;IAED,sBAAsB;QACpB,OAAO,uBAAA,IAAI,qCAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,sBAAsB,CAAC,WAAmB;QACxC,KAAK,uBAAA,IAAI,qCAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC;IAED,sBAAsB;QACpB,OAAO,uBAAA,IAAI,qCAAmB,CAAC,GAAG,EAAE,CAAC;IACvC,CAAC;IAED,sBAAsB,CAAC,WAAmB;QACxC,KAAK,uBAAA,IAAI,qCAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC;CAcF;0bAZoB,KAAa,EAAE,KAAa;IAC7C,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,GAAG,oBAAoB,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,KAAK,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,GAAG,KAAK,CAAC;IAC1B,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC"}
|
|
@@ -33,7 +33,7 @@ export class ContractClassStore {
|
|
|
33
33
|
return value === undefined ? undefined : Fr.fromBuffer(value);
|
|
34
34
|
}
|
|
35
35
|
getContractClassIds() {
|
|
36
|
-
return Array.from(__classPrivateFieldGet(this, _ContractClassStore_contractClasses, "f").keys()).map(key => Fr.
|
|
36
|
+
return Array.from(__classPrivateFieldGet(this, _ContractClassStore_contractClasses, "f").keys()).map(key => Fr.fromHexString(key));
|
|
37
37
|
}
|
|
38
38
|
async addFunctions(contractClassId, newPrivateFunctions, newUnconstrainedFunctions) {
|
|
39
39
|
await this.db.transaction(() => {
|
|
@@ -114,4 +114,4 @@ function deserializeUnconstrainedFunction(buffer) {
|
|
|
114
114
|
artifactTreeLeafIndex: reader.readNumber(),
|
|
115
115
|
};
|
|
116
116
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3Nfc3RvcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXJjaGl2ZXIva3ZfYXJjaGl2ZXJfc3RvcmUvY29udHJhY3RfY2xhc3Nfc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBSUwsRUFBRSxFQUNGLGdCQUFnQixFQUVoQixNQUFNLEdBQ1AsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRzFGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGtCQUFrQjtJQUk3QixZQUFvQixFQUFnQjtRQUFoQixPQUFFLEdBQUYsRUFBRSxDQUFjO1FBSHBDLHNEQUEyQztRQUMzQywwREFBK0M7UUFHN0MsdUJBQUEsSUFBSSx1Q0FBb0IsRUFBRSxDQUFDLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxNQUFBLENBQUM7UUFDaEUsdUJBQUEsSUFBSSwyQ0FBd0IsRUFBRSxDQUFDLE9BQU8sQ0FBQywrQkFBK0IsQ0FBQyxNQUFBLENBQUM7SUFDMUUsQ0FBQztJQUVELEtBQUssQ0FBQyxnQkFBZ0IsQ0FDcEIsYUFBa0MsRUFDbEMsa0JBQXNCLEVBQ3RCLFdBQW1CO1FBRW5CLE1BQU0sdUJBQUEsSUFBSSwyQ0FBaUIsQ0FBQyxjQUFjLENBQ3hDLGFBQWEsQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEVBQzNCLDRCQUE0QixDQUFDLEVBQUUsR0FBRyxhQUFhLEVBQUUsYUFBYSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQy9FLENBQUM7UUFDRixNQUFNLHVCQUFBLElBQUksK0NBQXFCLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEVBQUUsa0JBQWtCLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUM3RyxDQUFDO0lBRUQsS0FBSyxDQUFDLHFCQUFxQixDQUFDLGFB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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type GetUnencryptedLogsResponse, type InBlock, type InboxLeaf, type L2Block, type LogFilter, type TxHash, type TxReceipt, type TxScopedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type Fr, type
|
|
2
|
+
import { type BlockHeader, type ContractClassPublic, type ContractInstanceWithAddress, type ExecutablePrivateFunctionWithMembershipProof, type Fr, type PrivateLog, type UnconstrainedFunctionWithMembershipProof } from '@aztec/circuits.js';
|
|
3
3
|
import { type ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
|
|
4
4
|
import { type AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { type AztecKVStore } from '@aztec/kv-store';
|
|
@@ -55,7 +55,7 @@ export declare class KVArchiverDataStore implements ArchiverDataStore {
|
|
|
55
55
|
* @param limit - The number of blocks to return.
|
|
56
56
|
* @returns The requested L2 blocks
|
|
57
57
|
*/
|
|
58
|
-
getBlockHeaders(start: number, limit: number): Promise<
|
|
58
|
+
getBlockHeaders(start: number, limit: number): Promise<BlockHeader[]>;
|
|
59
59
|
/**
|
|
60
60
|
* Gets a tx effect.
|
|
61
61
|
* @param txHash - The txHash of the tx corresponding to the tx effect.
|
|
@@ -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,KAAK,0BAA0B,EAC/B,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAChC,KAAK,4CAA4C,EACjD,KAAK,EAAE,EACP,KAAK,
|
|
1
|
+
{"version":3,"file":"kv_archiver_store.d.ts","sourceRoot":"","sources":["../../../src/archiver/kv_archiver_store/kv_archiver_store.ts"],"names":[],"mappings":"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"}
|