@aztec/aztec 0.80.0 → 0.82.0

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBA0FjF"}
+{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAwGjF"}

package/dest/cli/aztec_start_action.js

@@ -12,6 +12,7 @@ export async function aztecStart(options, userLog, debugLogger) {
     // list of 'stop' functions to call when process ends
     const signalHandlers = [];
     const services = {};
+    const adminServices = {};
     let config = undefined;
     if (options.sandbox) {
         const cliVersion = getCliVersion();
@@ -47,7 +48,7 @@ export async function aztecStart(options, userLog, debugLogger) {
         }
         if (options.node) {
             const { startNode } = await import('./cmds/start_node.js');
-            ({ config } = await startNode(options, signalHandlers, services, userLog));
+            ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
         } else if (options.bot) {
             const { startBot } = await import('./cmds/start_bot.js');
             await startBot(options, signalHandlers, services, userLog);
@@ -88,6 +89,7 @@ export async function aztecStart(options, userLog, debugLogger) {
     }
     installSignalHandlers(debugLogger.info, signalHandlers);
     const versions = getVersions(config);
+    // Start the main JSON-RPC server
     if (Object.entries(services).length > 0) {
         const rpcServer = createNamespacedSafeJsonRpcServer(services, {
             http200OnError: false,
@@ -102,4 +104,19 @@ export async function aztecStart(options, userLog, debugLogger) {
         });
         debugLogger.info(`Aztec Server listening on port ${port}`, versions);
     }
+    // If there are any admin services, start a separate JSON-RPC server for them
+    if (Object.entries(adminServices).length > 0) {
+        const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+            http200OnError: false,
+            log: debugLogger,
+            middlewares: [
+                getOtelJsonRpcPropagationMiddleware(),
+                getVersioningMiddleware(versions)
+            ]
+        });
+        const { port } = await startHttpRpcServer(rpcServer, {
+            port: options.adminPort
+        });
+        debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,cAAe,MAAM,kBAAkB,OAAO,MAAM,EAAE,aAAa,CAAC,uBAiB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAA2E,CAAC;AAGzG,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAwTlE,CAAC"}
+{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,cAAe,MAAM,kBAAkB,OAAO,MAAM,EAAE,aAAa,CAAC,uBAiB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAU5B,CAAC;AAGF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CA4VlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -31,10 +31,14 @@ export const getOptions = (namespace, configMappings)=>{
 // These are options used by multiple modules so should be inputted once
 export const universalOptions = [
     'l1RpcUrls',
+    'l1ConsensusHostUrl',
+    'l1ConsensusHostApiKey',
+    'l1ConsensusHostApiKeyHeader',
     'l1ChainId',
     'l1Contracts',
     'p2pEnabled',
-    'dataDirectory'
+    'dataDirectory',
+    'dataStoreMapSizeKb'
 ];
 // Define categories and options
 export const aztecStartOptions = {
@@ -69,11 +73,18 @@ export const aztecStartOptions = {
     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',
             parseVal: (val)=>parseInt(val, 10)
         },
+        {
+            flag: '--admin-port <value>',
+            description: 'Port to run admin APIs of Aztec Services on on',
+            defaultValue: 8880,
+            envVar: 'AZTEC_ADMIN_PORT',
+            parseVal: (val)=>parseInt(val, 10)
+        },
         {
             flag: '--api-prefix <value>',
             description: 'Prefix for API routes on any service that is started',
@@ -103,6 +114,39 @@ export const aztecStartOptions = {
             description: 'Mnemonic for L1 accounts. Will be used if no publisher private keys are provided',
             defaultValue: DefaultMnemonic,
             envVar: 'MNEMONIC'
+        },
+        {
+            flag: '--l1-consensus-host-url <value>',
+            description: 'URL of the Ethereum consensus node that services will connect to',
+            defaultValue: undefined,
+            envVar: 'L1_CONSENSUS_HOST_URL'
+        },
+        {
+            flag: '--l1-consensus-host-api-key <value>',
+            description: 'API key for the Ethereum consensus node',
+            defaultValue: undefined,
+            envVar: 'L1_CONSENSUS_HOST_API_KEY'
+        },
+        {
+            flag: '--l1-consensus-host-api-key-header <value>',
+            description: 'API key header for the Ethereum consensus node. If not set, the api key will be appended to the URL as ?key=<api-key>',
+            defaultValue: undefined,
+            envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADER'
+        }
+    ],
+    STORAGE: [
+        {
+            flag: '--data-directory <value>',
+            description: 'Where to store data for services. If not set, will store temporarily',
+            defaultValue: undefined,
+            envVar: 'DATA_DIRECTORY'
+        },
+        {
+            flag: '--data-store-map-size-kb <value>',
+            description: 'The maximum possible size of the data store DB in KB. Can be overridden by component-specific options.',
+            defaultValue: undefined,
+            envVar: 'DATA_STORE_MAP_SIZE_KB',
+            parseVal: (val)=>parseInt(val, 10)
         }
     ],
     'L1 CONTRACT ADDRESSES': [
@@ -157,12 +201,6 @@ export const aztecStartOptions = {
             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',
@@ -249,7 +287,7 @@ export const aztecStartOptions = {
         },
         ...getOptions('sequencer', sequencerClientConfigMappings)
     ],
-    BLOB_SINK: [
+    'BLOB SINK': [
         {
             flag: '--blob-sink',
             description: 'Starts Aztec Blob Sink with options',

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

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAY1C,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAQ3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAOpG;AAUD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAgB/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,kBAAkB,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAY1C,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAOpG;AAUD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAiB/E"}

package/dest/cli/chain_l2_config.js

@@ -1,3 +1,4 @@
+import path from 'path';
 export const testnetIgnitionL2ChainConfig = {
     l1ChainId: 11155111,
     ethereumSlotDuration: 12,
@@ -9,13 +10,13 @@ export const testnetIgnitionL2ChainConfig = {
     p2pBootstrapNodes: [],
     registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
     seqMinTxsPerBlock: 0,
-    seqMaxTxsPerBlock: 0
+    seqMaxTxsPerBlock: 4
 };
 export async function getBootnodes(networkName) {
     const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
     const response = await fetch(url);
     if (!response.ok) {
-        throw new Error(`Failed to fetch basic contract addresses from ${url}`);
+        throw new Error(`Failed to fetch basic contract addresses from ${url}. Check you are using a correct network name.`);
     }
     const json = await response.json();
     return json['bootnodes'];
@@ -46,11 +47,12 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
     enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
     enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
-    enrichVar('P2P_BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+    enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
     enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
     enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
     enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
     enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
     enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
     enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
+    enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
 }

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,EAEL,KAAK,cAAc,EAIpB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AAQxG,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,CAkCvD"}
+{"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;AAQzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAA4C,MAAM,wBAAwB,CAAC;AAQxG,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

@@ -22,6 +22,7 @@ import { extractRelevantOptions } from '../util.js';
         ...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');
     }

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

@@ -1,7 +1,7 @@
 import { type AztecNodeConfig } from '@aztec/aztec-node';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<{
+export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, adminServices: NamespacedApiHandlers, userLog: LogFn): Promise<{
     config: AztecNodeConfig;
 }>;
 //# sourceMappingURL=start_node.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAEpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAwItC"}
+{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAEpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAyItC"}

package/dest/cli/cmds/start_node.js

@@ -1,7 +1,7 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
 import { NULL_KEY } from '@aztec/ethereum';
-import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -9,7 +9,7 @@ import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { createAztecNode, deployContractsToL1 } from '../../sandbox/index.js';
 import { getL1Config } from '../get_l1_config.js';
 import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
-export async function startNode(options, signalHandlers, services, userLog) {
+export async function startNode(options, signalHandlers, services, adminServices, userLog) {
     // options specifically namespaced with --node.<option>
     const nodeSpecificOptions = extractNamespacedOptions(options, 'node');
     // All options set from environment variables
@@ -114,6 +114,10 @@ export async function startNode(options, signalHandlers, services, userLog) {
         node.getP2P(),
         P2PApiSchema
     ];
+    adminServices.nodeAdmin = [
+        node,
+        AztecNodeAdminApiSchema
+    ];
     // Add node stop function to signal handlers
     signalHandlers.push(node.stop.bind(node));
     // Add a PXE client that connects to this node if requested

package/dest/cli/cmds/start_p2p_bootstrap.js

@@ -19,7 +19,7 @@ export async function startP2PBootstrap(options, signalHandlers, services, userL
         node,
         P2PBootstrapApiSchema
     ];
-    userLog(`P2P bootstrap node started on ${config.udpListenAddress}`);
+    userLog(`P2P bootstrap node started on ${config.p2pIp}:${config.p2pPort}`);
     return {
         config: emptyChainConfig
     };

package/dest/sandbox/sandbox.d.ts

@@ -13,7 +13,7 @@ import { type HDAccount, type PrivateKeyAccount } from 'viem';
  * @param aztecNodeConfig - The Aztec Node Config
  * @param hdAccount - Account for publishing L1 contracts
  */
-export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/aztec.js").Logger, opts?: {
+export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/foundation/log").Logger, opts?: {
     assumeProvenThroughBlockNumber?: number;
     salt?: number;
     genesisArchiveRoot?: Fr;
@@ -32,6 +32,7 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
     stakingAssetAddress: import("@aztec/aztec.js").EthAddress;
 } & {
     slashFactoryAddress?: import("@aztec/aztec.js").EthAddress | undefined;
+    feeAssetHandlerAddress?: import("@aztec/aztec.js").EthAddress | undefined;
 } & {
     rollupAddress: import("@aztec/aztec.js").EthAddress;
 } & {

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAG7F,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAavH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,mCAAS,EAC7B,IAAI,GAAE;IAAE,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IAAC,gBAAgB,CAAC,EAAE,EAAE,CAAA;CAAO;;;;;;;;;;;;;;;;;;GA6BtH;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,oCAA6B,EAAE,OAAO,EAAE,KAAK;;;;GAkGtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAA;CAAO,EACpF,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAY7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAE7F,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAavH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IAAE,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IAAC,gBAAgB,CAAC,EAAE,EAAE,CAAA;CAAO;;;;;;;;;;;;;;;;;;;GA6BtH;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,oCAA6B,EAAE,OAAO,EAAE,KAAK;;;;GA6FtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAA;CAAO,EACpF,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}

package/dest/sandbox/sandbox.js

@@ -2,7 +2,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { SignerlessWallet } from '@aztec/aztec.js';
 import { AnvilTestWatcher, EthCheatCodes } from '@aztec/aztec.js/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { setupCanonicalL2FeeJuice } from '@aztec/cli/setup-contracts';
@@ -127,7 +126,7 @@ const localAnvil = foundry;
         prefilledPublicData
     });
     const pxe = await createAztecPXE(node);
-    await setupCanonicalL2FeeJuice(new SignerlessWallet(pxe), aztecNodeConfig.l1Contracts.feeJuicePortalAddress, undefined, logger.info);
+    await setupCanonicalL2FeeJuice(pxe, aztecNodeConfig.l1Contracts.feeJuicePortalAddress, logger.info);
     if (initialAccounts.length) {
         userLog('Setting up funded test accounts...');
         const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);
@@ -165,7 +164,6 @@ const localAnvil = foundry;
             ...config.l1Contracts
         }
     };
-    logger.info('createAztecNode', aztecNodeConfig);
     const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
     return node;
 }

package/dest/sandbox/sponsored_fee_payment_method.d.ts

@@ -1,5 +1,5 @@
 import type { FeePaymentMethod } from '@aztec/aztec.js';
-import { type FunctionCall } from '@aztec/stdlib/abi';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 /**
@@ -18,6 +18,6 @@ export declare class SponsoredFeePaymentMethod implements FeePaymentMethod {
     static new(pxe: PXE): Promise<SponsoredFeePaymentMethod>;
     getAsset(): Promise<AztecAddress>;
     getFeePayer(): Promise<AztecAddress>;
-    getFunctionCalls(): Promise<FunctionCall[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
 }
 //# sourceMappingURL=sponsored_fee_payment_method.d.ts.map

package/dest/sandbox/sponsored_fee_payment_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sponsored_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,mBAAmB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAI3D;;GAEG;AACH,qBAAa,yBAA0B,YAAW,gBAAgB;IAE9D;;OAEG;IACH,OAAO,CAAC,eAAe;;IAHvB;;OAEG;IACK,eAAe,EAAE,YAAY;WAG1B,GAAG,CAAC,GAAG,EAAE,GAAG;IAKzB,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAIjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAI9B,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAalD"}
+{"version":3,"file":"sponsored_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAI3D;;GAEG;AACH,qBAAa,yBAA0B,YAAW,gBAAgB;IAE9D;;OAEG;IACH,OAAO,CAAC,eAAe;;IAHvB;;OAEG;IACK,eAAe,EAAE,YAAY;WAG1B,GAAG,CAAC,GAAG,EAAE,GAAG;IAKzB,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAIjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAI9B,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAiBvD"}

package/dest/sandbox/sponsored_fee_payment_method.js

@@ -1,3 +1,4 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 import { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
@@ -20,8 +21,8 @@ import { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
     getFeePayer() {
         return Promise.resolve(this.paymentContract);
     }
-    async getFunctionCalls() {
-        return [
+    async getExecutionPayload() {
+        return new ExecutionPayload([
             {
                 name: 'sponsor_unconditionally',
                 to: this.paymentContract,
@@ -31,6 +32,6 @@ import { getDeployedSponsoredFPCAddress } from './sponsored_fpc.js';
                 args: [],
                 returnTypes: []
             }
-        ];
+        ], [], []);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -29,34 +29,34 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.80.0",
-    "@aztec/archiver": "0.80.0",
-    "@aztec/aztec-faucet": "0.80.0",
-    "@aztec/aztec-node": "0.80.0",
-    "@aztec/aztec.js": "0.80.0",
-    "@aztec/bb-prover": "0.80.0",
-    "@aztec/blob-sink": "0.80.0",
-    "@aztec/bot": "0.80.0",
-    "@aztec/builder": "0.80.0",
-    "@aztec/cli": "0.80.0",
-    "@aztec/cli-wallet": "0.80.0",
-    "@aztec/constants": "0.80.0",
-    "@aztec/entrypoints": "0.80.0",
-    "@aztec/ethereum": "0.80.0",
-    "@aztec/foundation": "0.80.0",
-    "@aztec/kv-store": "0.80.0",
-    "@aztec/noir-contracts.js": "0.80.0",
-    "@aztec/noir-protocol-circuits-types": "0.80.0",
-    "@aztec/p2p": "0.80.0",
-    "@aztec/p2p-bootstrap": "0.80.0",
-    "@aztec/protocol-contracts": "0.80.0",
-    "@aztec/prover-client": "0.80.0",
-    "@aztec/prover-node": "0.80.0",
-    "@aztec/pxe": "0.80.0",
-    "@aztec/stdlib": "0.80.0",
-    "@aztec/telemetry-client": "0.80.0",
-    "@aztec/txe": "0.80.0",
-    "@aztec/world-state": "0.80.0",
+    "@aztec/accounts": "0.82.0",
+    "@aztec/archiver": "0.82.0",
+    "@aztec/aztec-faucet": "0.82.0",
+    "@aztec/aztec-node": "0.82.0",
+    "@aztec/aztec.js": "0.82.0",
+    "@aztec/bb-prover": "0.82.0",
+    "@aztec/blob-sink": "0.82.0",
+    "@aztec/bot": "0.82.0",
+    "@aztec/builder": "0.82.0",
+    "@aztec/cli": "0.82.0",
+    "@aztec/cli-wallet": "0.82.0",
+    "@aztec/constants": "0.82.0",
+    "@aztec/entrypoints": "0.82.0",
+    "@aztec/ethereum": "0.82.0",
+    "@aztec/foundation": "0.82.0",
+    "@aztec/kv-store": "0.82.0",
+    "@aztec/noir-contracts.js": "0.82.0",
+    "@aztec/noir-protocol-circuits-types": "0.82.0",
+    "@aztec/p2p": "0.82.0",
+    "@aztec/p2p-bootstrap": "0.82.0",
+    "@aztec/protocol-contracts": "0.82.0",
+    "@aztec/prover-client": "0.82.0",
+    "@aztec/prover-node": "0.82.0",
+    "@aztec/pxe": "0.82.0",
+    "@aztec/stdlib": "0.82.0",
+    "@aztec/telemetry-client": "0.82.0",
+    "@aztec/txe": "0.82.0",
+    "@aztec/world-state": "0.82.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/cli/aztec_start_action.ts

@@ -20,6 +20,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   // list of 'stop' functions to call when process ends
   const signalHandlers: Array<() => Promise<void>> = [];
   const services: NamespacedApiHandlers = {};
+  const adminServices: NamespacedApiHandlers = {};
   let config: ChainConfig | undefined = undefined;
 
   if (options.sandbox) {
@@ -55,7 +56,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     }
     if (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
-      ({ config } = await startNode(options, signalHandlers, services, userLog));
+      ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);
@@ -97,6 +98,8 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   installSignalHandlers(debugLogger.info, signalHandlers);
   const versions = getVersions(config);
+
+  // Start the main JSON-RPC server
   if (Object.entries(services).length > 0) {
     const rpcServer = createNamespacedSafeJsonRpcServer(services, {
       http200OnError: false,
@@ -106,4 +109,15 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     const { port } = await startHttpRpcServer(rpcServer, { port: options.port });
     debugLogger.info(`Aztec Server listening on port ${port}`, versions);
   }
+
+  // If there are any admin services, start a separate JSON-RPC server for them
+  if (Object.entries(adminServices).length > 0) {
+    const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+      http200OnError: false,
+      log: debugLogger,
+      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+    });
+    const { port } = await startHttpRpcServer(rpcServer, { port: options.adminPort });
+    debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
+  }
 }

package/src/cli/aztec_start_options.ts

@@ -53,7 +53,17 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
 };
 
 // These are options used by multiple modules so should be inputted once
-export const universalOptions = ['l1RpcUrls', 'l1ChainId', 'l1Contracts', 'p2pEnabled', 'dataDirectory'];
+export const universalOptions = [
+  'l1RpcUrls',
+  'l1ConsensusHostUrl',
+  'l1ConsensusHostApiKey',
+  'l1ConsensusHostApiKeyHeader',
+  'l1ChainId',
+  'l1Contracts',
+  'p2pEnabled',
+  'dataDirectory',
+  'dataStoreMapSizeKb',
+];
 
 // Define categories and options
 export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
@@ -88,11 +98,18 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
   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',
       parseVal: val => parseInt(val, 10),
     },
+    {
+      flag: '--admin-port <value>',
+      description: 'Port to run admin APIs of Aztec Services on on',
+      defaultValue: 8880,
+      envVar: 'AZTEC_ADMIN_PORT',
+      parseVal: val => parseInt(val, 10),
+    },
     {
       flag: '--api-prefix <value>',
       description: 'Prefix for API routes on any service that is started',
@@ -121,6 +138,41 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: DefaultMnemonic,
       envVar: 'MNEMONIC',
     },
+    {
+      flag: '--l1-consensus-host-url <value>',
+      description: 'URL of the Ethereum consensus node that services will connect to',
+      defaultValue: undefined,
+      envVar: 'L1_CONSENSUS_HOST_URL',
+    },
+    {
+      flag: '--l1-consensus-host-api-key <value>',
+      description: 'API key for the Ethereum consensus node',
+      defaultValue: undefined,
+      envVar: 'L1_CONSENSUS_HOST_API_KEY',
+    },
+    {
+      flag: '--l1-consensus-host-api-key-header <value>',
+      description:
+        'API key header for the Ethereum consensus node. If not set, the api key will be appended to the URL as ?key=<api-key>',
+      defaultValue: undefined,
+      envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADER',
+    },
+  ],
+  STORAGE: [
+    {
+      flag: '--data-directory <value>',
+      description: 'Where to store data for services. If not set, will store temporarily',
+      defaultValue: undefined,
+      envVar: 'DATA_DIRECTORY',
+    },
+    {
+      flag: '--data-store-map-size-kb <value>',
+      description:
+        'The maximum possible size of the data store DB in KB. Can be overridden by component-specific options.',
+      defaultValue: undefined,
+      envVar: 'DATA_STORE_MAP_SIZE_KB',
+      parseVal: (val: string) => parseInt(val, 10),
+    },
   ],
   'L1 CONTRACT ADDRESSES': [
     {
@@ -174,12 +226,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       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',
@@ -266,7 +312,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     },
     ...getOptions('sequencer', sequencerClientConfigMappings),
   ],
-  BLOB_SINK: [
+  'BLOB SINK': [
     {
       flag: '--blob-sink',
       description: 'Starts Aztec Blob Sink with options',

package/src/cli/chain_l2_config.ts

@@ -1,3 +1,7 @@
+import type { EnvVar } from '@aztec/foundation/config';
+
+import path from 'path';
+
 export type NetworkNames = 'testnet-ignition';
 
 export type L2ChainConfig = {
@@ -25,16 +29,19 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   p2pBootstrapNodes: [],
   registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
   seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 4,
 };
 
 export async function getBootnodes(networkName: NetworkNames) {
   const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
   const response = await fetch(url);
   if (!response.ok) {
-    throw new Error(`Failed to fetch basic contract addresses from ${url}`);
+    throw new Error(
+      `Failed to fetch basic contract addresses from ${url}. Check you are using a correct network name.`,
+    );
   }
   const json = await response.json();
+
   return json['bootnodes'];
 }
 
@@ -47,7 +54,7 @@ export async function getL2ChainConfig(networkName: NetworkNames): Promise<L2Cha
   return undefined;
 }
 
-function enrichVar(envVar: string, value: string) {
+function enrichVar(envVar: EnvVar, value: string) {
   // Don't override
   if (process.env[envVar]) {
     return;
@@ -64,11 +71,12 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
   enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
   enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
-  enrichVar('P2P_BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+  enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
   enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
   enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
   enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
   enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
+  enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
 }

package/src/cli/cmds/start_archiver.ts

@@ -37,6 +37,7 @@ export async function startArchiver(
   );
 
   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');

package/src/cli/cmds/start_node.ts

@@ -3,7 +3,7 @@ import { type AztecNodeConfig, aztecNodeConfigMappings, getConfigEnvVars } from
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import { AztecNodeApiSchema, type PXE } from '@aztec/stdlib/interfaces/client';
+import { AztecNodeAdminApiSchema, AztecNodeApiSchema, type PXE } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import {
   type TelemetryClientConfig,
@@ -22,6 +22,7 @@ export async function startNode(
   options: any,
   signalHandlers: (() => Promise<void>)[],
   services: NamespacedApiHandlers,
+  adminServices: NamespacedApiHandlers,
   userLog: LogFn,
 ): Promise<{ config: AztecNodeConfig }> {
   // options specifically namespaced with --node.<option>
@@ -141,6 +142,7 @@ export async function startNode(
   // Add node and p2p to services list
   services.node = [node, AztecNodeApiSchema];
   services.p2p = [node.getP2P(), P2PApiSchema];
+  adminServices.nodeAdmin = [node, AztecNodeAdminApiSchema];
 
   // Add node stop function to signal handlers
   signalHandlers.push(node.stop.bind(node));

package/src/cli/cmds/start_p2p_bootstrap.ts

@@ -24,6 +24,6 @@ export async function startP2PBootstrap(
   await node.start(config);
   signalHandlers.push(() => node.stop());
   services.bootstrap = [node, P2PBootstrapApiSchema];
-  userLog(`P2P bootstrap node started on ${config.udpListenAddress}`);
+  userLog(`P2P bootstrap node started on ${config.p2pIp}:${config.p2pPort}`);
   return { config: emptyChainConfig };
 }

package/src/sandbox/sandbox.ts

@@ -2,7 +2,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { SignerlessWallet } from '@aztec/aztec.js';
 import { AnvilTestWatcher, EthCheatCodes } from '@aztec/aztec.js/testing';
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { setupCanonicalL2FeeJuice } from '@aztec/cli/setup-contracts';
@@ -168,12 +167,7 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
   const node = await createAztecNode(aztecNodeConfig, { telemetry, blobSinkClient }, { prefilledPublicData });
   const pxe = await createAztecPXE(node);
 
-  await setupCanonicalL2FeeJuice(
-    new SignerlessWallet(pxe),
-    aztecNodeConfig.l1Contracts.feeJuicePortalAddress,
-    undefined,
-    logger.info,
-  );
+  await setupCanonicalL2FeeJuice(pxe, aztecNodeConfig.l1Contracts.feeJuicePortalAddress, logger.info);
 
   if (initialAccounts.length) {
     userLog('Setting up funded test accounts...');
@@ -214,7 +208,6 @@ export async function createAztecNode(
     ...config,
     l1Contracts: { ...l1Contracts, ...config.l1Contracts },
   };
-  logger.info('createAztecNode', aztecNodeConfig);
   const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
   return node;
 }

package/src/sandbox/sponsored_fee_payment_method.ts

@@ -1,6 +1,7 @@
 import type { FeePaymentMethod } from '@aztec/aztec.js';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { type FunctionCall, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 
@@ -30,17 +31,21 @@ export class SponsoredFeePaymentMethod implements FeePaymentMethod {
     return Promise.resolve(this.paymentContract);
   }
 
-  async getFunctionCalls(): Promise<FunctionCall[]> {
-    return [
-      {
-        name: 'sponsor_unconditionally',
-        to: this.paymentContract,
-        selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
-        type: FunctionType.PRIVATE,
-        isStatic: false,
-        args: [],
-        returnTypes: [],
-      },
-    ];
+  async getExecutionPayload(): Promise<ExecutionPayload> {
+    return new ExecutionPayload(
+      [
+        {
+          name: 'sponsor_unconditionally',
+          to: this.paymentContract,
+          selector: await FunctionSelector.fromSignature('sponsor_unconditionally()'),
+          type: FunctionType.PRIVATE,
+          isStatic: false,
+          args: [],
+          returnTypes: [],
+        },
+      ],
+      [],
+      [],
+    );
   }
 }