@aztec-labs/p2p 6.0.0-rc.1 → 6.0.0-rc.2

package/src/test-helpers/make-test-p2p-clients.ts

@@ -103,7 +103,11 @@ export async function makeTestP2PClient(
     proofVerifier,
     mockWorldState,
     mockEpochCache,
-    { getCurrentMinFees: () => Promise.resolve(GasFees.empty()) },
+    {
+      getNextBlockMinFees: () => Promise.resolve(GasFees.empty()),
+      getAdmissionMinFees: () => Promise.resolve(GasFees.empty()),
+      getL1ForwardMinFees: () => Promise.resolve(GasFees.empty()),
+    },
     'test-p2p-client',
     undefined,
     undefined,

package/src/test-helpers/mock-pubsub.ts

@@ -4,7 +4,7 @@ import { sleep } from '@aztec-labs/foundation/sleep';
 import type { AztecAsyncKVStore } from '@aztec-labs/kv-store';
 import type { L2BlockSource } from '@aztec-labs/stdlib/block';
 import type { ContractDataSource } from '@aztec-labs/stdlib/contract';
-import type { BlockMinFeesProvider } from '@aztec-labs/stdlib/gas';
+import type { TxAdmissionMinFeesProvider } from '@aztec-labs/stdlib/gas';
 import type { ClientProtocolCircuitVerifier, WorldStateSynchronizer } from '@aztec-labs/stdlib/interfaces/server';
 import type { TelemetryClient } from '@aztec-labs/telemetry-client';
 import type { GossipsubEvents, GossipsubMessage } from '@chainsafe/libp2p-gossipsub';
@@ -54,7 +54,7 @@ export function getMockPubSubP2PServiceFactory(
       proofVerifier: ClientProtocolCircuitVerifier;
       worldStateSynchronizer: WorldStateSynchronizer;
       peerStore: AztecAsyncKVStore;
-      blockMinFeesProvider: BlockMinFeesProvider;
+      nextBlockMinFeesProvider: TxAdmissionMinFeesProvider;
       telemetry: TelemetryClient;
       logger: Logger;
     },
@@ -75,7 +75,7 @@ export function getMockPubSubP2PServiceFactory(
       deps.epochCache,
       deps.proofVerifier,
       deps.worldStateSynchronizer,
-      deps.blockMinFeesProvider,
+      deps.nextBlockMinFeesProvider,
       deps.telemetry,
       deps.logger,
     );

package/src/test-helpers/reqresp-nodes.ts

@@ -172,7 +172,11 @@ export async function createTestLibP2PService(
     epochCache,
     proofVerifier,
     worldStateSynchronizer,
-    { getCurrentMinFees: () => Promise.resolve(GasFees.empty()) },
+    {
+      getNextBlockMinFees: () => Promise.resolve(GasFees.empty()),
+      getAdmissionMinFees: () => Promise.resolve(GasFees.empty()),
+      getL1ForwardMinFees: () => Promise.resolve(GasFees.empty()),
+    },
     telemetry,
   );
 }

package/src/test-helpers/testbench-utils.ts

@@ -1,5 +1,5 @@
 import type { EpochCacheInterface } from '@aztec-labs/epoch-cache';
-import type { CheckpointProposalHash } from '@aztec-labs/foundation/branded-types';
+import type { BlockProposalHash, CheckpointProposalHash } from '@aztec-labs/foundation/branded-types';
 import { EpochNumber, SlotNumber } from '@aztec-labs/foundation/branded-types';
 import type { Logger } from '@aztec-labs/foundation/log';
 import type { L2Block, L2BlockId } from '@aztec-labs/stdlib/block';
@@ -281,6 +281,18 @@ export class InMemoryAttestationPool {
     return Promise.resolve(false);
   }
 
+  hasBlockProposal(
+    _slot: SlotNumber,
+    _indexWithinCheckpoint: number,
+    _payloadHash: BlockProposalHash,
+  ): Promise<boolean> {
+    return Promise.resolve(false);
+  }
+
+  hasCheckpointProposal(_slot: SlotNumber, _payloadHash: CheckpointProposalHash): Promise<boolean> {
+    return Promise.resolve(false);
+  }
+
   isEmpty(): Promise<boolean> {
     return Promise.resolve(this.proposals.size === 0 && this.checkpoints.size === 0);
   }

package/src/testbench/p2p_client_testbench_worker.ts

@@ -133,7 +133,11 @@ class TestLibP2PService extends LibP2PService {
       epochCache,
       proofVerifier,
       worldStateSynchronizer,
-      { getCurrentMinFees: () => Promise.resolve(GasFees.empty()) },
+      {
+        getNextBlockMinFees: () => Promise.resolve(GasFees.empty()),
+        getAdmissionMinFees: () => Promise.resolve(GasFees.empty()),
+        getL1ForwardMinFees: () => Promise.resolve(GasFees.empty()),
+      },
       telemetry,
       logger,
     );
@@ -425,7 +429,11 @@ process.on('message', async msg => {
         proofVerifier as ClientProtocolCircuitVerifier,
         worldState,
         epochCache,
-        { getCurrentMinFees: () => Promise.resolve(GasFees.empty()) },
+        {
+          getNextBlockMinFees: () => Promise.resolve(GasFees.empty()),
+          getAdmissionMinFees: () => Promise.resolve(GasFees.empty()),
+          getL1ForwardMinFees: () => Promise.resolve(GasFees.empty()),
+        },
         'test-p2p-bench-worker',
         undefined,
         telemetry as TelemetryClient,