refactor: type-safe config

yarn-project/archiver/src/config.ts

@@ -50,7 +50,7 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
   },
   archiverStoreMapSizeKb: {
     env: 'ARCHIVER_STORE_MAP_SIZE_KB',
-    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    parseEnv: (val: string) => +val,
     description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
   skipValidateCheckpointAttestations: {

yarn-project/aztec/src/cli/aztec_start_options.ts

@@ -36,7 +36,7 @@ export interface AztecStartOption {
   parseVal?: (val: string) => any;
 }
 
-export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping>) => {
+export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping<unknown>>) => {
   const options: AztecStartOption[] = [];
   for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(
     configMappings,
@@ -58,7 +58,11 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
   return options;
 };
 
-const configToFlag = (flag: string, configMapping: ConfigMapping, overrideDefaultValue?: any): AztecStartOption => {
+const configToFlag = (
+  flag: string,
+  configMapping: ConfigMapping<unknown>,
+  overrideDefaultValue?: any,
+): AztecStartOption => {
   if (!configMapping.isBoolean) {
     flag += ' <value>';
   }

yarn-project/aztec/src/cli/cmds/start_archiver.ts

@@ -20,7 +20,13 @@ export async function startArchiver(
   const envConfig = getArchiverConfigFromEnv();
   const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
     options,
-    { ...archiverConfigMappings, ...dataConfigMappings, ...blobClientConfigMapping },
+    {
+      // dataConfigMappings must come first: its l1Contracts only maps rollupAddress,
+      // while archiverConfigMappings (spread later) maps all L1 contract addresses.
+      ...dataConfigMappings,
+      ...archiverConfigMappings,
+      ...blobClientConfigMapping,
+    },
     'archiver',
   );
 

yarn-project/blob-client/src/client/config.ts

@@ -93,7 +93,7 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobSinkMapSizeKb: {
     env: 'BLOB_SINK_MAP_SIZE_KB',
     description: 'The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.',
-    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    parseEnv: (val: string) => +val,
   },
   blobAllowEmptySources: {
     env: 'BLOB_ALLOW_EMPTY_SOURCES',
@@ -116,7 +116,7 @@ export const blobClientConfigMapping: ConfigMappingsType<BlobClientConfig> = {
   blobHealthcheckUploadIntervalMinutes: {
     env: 'BLOB_HEALTHCHECK_UPLOAD_INTERVAL_MINUTES',
     description: 'Interval in minutes for uploading healthcheck file to file store (default: 60 = 1 hour)',
-    parseEnv: (val: string | undefined) => (val ? +val : undefined),
+    parseEnv: (val: string) => +val,
   },
   l1HttpTimeoutMS: {
     env: 'ETHEREUM_HTTP_TIMEOUT_MS',

yarn-project/foundation/src/config/config.test.ts

@@ -154,14 +154,32 @@ describe('Config', () => {
       expect(parseEnv!('2.5e5')).toBe(250000n);
     });
 
-    it('returns default value for empty string', () => {
-      const { parseEnv } = bigintConfigHelper(42n);
-      expect(parseEnv!('')).toBe(42n);
-    });
-
     it('throws for non-integer scientific notation results', () => {
       const { parseEnv } = bigintConfigHelper();
       expect(() => parseEnv!('1e-3')).toThrow();
     });
+
+    it('returns default value for empty string env var', () => {
+      const originalEnv = process.env;
+      process.env = { ...originalEnv, L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI: '' };
+      try {
+        interface TestConfig {
+          value: bigint;
+        }
+        const config = getConfigFromMappings<TestConfig>({
+          value: {
+            env: 'L1_MINIMUM_PRIORITY_FEE_PER_GAS_GWEI',
+            description: 'test',
+            parseEnv: () => {
+              throw new Error('parseEnv should not be called for empty string');
+            },
+            defaultValue: 42n,
+          },
+        });
+        expect(config.value).toBe(42n);
+      } finally {
+        process.env = originalEnv;
+      }
+    });
   });
 });