@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/cli/aztec_start_options.js

@@ -1,18 +1,23 @@
 import { archiverConfigMappings } from '@aztec/archiver/config';
-import { faucetConfigMapping } from '@aztec/aztec-faucet/config';
 import { sequencerClientConfigMappings } from '@aztec/aztec-node/config';
 import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
 import { botConfigMappings } from '@aztec/bot/config';
+import { l1ContractAddressesMapping, l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
+import { getKeys } from '@aztec/foundation/collection';
 import { booleanConfigHelper, isBooleanConfigValue, omitConfigMappings } from '@aztec/foundation/config';
+import { dataConfigMappings } from '@aztec/kv-store/config';
+import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { proverNodeConfigMappings } from '@aztec/prover-node/config';
 import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { chainConfigMappings } from '@aztec/stdlib/config';
 import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { worldStateConfigMappings } from '@aztec/world-state';
 import { DefaultMnemonic } from '../mnemonic.js';
 export const getOptions = (namespace, configMappings)=>{
     const options = [];
-    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault }] of Object.entries(configMappings)){
+    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(configMappings)){
         if (universalOptions.includes(key)) {
             continue;
         }
@@ -22,132 +27,123 @@ export const getOptions = (namespace, configMappings)=>{
             description,
             defaultValue: def,
             printDefault,
-            envVar: env,
+            env: env,
+            fallback,
             parseVal: parseEnv
         });
     }
     return options;
 };
+const configToFlag = (flag, configMapping, overrideDefaultValue)=>{
+    if (!configMapping.isBoolean) {
+        flag += ' <value>';
+    }
+    const flagConfig = {
+        flag,
+        env: undefined,
+        defaultValue: undefined,
+        parseVal: configMapping.parseEnv,
+        ...configMapping
+    };
+    if (overrideDefaultValue !== undefined) {
+        flagConfig.defaultValue = overrideDefaultValue;
+    }
+    return flagConfig;
+};
 // These are options used by multiple modules so should be inputted once
 export const universalOptions = [
-    'l1RpcUrls',
-    'l1ChainId',
-    'l1Contracts',
+    'l1ConsensusHostUrls',
+    'l1ConsensusHostApiKeys',
+    'l1ConsensusHostApiKeyHeaders',
     'p2pEnabled',
-    'dataDirectory'
+    ...getKeys(chainConfigMappings),
+    ...getKeys(l1ContractsConfigMappings),
+    ...getKeys(l1ContractAddressesMapping),
+    ...getKeys(l1ReaderConfigMappings),
+    ...getKeys(dataConfigMappings),
+    ...getKeys(worldStateConfigMappings)
 ];
+export const NETWORK_FLAG = 'network';
 // Define categories and options
 export const aztecStartOptions = {
-    NETWORK: [
+    MISC: [
         {
-            flag: '--network <value>',
+            flag: `--${NETWORK_FLAG} <value>`,
             description: 'Network to run Aztec on',
             defaultValue: undefined,
-            envVar: 'NETWORK'
-        }
+            env: 'NETWORK'
+        },
+        configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
+        configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
+        configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
+        configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls)
     ],
     SANDBOX: [
         {
             flag: '--sandbox',
             description: 'Starts Aztec Sandbox',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         {
-            flag: '--sandbox.testAccounts',
-            description: 'Deploy test accounts on sandbox start',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper(true)
+            flag: '--sandbox.l1Mnemonic <value>',
+            description: 'Mnemonic for L1 accounts. Will be used ',
+            defaultValue: DefaultMnemonic,
+            env: 'MNEMONIC'
         },
         {
-            flag: '--sandbox.noPXE',
-            description: 'Do not expose PXE service on sandbox start',
-            envVar: 'NO_PXE',
-            ...booleanConfigHelper()
+            flag: '--sandbox.deployAztecContractsSalt <value>',
+            description: 'Numeric salt for deploying L1 Aztec contracts before starting the sandbox. Needs mnemonic or private key to be set.',
+            env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
+            defaultValue: undefined,
+            parseVal: (val)=>val ? parseInt(val) : undefined
         }
     ],
     API: [
         {
             flag: '--port <value>',
-            description: 'Port to run the Aztec Services on on',
+            description: 'Port to run the Aztec Services on',
             defaultValue: 8080,
-            envVar: 'AZTEC_PORT',
+            env: 'AZTEC_PORT',
+            parseVal: (val)=>parseInt(val, 10)
+        },
+        {
+            flag: '--admin-port <value>',
+            description: 'Port to run admin APIs of Aztec Services on',
+            defaultValue: 8880,
+            env: 'AZTEC_ADMIN_PORT',
             parseVal: (val)=>parseInt(val, 10)
         },
         {
             flag: '--api-prefix <value>',
             description: 'Prefix for API routes on any service that is started',
             defaultValue: '',
-            envVar: 'API_PREFIX'
+            env: 'API_PREFIX'
         }
     ],
     ETHEREUM: [
-        {
-            flag: '--l1-rpc-urls <value>',
-            description: 'List of URLs of the Ethereum RPC nodes that services will connect to (comma separated)',
-            defaultValue: [
-                'http://localhost:8545'
-            ],
-            envVar: 'ETHEREUM_HOSTS',
-            parseVal: (val)=>val.split(',').map((url)=>url.trim())
-        },
-        {
-            flag: '--l1-chain-id <value>',
-            description: 'The L1 chain ID',
-            defaultValue: 31337,
-            envVar: 'L1_CHAIN_ID',
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        {
-            flag: '--l1-mnemonic <value>',
-            description: 'Mnemonic for L1 accounts. Will be used if no publisher private keys are provided',
-            defaultValue: DefaultMnemonic,
-            envVar: 'MNEMONIC'
-        }
+        configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
+        // Do not set default for CLI: keep undefined unless provided via flag or env
+        configToFlag('--l1-rpc-urls', {
+            ...l1ReaderConfigMappings.l1RpcUrls,
+            defaultValue: undefined
+        }),
+        configToFlag('--l1-consensus-host-urls', blobSinkConfigMappings.l1ConsensusHostUrls),
+        configToFlag('--l1-consensus-host-api-keys', blobSinkConfigMappings.l1ConsensusHostApiKeys),
+        configToFlag('--l1-consensus-host-api-key-headers', blobSinkConfigMappings.l1ConsensusHostApiKeyHeaders)
     ],
-    'L1 CONTRACT ADDRESSES': [
-        {
-            flag: '--rollup-address <value>',
-            description: 'The deployed L1 rollup contract address',
-            defaultValue: undefined,
-            envVar: 'ROLLUP_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--registry-address <value>',
-            description: 'The deployed L1 registry contract address',
-            defaultValue: undefined,
-            envVar: 'REGISTRY_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--inbox-address <value>',
-            description: 'The deployed L1 -> L2 inbox contract address',
-            defaultValue: undefined,
-            envVar: 'INBOX_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--outbox-address <value>',
-            description: 'The deployed L2 -> L1 outbox contract address',
-            defaultValue: undefined,
-            envVar: 'OUTBOX_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--fee-juice-address <value>',
-            description: 'The deployed L1 Fee Juice contract address',
-            defaultValue: undefined,
-            envVar: 'FEE_JUICE_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--staking-asset-address <value>',
-            description: 'The deployed L1 Staking Asset contract address',
-            defaultValue: undefined,
-            envVar: 'STAKING_ASSET_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--fee-juice-portal-address <value>',
-            description: 'The deployed L1 Fee Juice portal contract address',
-            defaultValue: undefined,
-            envVar: 'FEE_JUICE_PORTAL_CONTRACT_ADDRESS'
-        }
+    'L1 CONTRACTS': [
+        configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
+        configToFlag('--rollup-version', chainConfigMappings.rollupVersion)
+    ],
+    STORAGE: [
+        configToFlag('--data-directory', dataConfigMappings.dataDirectory),
+        configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKb)
+    ],
+    'WORLD STATE': [
+        configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),
+        configToFlag('--world-state-db-map-size-kb', worldStateConfigMappings.worldStateDbMapSizeKb),
+        configToFlag('--world-state-block-history', worldStateConfigMappings.worldStateBlockHistory)
     ],
     // We can't easily auto-generate node options as they're parts of modules defined below
     'AZTEC NODE': [
@@ -155,106 +151,38 @@ export const aztecStartOptions = {
             flag: '--node',
             description: 'Starts Aztec Node with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--data-directory <value>',
-            description: 'Where to store data. If not set, will store temporarily',
-            defaultValue: undefined,
-            envVar: 'DATA_DIRECTORY'
-        },
-        {
-            flag: '--node.archiverUrl <value>',
-            description: 'URL for an archiver service',
-            defaultValue: undefined,
-            envVar: 'ARCHIVER_URL'
-        },
-        {
-            flag: '--node.deployAztecContracts',
-            description: 'Deploys L1 Aztec contracts before starting the node. Needs mnemonic or private key to be set.',
-            envVar: 'DEPLOY_AZTEC_CONTRACTS',
-            defaultValue: undefined
-        },
-        {
-            flag: '--node.deployAztecContractsSalt <value>',
-            description: 'Numeric salt for deploying L1 Aztec contracts before starting the node. Needs mnemonic or private key to be set. Implies --node.deployAztecContracts.',
-            envVar: 'DEPLOY_AZTEC_CONTRACTS_SALT',
-            defaultValue: undefined,
-            parseVal: (val)=>val ? parseInt(val) : undefined
-        },
-        {
-            flag: '--node.assumeProvenThroughBlockNumber <value>',
-            description: 'Cheats the rollup contract into assuming every block until this one is proven. Useful for speeding up bootstraps.',
-            envVar: 'ASSUME_PROVEN_THROUGH_BLOCK_NUMBER',
-            parseVal: (val)=>parseInt(val, 10),
-            defaultValue: 0
-        },
-        {
-            flag: '--node.publisherPrivateKey <value>',
-            description: 'Private key of account for publishing L1 contracts',
-            defaultValue: undefined,
-            envVar: 'L1_PRIVATE_KEY'
-        },
-        {
-            flag: '--node.worldStateBlockCheckIntervalMS <value>',
-            description: 'Frequency in which to check for blocks in ms',
-            defaultValue: 100,
-            envVar: 'WS_BLOCK_CHECK_INTERVAL_MS',
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        {
-            flag: '--node.testAccounts',
-            description: 'Populate genesis state with initial fee juice for test accounts',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper()
+            env: undefined
         }
     ],
-    'P2P SUBSYSTEM': [
-        {
-            flag: '--p2p-enabled',
-            description: 'Enable P2P subsystem',
-            envVar: 'P2P_ENABLED',
-            ...booleanConfigHelper()
-        },
-        ...getOptions('p2p', p2pConfigMappings)
-    ],
-    TELEMETRY: [
-        ...getOptions('tel', telemetryClientConfigMappings)
-    ],
-    PXE: [
-        {
-            flag: '--pxe',
-            description: 'Starts Aztec PXE with options',
-            defaultValue: undefined,
-            envVar: undefined
-        },
-        ...getOptions('pxe', allPxeConfigMappings)
-    ],
     ARCHIVER: [
         {
             flag: '--archiver',
             description: 'Starts Aztec Archiver with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
-        // filter out archiverUrl as it's passed separately in --node & --prover-node
-        ...getOptions('archiver', archiverConfigMappings).filter((opt)=>!opt.flag.includes('archiverUrl'))
+        ...getOptions('archiver', omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings)))
     ],
     SEQUENCER: [
         {
             flag: '--sequencer',
             description: 'Starts Aztec Sequencer with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
-        ...getOptions('sequencer', sequencerClientConfigMappings)
+        ...getOptions('sequencer', omitConfigMappings(sequencerClientConfigMappings, [
+            'fakeProcessingDelayPerTxMs',
+            'skipCollectingAttestations',
+            'skipInvalidateBlockAsProposer',
+            'blobSinkMapSizeKb'
+        ]))
     ],
-    BLOB_SINK: [
+    'BLOB SINK': [
         {
             flag: '--blob-sink',
             description: 'Starts Aztec Blob Sink with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('blobSink', blobSinkConfigMappings)
     ],
@@ -263,19 +191,16 @@ export const aztecStartOptions = {
             flag: '--prover-node',
             description: 'Starts Aztec Prover Node with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--proverNode.archiverUrl <value>',
-            description: 'URL for an archiver service',
-            defaultValue: undefined,
-            envVar: 'ARCHIVER_URL'
+            env: undefined
         },
         ...getOptions('proverNode', omitConfigMappings(proverNodeConfigMappings, [
             // filter out options passed separately
-            ...Object.keys(archiverConfigMappings),
-            ...Object.keys(proverBrokerConfigMappings),
-            ...Object.keys(proverAgentConfigMappings)
+            ...getKeys(archiverConfigMappings),
+            ...getKeys(proverBrokerConfigMappings),
+            ...getKeys(proverAgentConfigMappings),
+            ...getKeys(p2pConfigMappings),
+            ...getKeys(worldStateConfigMappings),
+            ...getKeys(sharedNodeConfigMappings)
         ]))
     ],
     'PROVER BROKER': [
@@ -283,7 +208,7 @@ export const aztecStartOptions = {
             flag: '--prover-broker',
             description: 'Starts Aztec proving job broker',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('proverBroker', // filter out archiver options from prover node options as they're passed separately in --archiver
         proverBrokerConfigMappings)
@@ -293,56 +218,61 @@ export const aztecStartOptions = {
             flag: '--prover-agent',
             description: 'Starts Aztec Prover Agent with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('proverAgent', proverAgentConfigMappings)
     ],
+    'P2P SUBSYSTEM': [
+        {
+            flag: '--p2p-enabled [value]',
+            description: 'Enable P2P subsystem',
+            env: 'P2P_ENABLED',
+            ...booleanConfigHelper()
+        },
+        ...getOptions('p2p', p2pConfigMappings)
+    ],
     'P2P BOOTSTRAP': [
         {
             flag: '--p2p-bootstrap',
             description: 'Starts Aztec P2P Bootstrap with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        ...getOptions('p2pBootstrap', bootnodeConfigMappings)
+            env: undefined
+        },
+        ...getOptions('p2pBootstrap', omitConfigMappings(bootnodeConfigMappings, [
+            'p2pIp',
+            'p2pPort',
+            'peerIdPrivateKey',
+            'bootstrapNodes',
+            'listenAddress'
+        ]))
+    ],
+    TELEMETRY: [
+        ...getOptions('tel', telemetryClientConfigMappings)
     ],
     BOT: [
         {
             flag: '--bot',
             description: 'Starts Aztec Bot with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('bot', botConfigMappings)
     ],
+    PXE: [
+        {
+            flag: '--pxe',
+            description: 'Starts Aztec PXE with options',
+            defaultValue: undefined,
+            env: undefined
+        },
+        ...getOptions('pxe', allPxeConfigMappings)
+    ],
     TXE: [
         {
             flag: '--txe',
             description: 'Starts Aztec TXE with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         }
-    ],
-    FAUCET: [
-        {
-            flag: '--faucet',
-            description: 'Starts the Aztec faucet',
-            defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--faucet.apiServer',
-            description: 'Starts a simple HTTP server to access the faucet',
-            defaultValue: true,
-            envVar: undefined
-        },
-        {
-            flag: '--faucet.apiServerPort <value>',
-            description: 'The port on which to start the api server on',
-            defaultValue: 8080,
-            envVar: undefined,
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        ...getOptions('faucet', faucetConfigMapping)
     ]
 };

package/dest/cli/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAmClG"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CA2ClG"}

package/dest/cli/cli.js

@@ -29,5 +29,9 @@ import { addOptions, printAztecStartHelpText } from './util.js';
     then runs
       $ aztec-nargo test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
     `);
+    program.command('preload-crs').description('Preload the points data needed for proving and verifying').action(async (options)=>{
+        const { preloadCrs } = await import('./preload_crs.js');
+        return await preloadCrs(options, userLog, debugLogger);
+    });
     return program;
 }

package/dest/cli/cmds/start_archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,cAAc,EAA+C,MAAM,iBAAiB,CAAC;AAG7G,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAQlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CAmCvD"}
+{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAOlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CAmCvD"}

package/dest/cli/cmds/start_archiver.js

@@ -1,32 +1,40 @@
-import { Archiver, KVArchiverDataStore, archiverConfigMappings } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
+import { Archiver, KVArchiverDataStore, archiverConfigMappings, getArchiverConfigFromEnv } from '@aztec/archiver';
+import { createLogger } from '@aztec/aztec.js/log';
+import { blobSinkConfigMapping, createBlobSinkClient } from '@aztec/blob-sink/client';
+import { getL1Config } from '@aztec/cli/config';
 import { dataConfigMappings } 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';
-import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
 /** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {
-    let archiverConfig = extractRelevantOptions(options, {
+    const envConfig = getArchiverConfigFromEnv();
+    const cliOptions = extractRelevantOptions(options, {
         ...archiverConfigMappings,
-        ...dataConfigMappings
+        ...dataConfigMappings,
+        ...blobSinkConfigMapping
     }, 'archiver');
+    let archiverConfig = {
+        ...envConfig,
+        ...cliOptions
+    };
+    archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
     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(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
+    const { addresses, config: l1Config } = await getL1Config(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
     archiverConfig.l1Contracts = addresses;
     archiverConfig = {
         ...archiverConfig,
-        ...config
+        ...l1Config
     };
     const storeLog = createLogger('archiver:lmdb');
     const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
     const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
     const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/10056): place CL url in config here
-    const blobSinkClient = createBlobSinkClient();
+    const blobSinkClient = createBlobSinkClient(archiverConfig, {
+        logger: createLogger('archiver:blob-sink:client')
+    });
     const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, {
         telemetry,
         blobSinkClient

package/dest/cli/cmds/start_blob_sink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBAmBxG"}
+{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBA4CxG"}

package/dest/cli/cmds/start_blob_sink.js

@@ -1,4 +1,5 @@
 import { blobSinkConfigMappings, createBlobSinkServer, getBlobSinkConfigFromEnv } from '@aztec/blob-sink/server';
+import { getL1Config } from '@aztec/cli/config';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { extractRelevantOptions } from '../util.js';
 export async function startBlobSink(options, signalHandlers, userLog) {
@@ -6,11 +7,26 @@ export async function startBlobSink(options, signalHandlers, userLog) {
         userLog(`Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`);
         process.exit(1);
     }
-    const blobSinkConfig = {
+    let blobSinkConfig = {
         ...getBlobSinkConfigFromEnv(),
         ...extractRelevantOptions(options, blobSinkConfigMappings, 'blobSink')
     };
+    if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
+    }
+    if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
+        throw new Error('ETHEREUM_HOSTS not set');
+    }
+    if (typeof blobSinkConfig.l1ChainId !== 'number') {
+        throw new Error('L1_CHAIN_ID');
+    }
     const telemetry = initTelemetryClient(getTelemetryClientConfig());
+    const { config: chainConfig, addresses } = await getL1Config(blobSinkConfig.l1Contracts.registryAddress, blobSinkConfig.l1RpcUrls, blobSinkConfig.l1ChainId, blobSinkConfig.rollupVersion);
+    blobSinkConfig = {
+        ...blobSinkConfig,
+        l1Contracts: addresses,
+        ...chainConfig
+    };
     const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
     signalHandlers.push(blobSink.stop.bind(blobSink));
     await blobSink.start();

package/dest/cli/cmds/start_bot.d.ts

@@ -1,11 +1,8 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
+import { type AztecNode, type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 export declare function startBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, deps: {
-    pxe?: PXE;
-    node?: AztecNode;
-    telemetry: TelemetryClient;
-}): Promise<void>;
+export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, wallet: TestWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin?: AztecNodeAdmin): Promise<void>;
 //# sourceMappingURL=start_bot.d.ts.map

package/dest/cli/cmds/start_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAkBf;AAED,wBAAgB,MAAM,CACpB,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,eAAe,CAAA;CAAE,iBAWlE"}
+{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAyB,MAAM,iCAAiC,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAuBf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,iBAkBhC"}