fix: expose env var for batch size

AztecProtocol · Oct 29, 2024 · 7eda135 · 7eda135
1 parent 98f6f08
commit 7eda135
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
@@ -63,6 +63,7 @@ export type EnvVar =
   | 'OTEL_SERVICE_NAME'
   | 'OUTBOX_CONTRACT_ADDRESS'
   | 'P2P_BLOCK_CHECK_INTERVAL_MS'
+  | 'P2P_BLOCK_REQUEST_BATCH_SIZE'
   | 'P2P_ENABLED'
   | 'P2P_GOSSIPSUB_D'
   | 'P2P_GOSSIPSUB_DHI'

diff --git a/yarn-project/p2p/src/client/p2p_client.ts b/yarn-project/p2p/src/client/p2p_client.ts
@@ -223,10 +223,10 @@ export class P2PClient extends WithTracer implements P2P {
   ) {
     super(telemetryClient, 'P2PClient');
 
-    const { blockCheckIntervalMS, l2QueueSize } = getP2PConfigFromEnv();
+    const { blockCheckIntervalMS, blockRequestBatchSize } = getP2PConfigFromEnv();
 
     this.blockStream = new L2BlockStream(l2BlockSource, this, this, {
-      batchSize: l2QueueSize,
+      batchSize: blockRequestBatchSize,
       pollIntervalMS: blockCheckIntervalMS,
     });
 
@@ -642,7 +642,6 @@ export class P2PClient extends WithTracer implements P2P {
     const txsToDelete: TxHash[] = [];
     for (const tx of this.txPool.getAllTxs()) {
       // every tx that's been generated against a block that has now been pruned is no longer valid
-      // NOTE (alexg): I think this check against block hash instead of block number?
       if (tx.data.constants.globalVariables.blockNumber.toNumber() > latestBlock) {
         txsToDelete.push(tx.getTxHash());
       }

diff --git a/yarn-project/p2p/src/config.ts b/yarn-project/p2p/src/config.ts
@@ -23,6 +23,11 @@ export interface P2PConfig extends P2PReqRespConfig {
    */
   blockCheckIntervalMS: number;
 
+  /**
+   * The number of blocks to fetch in a single batch.
+   */
+  blockRequestBatchSize: number;
+
   /**
    * The frequency in which to check for new peers.
    */
@@ -295,6 +300,11 @@ export const p2pConfigMappings: ConfigMappingsType<P2PConfig> = {
     description: 'The chain id of the L1 chain.',
     ...numberConfigHelper(31337),
   },
+  blockRequestBatchSize: {
+    env: 'P2P_BLOCK_REQUEST_BATCH_SIZE',
+    description: 'The number of blocks to fetch in a single batch.',
+    ...numberConfigHelper(20),
+  },
   ...p2pReqRespConfigMappings,
 };