fix(backport-to-v2): datastore map size kb (#17985)

Manual backport of #17936

Author: spypsy

boxes/boxes/vanilla/scripts/deploy.ts

@@ -33,7 +33,7 @@ async function setupPXE() {
 
   const store = await createStore('pxe', {
     dataDirectory: PXE_STORE_DIR,
-    dataStoreMapSizeKB: 1e6,
+    dataStoreMapSizeKb: 1e6,
   });
 
   const config = getPXEServiceConfig();

docs/docs/developers/guides/getting_started_on_testnet.md

@@ -179,7 +179,7 @@ const fullConfig = { ...config, l1Contracts };
 
 const store = await createStore("pxe1", {
   dataDirectory: "store",
-  dataStoreMapSizeKB: 1e6,
+  dataStoreMapSizeKb: 1e6,
 });
 
 const pxe = await createPXEService(node, fullConfig, { store });

docs/docs/developers/reference/environment_reference/cli_reference.md

@@ -176,7 +176,7 @@ aztec start --node --network testnet
 - `--p2p.block-request-batch-size <value>`: The number of blocks to fetch in a single batch (default: 20).
 - `--p2p.archived-tx-limit <value>`: The number of transactions that will be archived. If the limit is set to 0 then archiving will be disabled.
 - `--p2p.trusted-peers <value>`: A list of trusted peers ENRs. Separated by commas.
-- `--p2p.p2p-store-map-size-kb <value>`: The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKB.
+- `--p2p.p2p-store-map-size-kb <value>`: The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.
 - `--p2p.tx-public-setup-allow-list <value>`: The list of functions calls allowed to run in setup.
 - `--p2p.max-tx-pool-size <value>`: The maximum cumulative tx size of pending txs (in bytes) before evicting lower priority txs (default: 100000000).
 - `--p2p.overall-request-timeout-ms <value>`: The overall timeout for a request response operation (default: 4000).
@@ -220,7 +220,7 @@ aztec start --port 8081 --pxe --pxe.nodeUrl=$BOOTNODE --pxe.proverEnabled true -
 - `--archiver.archiver-polling-interval-ms <value>`: The polling interval in ms for retrieving new L2 blocks and encrypted logs (default: 500).
 - `--archiver.archiver-batch-size <value>`: The number of L2 blocks the archiver will attempt to download at a time (default: 100).
 - `--archiver.max-logs <value>`: The max number of logs that can be obtained in 1 "getPublicLogs" call (default: 1000).
-- `--archiver.archiver-store-map-size-kb <value>`: The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB.
+- `--archiver.archiver-store-map-size-kb <value>`: The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.
 - `--archiver.rollup-version <value>`: The version of the rollup.
 - `--archiver.viem-polling-interval-ms <value>`: The polling interval viem uses in ms (default: 1000).
 - `--archiver.ethereum-slot-duration <value>`: How many seconds an L1 slot lasts (default: 12).
@@ -329,7 +329,7 @@ aztec start --network testnet --l1-rpc-urls https://example.com --l1-consensus-h
 - `--prover-node.world-state-block-check-interval-ms <value>`: The frequency in which to check (default: 100).
 - `--prover-node.world-state-proven-blocks-only <value>`: Whether to follow only the proven chain.
 - `--prover-node.world-state-block-request-batch-size <value>`: Size of the batch for each get-blocks request from the synchronizer to the archiver.
-- `--prover-node.world-state-db-map-size-kb <value>`: The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKB.
+- `--prover-node.world-state-db-map-size-kb <value>`: The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKb.
 - `--prover-node.world-state-data-directory <value>`: Optional directory for the world state database.
 - `--prover-node.world-state-block-history <value>`: The number of historic blocks to maintain. Values less than 1 mean all history is maintained (default: 64).
 - `--prover-node.l1-publish-retry-interval-ms <value>`: The interval to wait between publish retries (default: 1000).
@@ -356,7 +356,7 @@ aztec start --network testnet --l1-rpc-urls https://example.com --l1-consensus-h
 - `--prover-broker.prover-broker-batch-size <value>`: The prover broker writes jobs to disk in batches (default: 100).
 - `--prover-broker.prover-broker-batch-interval-ms <value>`: How often to flush batches to disk (default: 50).
 - `--prover-broker.prover-broker-max-epochs-to-keep-results-for <value>`: The maximum number of epochs to keep results for (default: 1).
-- `--prover-broker.prover-broker-store-map-size-kb <value>`: The size of the prover broker's database. Will override the dataStoreMapSizeKB if set.
+- `--prover-broker.prover-broker-store-map-size-kb <value>`: The size of the prover broker's database. Will override the dataStoreMapSizeKb if set.
 - `--prover-broker.data-store-map-size-kb <value>`: DB mapping size to be applied to all key/value stores (default: 134217728).
 - `--prover-broker.viem-polling-interval-ms <value>`: The polling interval viem uses in ms (default: 1000).
 - `--prover-broker.rollup-version <value>`: The version of the rollup.

docs/docs/the_aztec_network/reference/cli_reference.md

@@ -244,7 +244,7 @@ If two subsystems can contain the same configuration option, only one needs to b
           A list of private peer ENRs that will always be persisted and not be used for discovery. Separated by commas.
 
     --p2p.p2pStoreMapSizeKb <value>                                                                                               ($P2P_STORE_MAP_SIZE_KB)
-          The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --p2p.txPublicSetupAllowList <value>                                                                                          ($TX_PUBLIC_SETUP_ALLOWLIST)
           The list of functions calls allowed to run in setup
@@ -310,7 +310,7 @@ If two subsystems can contain the same configuration option, only one needs to b
     --pxe
           Starts Aztec PXE with options
 
-    --pxe.dataStoreMapSizeKB <value>                               (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
+    --pxe.dataStoreMapSizeKb <value>                               (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
           DB mapping size to be applied to all key/value stores
 
     --pxe.rollupVersion <value>                                                                                                   ($ROLLUP_VERSION)
@@ -343,7 +343,7 @@ If two subsystems can contain the same configuration option, only one needs to b
           The URL of the blob sink
 
     --archiver.blobSinkMapSizeKb <value>                                                                                          ($BLOB_SINK_MAP_SIZE_KB)
-          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --archiver.archiveApiUrl <value>                                                                                              ($BLOB_SINK_ARCHIVE_API_URL)
           The URL of the archive API
@@ -358,7 +358,7 @@ If two subsystems can contain the same configuration option, only one needs to b
           The max number of logs that can be obtained in 1 "getPublicLogs" call.
 
     --archiver.archiverStoreMapSizeKb <value>                                                                                     ($ARCHIVER_STORE_MAP_SIZE_KB)
-          The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --archiver.rollupVersion <value>                                                                                              ($ROLLUP_VERSION)
           The version of the rollup.
@@ -561,7 +561,7 @@ If two subsystems can contain the same configuration option, only one needs to b
           The URL of the blob sink
 
     --sequencer.blobSinkMapSizeKb <value>                                                                                         ($BLOB_SINK_MAP_SIZE_KB)
-          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --sequencer.archiveApiUrl <value>                                                                                             ($BLOB_SINK_ARCHIVE_API_URL)
           The URL of the archive API
@@ -590,12 +590,12 @@ If two subsystems can contain the same configuration option, only one needs to b
           The URL of the blob sink
 
     --blobSink.blobSinkMapSizeKb <value>                                                                                          ($BLOB_SINK_MAP_SIZE_KB)
-          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the blob sink DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --blobSink.archiveApiUrl <value>                                                                                              ($BLOB_SINK_ARCHIVE_API_URL)
           The URL of the archive API
 
-    --blobSink.dataStoreMapSizeKB <value>                          (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
+    --blobSink.dataStoreMapSizeKb <value>                          (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
           DB mapping size to be applied to all key/value stores
 
     --blobSink.rollupVersion <value>                                                                                              ($ROLLUP_VERSION)
@@ -652,7 +652,7 @@ If two subsystems can contain the same configuration option, only one needs to b
           Size of the batch for each get-blocks request from the synchronizer to the archiver.
 
     --proverNode.worldStateDbMapSizeKb <value>                                                                                    ($WS_DB_MAP_SIZE_KB)
-          The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKB.
+          The maximum possible size of the world state DB in KB. Overwrites the general dataStoreMapSizeKb.
 
     --proverNode.archiveTreeMapSizeKb <value>                                                                                     ($ARCHIVE_TREE_MAP_SIZE_KB)
           The maximum possible size of the world state archive tree in KB. Overwrites the general worldStateDbMapSizeKb.
@@ -749,10 +749,10 @@ If two subsystems can contain the same configuration option, only one needs to b
     --proverBroker.proverBrokerMaxEpochsToKeepResultsFor <value>   (default: 1)                                                  ($PROVER_BROKER_MAX_EPOCHS_TO_KEEP_RESULTS_FOR)
           The maximum number of epochs to keep results for
 
-    --proverBroker.proverBrokerStoreMapSizeKB <value>                                                                             ($PROVER_BROKER_STORE_MAP_SIZE_KB)
-          The size of the prover broker's database. Will override the dataStoreMapSizeKB if set.
+    --proverBroker.proverBrokerStoreMapSizeKb <value>                                                                             ($PROVER_BROKER_STORE_MAP_SIZE_KB)
+          The size of the prover broker's database. Will override the dataStoreMapSizeKb if set.
 
-    --proverBroker.dataStoreMapSizeKB <value>                      (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
+    --proverBroker.dataStoreMapSizeKb <value>                      (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
           DB mapping size to be applied to all key/value stores
 
     --proverBroker.viemPollingIntervalMS <value>                   (default: 1000)                                               ($L1_READER_VIEM_POLLING_INTERVAL_MS)
@@ -801,7 +801,7 @@ If two subsystems can contain the same configuration option, only one needs to b
     --p2pBootstrap.peerIdPrivateKeyPath <value>                                                                                   ($PEER_ID_PRIVATE_KEY_PATH)
           An optional path to store generated peer id private keys. If blank, will default to storing any generated keys in the root of the data directory.
 
-    --p2pBootstrap.dataStoreMapSizeKB <value>                      (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
+    --p2pBootstrap.dataStoreMapSizeKb <value>                      (default: 134217728)                                          ($DATA_STORE_MAP_SIZE_KB)
           DB mapping size to be applied to all key/value stores
 
   BOT

playground/src/aztecEnv.ts

@@ -170,7 +170,7 @@ export class AztecEnv {
       AztecEnv.isNetworkStoreInitialized = true;
       const networkStore = await createStore('network_data', {
         dataDirectory: 'network',
-        dataStoreMapSizeKB: 1e6,
+        dataStoreMapSizeKb: 1e6,
       });
       const networkDB = NetworkDB.getInstance();
       networkDB.init(networkStore);

playground/src/components/sidebar/components/NetworkSelector.tsx

@@ -99,7 +99,7 @@ export function NetworkSelector() {
       const walletLogger = WebLogger.getInstance().createLogger('wallet:data:idb');
       const walletDBStore = await createStore(
         `wallet-${rollupAddress}`,
-        { dataDirectory: 'wallet', dataStoreMapSizeKB: 2e10 },
+        { dataDirectory: 'wallet', dataStoreMapSizeKb: 2e10 },
         walletLogger,
       );
       const walletDB = WalletDB.getInstance();

yarn-project/archiver/src/archiver/config.ts

@@ -44,7 +44,7 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
   archiverStoreMapSizeKb: {
     env: 'ARCHIVER_STORE_MAP_SIZE_KB',
     parseEnv: (val: string | undefined) => (val ? +val : undefined),
-    description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB.',
+    description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKb.',
   },
   skipValidateBlockAttestations: {
     description: 'Whether to skip validating block attestations (use only for testing).',

yarn-project/archiver/src/factory.ts

@@ -20,7 +20,7 @@ export async function createArchiverStore(
 ) {
   const config = {
     ...userConfig,
-    dataStoreMapSizeKB: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKB,
+    dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb,
   };
   const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config, createLogger('archiver:lmdb'));
   return new KVArchiverDataStore(store, config.maxLogs);

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

@@ -172,7 +172,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
   ],
   STORAGE: [
     configToFlag('--data-directory', dataConfigMappings.dataDirectory),
-    configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKB),
+    configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKb),
   ],
   'WORLD STATE': [
     configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),

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

@@ -32,7 +32,7 @@ export async function startArchiver(
   );
 
   let archiverConfig = { ...envConfig, ...cliOptions };
-  archiverConfig.dataStoreMapSizeKB = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKB;
+  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');