@aztec/archiver 0.75.0 → 0.76.1
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/config.d.ts +3 -1
- package/dest/archiver/config.d.ts.map +1 -1
- package/dest/archiver/config.js +5 -1
- package/dest/archiver/data_retrieval.d.ts.map +1 -1
- package/dest/archiver/data_retrieval.js +2 -2
- package/dest/factory.d.ts.map +1 -1
- package/dest/factory.js +5 -3
- package/dest/rpc/index.d.ts +7 -2
- package/dest/rpc/index.d.ts.map +1 -1
- package/dest/rpc/index.js +8 -4
- package/package.json +14 -12
- package/src/archiver/config.ts +7 -1
- package/src/archiver/data_retrieval.ts +1 -1
- package/src/factory.ts +7 -3
- package/src/rpc/index.ts +16 -3
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { type BlobSinkConfig } from '@aztec/blob-sink/client';
|
|
2
|
+
import { type ChainConfig } from '@aztec/circuit-types/config';
|
|
1
3
|
import { type L1ContractAddresses, type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
|
|
2
4
|
import { type ConfigMappingsType } from '@aztec/foundation/config';
|
|
3
5
|
/**
|
|
@@ -24,7 +26,7 @@ export type ArchiverConfig = {
|
|
|
24
26
|
l1Contracts: L1ContractAddresses;
|
|
25
27
|
/** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
|
|
26
28
|
maxLogs?: number;
|
|
27
|
-
} & L1ReaderConfig & L1ContractsConfig;
|
|
29
|
+
} & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
|
|
28
30
|
export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
|
|
29
31
|
/**
|
|
30
32
|
* Returns the archiver configuration from the environment variables.
|
|
@@ -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,qCAAqC;IACrC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,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,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/archiver/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,6BAA6B,CAAC;AACpF,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,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,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,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,cAAc,GAChB,iBAAiB,GACjB,cAAc,GACd,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAmCrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD"}
|
package/dest/archiver/config.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
|
|
2
|
+
import { chainConfigMappings } from '@aztec/circuit-types/config';
|
|
1
3
|
import { l1ContractsConfigMappings, l1ReaderConfigMappings, } from '@aztec/ethereum';
|
|
2
4
|
import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
|
|
3
5
|
export const archiverConfigMappings = {
|
|
6
|
+
...blobSinkConfigMapping,
|
|
4
7
|
archiverUrl: {
|
|
5
8
|
env: 'ARCHIVER_URL',
|
|
6
9
|
description: 'URL for an archiver service. If set, will return an archiver client as opposed to starting a new one.',
|
|
@@ -25,6 +28,7 @@ export const archiverConfigMappings = {
|
|
|
25
28
|
description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
|
|
26
29
|
...numberConfigHelper(1000),
|
|
27
30
|
},
|
|
31
|
+
...chainConfigMappings,
|
|
28
32
|
...l1ReaderConfigMappings,
|
|
29
33
|
viemPollingIntervalMS: {
|
|
30
34
|
env: 'ARCHIVER_VIEM_POLLING_INTERVAL_MS',
|
|
@@ -41,4 +45,4 @@ export const archiverConfigMappings = {
|
|
|
41
45
|
export function getArchiverConfigFromEnv() {
|
|
42
46
|
return getConfigFromMappings(archiverConfigMappings);
|
|
43
47
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FyY2hpdmVyL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLHFCQUFxQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckYsT0FBTyxFQUFvQixtQkFBbUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3BGLE9BQU8sRUFJTCx5QkFBeUIsRUFDekIsc0JBQXNCLEdBQ3ZCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUEyQixxQkFBcUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBc0M5RyxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBdUM7SUFDeEUsR0FBRyxxQkFBcUI7SUFDeEIsV0FBVyxFQUFFO1FBQ1gsR0FBRyxFQUFFLGNBQWM7UUFDbkIsV0FBVyxFQUNULHVHQUF1RztLQUMxRztJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSx1QkFBdUI7UUFDNUIsV0FBVyxFQUFFLGlDQUFpQztRQUM5QyxRQUFRLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLEdBQUc7S0FDL0I7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsOEJBQThCO1FBQ25DLFdBQVcsRUFBRSw2RUFBNkU7UUFDMUYsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSwwRUFBMEU7UUFDdkYsR0FBRyxrQkFBa0IsQ0FBQyxHQUFHLENBQUM7S0FDM0I7SUFDRCxPQUFPLEVBQUU7UUFDUCxHQUFHLEVBQUUsbUJBQW1CO1FBQ3hCLFdBQVcsRUFBRSx3RUFBd0U7UUFDckYsR0FBRyxrQkFBa0IsQ0FBQyxJQUFLLENBQUM7S0FDN0I7SUFDRCxHQUFHLG1CQUFtQjtJQUN0QixHQUFHLHNCQUFzQjtJQUN6QixxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUNBQW1DO1FBQ3hDLFdBQVcsRUFBRSxzQ0FBc0M7UUFDbkQsR0FBRyxrQkFBa0IsQ0FBQyxJQUFJLENBQUM7S0FDNUI7SUFDRCxHQUFHLHlCQUF5QjtDQUM3QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx3QkFBd0I7SUFDdEMsT0FBTyxxQkFBcUIsQ0FBaUIsc0JBQXNCLENBQUMsQ0FBQztBQUN2RSxDQUFDIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
|
|
1
2
|
import { Body, InboxLeaf, L2Block } from '@aztec/circuit-types';
|
|
2
3
|
import { AppendOnlyTreeSnapshot, BlockHeader, Fr, Proof } from '@aztec/circuits.js';
|
|
3
4
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
4
|
-
import { Blob, BlobDeserializationError } from '@aztec/foundation/blob';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { numToUInt32BE } from '@aztec/foundation/serialize';
|
|
7
7
|
import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
@@ -285,4 +285,4 @@ export async function getProofFromSubmitProofTx(publicClient, txHash, expectedPr
|
|
|
285
285
|
proof,
|
|
286
286
|
};
|
|
287
287
|
}
|
|
288
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_retrieval.js","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
|
288
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"data_retrieval.js","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
|
package/dest/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,OAAO,EAAmC,MAAM,sBAAsB,CAAC;AAQvG,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAGnF,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,cAAc,EAAE,uBAAuB,EACvC,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,EAC5D,SAAS,GAAE,eAAsC,GAChD,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAavC"}
|
package/dest/factory.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { getComponentsVersionsFromConfig } from '@aztec/circuit-types';
|
|
1
2
|
import { computePublicBytecodeCommitment, getContractClassFromArtifact, } from '@aztec/circuits.js';
|
|
2
3
|
import { FunctionType, decodeFunctionSignature } from '@aztec/foundation/abi';
|
|
3
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
5
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
5
6
|
import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
|
|
6
7
|
import { TokenBridgeContractArtifact } from '@aztec/noir-contracts.js/TokenBridge';
|
|
7
|
-
import {
|
|
8
|
+
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
|
|
9
|
+
import { protocolContractNames, protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
8
10
|
import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle';
|
|
9
11
|
import { getTelemetryClient } from '@aztec/telemetry-client';
|
|
10
12
|
import { Archiver } from './archiver/archiver.js';
|
|
@@ -19,7 +21,7 @@ export async function createArchiver(config, blobSinkClient, opts = { blockUntil
|
|
|
19
21
|
return Archiver.createAndSync(config, archiverStore, { telemetry, blobSinkClient }, opts.blockUntilSync);
|
|
20
22
|
}
|
|
21
23
|
else {
|
|
22
|
-
return createArchiverClient(config.archiverUrl);
|
|
24
|
+
return createArchiverClient(config.archiverUrl, getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()));
|
|
23
25
|
}
|
|
24
26
|
}
|
|
25
27
|
async function registerProtocolContracts(store) {
|
|
@@ -56,4 +58,4 @@ async function registerCommonContracts(store) {
|
|
|
56
58
|
const bytecodeCommitments = await Promise.all(classes.map(x => computePublicBytecodeCommitment(x.packedBytecode)));
|
|
57
59
|
await store.addContractClasses(classes, bytecodeCommitments, blockNumber);
|
|
58
60
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9mYWN0b3J5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBa0MsK0JBQStCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RyxPQUFPLEVBRUwsK0JBQStCLEVBQy9CLDRCQUE0QixHQUM3QixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxZQUFZLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHckQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3RELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUN4RSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsd0JBQXdCLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM1RixPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNoRixPQUFPLEVBQXdCLGtCQUFrQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFbkYsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWxELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQzFELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXRELE1BQU0sQ0FBQyxLQUFLLFVBQVUsY0FBYyxDQUNsQyxNQUF3QyxFQUN4QyxjQUF1QyxFQUN2QyxPQUFvQyxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsRUFDNUQsWUFBNkIsa0JBQWtCLEVBQUU7SUFFakQsSUFBSSxDQUFDLE1BQU0s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
|
package/dest/rpc/index.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import { type ArchiverApi } from '@aztec/circuit-types';
|
|
2
|
-
export declare function createArchiverClient(url: string, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<
|
|
1
|
+
import { type ArchiverApi, type ComponentsVersions } from '@aztec/circuit-types';
|
|
2
|
+
export declare function createArchiverClient(url: string, versions: Partial<ComponentsVersions>, fetch?: (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, extraHeaders?: Record<string, string> | undefined, noRetry?: boolean | undefined) => Promise<{
|
|
3
|
+
response: any;
|
|
4
|
+
headers: {
|
|
5
|
+
get: (header: string) => string | null | undefined;
|
|
6
|
+
};
|
|
7
|
+
}>): ArchiverApi;
|
|
3
8
|
export declare function createArchiverRpcServer(handler: ArchiverApi): import("@aztec/foundation/json-rpc/server").SafeJsonRpcServer;
|
|
4
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dest/rpc/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,kBAAkB,EAExB,MAAM,sBAAsB,CAAC;AAI9B,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACrC,KAAK;;;;;EAAmC,GACvC,WAAW,CAMb;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,WAAW,iEAE3D"}
|
package/dest/rpc/index.js
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
|
-
import { ArchiverApiSchema } from '@aztec/circuit-types';
|
|
1
|
+
import { ArchiverApiSchema, getVersioningResponseHandler, } from '@aztec/circuit-types';
|
|
2
2
|
import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
|
|
3
3
|
import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
|
|
4
|
-
export function createArchiverClient(url, fetch = makeTracedFetch([1, 2, 3], true)) {
|
|
5
|
-
return createSafeJsonRpcClient(url, ArchiverApiSchema,
|
|
4
|
+
export function createArchiverClient(url, versions, fetch = makeTracedFetch([1, 2, 3], true)) {
|
|
5
|
+
return createSafeJsonRpcClient(url, ArchiverApiSchema, {
|
|
6
|
+
namespaceMethods: 'archiver',
|
|
7
|
+
fetch,
|
|
8
|
+
onResponse: getVersioningResponseHandler(versions),
|
|
9
|
+
});
|
|
6
10
|
}
|
|
7
11
|
export function createArchiverRpcServer(handler) {
|
|
8
12
|
return createTracedJsonRpcServer(handler, ArchiverApiSchema);
|
|
9
13
|
}
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcnBjL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFFTCxpQkFBaUIsRUFFakIsNEJBQTRCLEdBQzdCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDNUUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJGLE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsR0FBVyxFQUNYLFFBQXFDLEVBQ3JDLEtBQUssR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQztJQUV4QyxPQUFPLHVCQUF1QixDQUFjLEdBQUcsRUFBRSxpQkFBaUIsRUFBRTtRQUNsRSxnQkFBZ0IsRUFBRSxVQUFVO1FBQzVCLEtBQUs7UUFDTCxVQUFVLEVBQUUsNEJBQTRCLENBQUMsUUFBUSxDQUFDO0tBQ25ELENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsT0FBb0I7SUFDMUQsT0FBTyx5QkFBeUIsQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUMvRCxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/archiver",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.76.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -64,17 +64,19 @@
|
|
|
64
64
|
]
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@aztec/blob-
|
|
68
|
-
"@aztec/
|
|
69
|
-
"@aztec/
|
|
70
|
-
"@aztec/
|
|
71
|
-
"@aztec/
|
|
72
|
-
"@aztec/
|
|
73
|
-
"@aztec/
|
|
74
|
-
"@aztec/
|
|
75
|
-
"@aztec/
|
|
76
|
-
"@aztec/
|
|
77
|
-
"@aztec/
|
|
67
|
+
"@aztec/blob-lib": "0.76.1",
|
|
68
|
+
"@aztec/blob-sink": "0.76.1",
|
|
69
|
+
"@aztec/circuit-types": "0.76.1",
|
|
70
|
+
"@aztec/circuits.js": "0.76.1",
|
|
71
|
+
"@aztec/ethereum": "0.76.1",
|
|
72
|
+
"@aztec/foundation": "0.76.1",
|
|
73
|
+
"@aztec/kv-store": "0.76.1",
|
|
74
|
+
"@aztec/l1-artifacts": "0.76.1",
|
|
75
|
+
"@aztec/noir-contracts.js": "0.76.1",
|
|
76
|
+
"@aztec/noir-protocol-circuits-types": "0.76.1",
|
|
77
|
+
"@aztec/protocol-contracts": "0.76.1",
|
|
78
|
+
"@aztec/telemetry-client": "0.76.1",
|
|
79
|
+
"@aztec/types": "0.76.1",
|
|
78
80
|
"debug": "^4.3.4",
|
|
79
81
|
"lodash.groupby": "^4.6.0",
|
|
80
82
|
"lodash.omit": "^4.5.0",
|
package/src/archiver/config.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { type BlobSinkConfig, blobSinkConfigMapping } from '@aztec/blob-sink/client';
|
|
2
|
+
import { type ChainConfig, chainConfigMappings } from '@aztec/circuit-types/config';
|
|
1
3
|
import {
|
|
2
4
|
type L1ContractAddresses,
|
|
3
5
|
type L1ContractsConfig,
|
|
@@ -39,9 +41,12 @@ export type ArchiverConfig = {
|
|
|
39
41
|
/** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
|
|
40
42
|
maxLogs?: number;
|
|
41
43
|
} & L1ReaderConfig &
|
|
42
|
-
L1ContractsConfig
|
|
44
|
+
L1ContractsConfig &
|
|
45
|
+
BlobSinkConfig &
|
|
46
|
+
ChainConfig;
|
|
43
47
|
|
|
44
48
|
export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
|
|
49
|
+
...blobSinkConfigMapping,
|
|
45
50
|
archiverUrl: {
|
|
46
51
|
env: 'ARCHIVER_URL',
|
|
47
52
|
description:
|
|
@@ -67,6 +72,7 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
|
|
|
67
72
|
description: 'The max number of logs that can be obtained in 1 "getPublicLogs" call.',
|
|
68
73
|
...numberConfigHelper(1_000),
|
|
69
74
|
},
|
|
75
|
+
...chainConfigMappings,
|
|
70
76
|
...l1ReaderConfigMappings,
|
|
71
77
|
viemPollingIntervalMS: {
|
|
72
78
|
env: 'ARCHIVER_VIEM_POLLING_INTERVAL_MS',
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
|
|
1
2
|
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
|
|
2
3
|
import { Body, InboxLeaf, L2Block } from '@aztec/circuit-types';
|
|
3
4
|
import { AppendOnlyTreeSnapshot, BlockHeader, Fr, Proof } from '@aztec/circuits.js';
|
|
4
5
|
import { asyncPool } from '@aztec/foundation/async-pool';
|
|
5
|
-
import { Blob, BlobDeserializationError } from '@aztec/foundation/blob';
|
|
6
6
|
import { type EthAddress } from '@aztec/foundation/eth-address';
|
|
7
7
|
import { type ViemSignature } from '@aztec/foundation/eth-signature';
|
|
8
8
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
package/src/factory.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
|
|
2
|
-
import { type ArchiverApi, type Service } from '@aztec/circuit-types';
|
|
2
|
+
import { type ArchiverApi, type Service, getComponentsVersionsFromConfig } from '@aztec/circuit-types';
|
|
3
3
|
import {
|
|
4
4
|
type ContractClassPublic,
|
|
5
5
|
computePublicBytecodeCommitment,
|
|
@@ -12,7 +12,8 @@ import { type DataStoreConfig } from '@aztec/kv-store/config';
|
|
|
12
12
|
import { createStore } from '@aztec/kv-store/lmdb-v2';
|
|
13
13
|
import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
|
|
14
14
|
import { TokenBridgeContractArtifact } from '@aztec/noir-contracts.js/TokenBridge';
|
|
15
|
-
import {
|
|
15
|
+
import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
|
|
16
|
+
import { protocolContractNames, protocolContractTreeRoot } from '@aztec/protocol-contracts';
|
|
16
17
|
import { getCanonicalProtocolContract } from '@aztec/protocol-contracts/bundle';
|
|
17
18
|
import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
|
|
18
19
|
|
|
@@ -34,7 +35,10 @@ export async function createArchiver(
|
|
|
34
35
|
await registerCommonContracts(archiverStore);
|
|
35
36
|
return Archiver.createAndSync(config, archiverStore, { telemetry, blobSinkClient }, opts.blockUntilSync);
|
|
36
37
|
} else {
|
|
37
|
-
return createArchiverClient(
|
|
38
|
+
return createArchiverClient(
|
|
39
|
+
config.archiverUrl,
|
|
40
|
+
getComponentsVersionsFromConfig(config, protocolContractTreeRoot, getVKTreeRoot()),
|
|
41
|
+
);
|
|
38
42
|
}
|
|
39
43
|
}
|
|
40
44
|
|
package/src/rpc/index.ts
CHANGED
|
@@ -1,9 +1,22 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
type ArchiverApi,
|
|
3
|
+
ArchiverApiSchema,
|
|
4
|
+
type ComponentsVersions,
|
|
5
|
+
getVersioningResponseHandler,
|
|
6
|
+
} from '@aztec/circuit-types';
|
|
2
7
|
import { createSafeJsonRpcClient } from '@aztec/foundation/json-rpc/client';
|
|
3
8
|
import { createTracedJsonRpcServer, makeTracedFetch } from '@aztec/telemetry-client';
|
|
4
9
|
|
|
5
|
-
export function createArchiverClient(
|
|
6
|
-
|
|
10
|
+
export function createArchiverClient(
|
|
11
|
+
url: string,
|
|
12
|
+
versions: Partial<ComponentsVersions>,
|
|
13
|
+
fetch = makeTracedFetch([1, 2, 3], true),
|
|
14
|
+
): ArchiverApi {
|
|
15
|
+
return createSafeJsonRpcClient<ArchiverApi>(url, ArchiverApiSchema, {
|
|
16
|
+
namespaceMethods: 'archiver',
|
|
17
|
+
fetch,
|
|
18
|
+
onResponse: getVersioningResponseHandler(versions),
|
|
19
|
+
});
|
|
7
20
|
}
|
|
8
21
|
|
|
9
22
|
export function createArchiverRpcServer(handler: ArchiverApi) {
|