Skip to content

fix: Load config from env on archiver start #12662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spalladino merged 1 commit into from
Mar 11, 2025
Merged

fix: Load config from env on archiver start #12662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions yarn-project/aztec/src/cli/cmds/start_archiver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import { Archiver, type ArchiverConfig, KVArchiverDataStore, archiverConfigMappings } from '@aztec/archiver';
import {
Archiver,
type ArchiverConfig,
KVArchiverDataStore,
archiverConfigMappings,
getArchiverConfigFromEnv,
} from '@aztec/archiver';
import { createLogger } from '@aztec/aztec.js';
import { createBlobSinkClient } from '@aztec/blob-sink/client';
import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
import { type DataStoreConfig, dataConfigMappings, getDataConfigFromEnv } from '@aztec/kv-store/config';
import { createStore } from '@aztec/kv-store/lmdb-v2';
import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
Expand All @@ -18,27 +24,27 @@ export async function startArchiver(
signalHandlers: (() => Promise<void>)[],
services: NamespacedApiHandlers,
): Promise<{ config: ArchiverConfig & DataStoreConfig }> {
let archiverConfig = extractRelevantOptions<ArchiverConfig & DataStoreConfig>(
const envConfig = { ...getArchiverConfigFromEnv(), ...getDataConfigFromEnv() };
const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig>(
options,
{
...archiverConfigMappings,
...dataConfigMappings,
},
{ ...archiverConfigMappings, ...dataConfigMappings },
'archiver',
);

let archiverConfig = { ...envConfig, ...cliOptions };

if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
throw new Error('L1 registry address is required to start an Archiver');
}

const { addresses, config } = await getL1Config(
const { addresses, config: l1Config } = await getL1Config(
archiverConfig.l1Contracts.registryAddress,
archiverConfig.l1RpcUrls,
archiverConfig.l1ChainId,
);

archiverConfig.l1Contracts = addresses;
archiverConfig = { ...archiverConfig, ...config };
archiverConfig = { ...archiverConfig, ...l1Config };

const storeLog = createLogger('archiver:lmdb');
const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
Expand Down