feat!: Use combined p2p and http prover coordination

spartan/aztec-network/templates/prover-node.yaml

@@ -144,11 +144,7 @@ spec:
               value: "{{ .Values.proverNode.proverBroker.jobTimeoutMs }}"
             - name: PROVER_BROKER_JOB_MAX_RETRIES
               value: "{{ .Values.proverNode.proverBroker.jobMaxRetries }}"
-            - name: PROVER_NODE_TX_GATHERING_TIMEOUT_MS
-              value: "{{ .Values.proverNode.txGathering.timeoutMs }}"
-            - name: PROVER_NODE_TX_GATHERING_INTERVAL_MS
-              value: "{{ .Values.proverNode.txGathering.intervalMs }}"
-            - name: PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS
+            - name: PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE
               value: "{{ .Values.proverNode.txGathering.maxParallelRequests }}"
             - name: PROVER_FAILED_PROOF_STORE
               value: "{{ .Values.proverNode.failedProofStore }}"

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

@@ -108,9 +108,8 @@ export async function startProverNode(
   const proverNode = await createProverNode(proverConfig, { telemetry, broker }, { prefilledPublicData });
   services.proverNode = [proverNode, ProverNodeApiSchema];
 
-  const p2p = proverNode.getP2P();
-  if (p2p) {
-    services.p2p = [proverNode.getP2P(), P2PApiSchema];
+  if (proverNode.getP2P()) {
+    services.p2p = [proverNode.getP2P()!, P2PApiSchema];
   }
 
   if (!proverConfig.proverBrokerUrl) {

yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts

@@ -282,7 +282,7 @@ export class FullProverTest {
     this.logger.verbose('Starting prover node');
     const proverConfig: ProverNodeConfig = {
       ...this.context.aztecNodeConfig,
-      proverCoordinationNodeUrl: undefined,
+      proverCoordinationNodeUrls: [],
       dataDirectory: undefined,
       proverId: this.proverAddress.toField(),
       realProofs: this.realProofs,
@@ -291,9 +291,9 @@ export class FullProverTest {
       proverNodeMaxPendingJobs: 100,
       proverNodeMaxParallelBlocksPerEpoch: 32,
       proverNodePollingIntervalMs: 100,
-      txGatheringTimeoutMs: 60000,
       txGatheringIntervalMs: 1000,
-      txGatheringMaxParallelRequests: 100,
+      txGatheringBatchSize: 10,
+      txGatheringMaxParallelRequestsPerNode: 100,
     };
     const sponsoredFPCAddress = await getSponsoredFPCAddress();
     const { prefilledPublicData } = await getGenesisValues(

yarn-project/end-to-end/src/e2e_snapshot_sync.test.ts

@@ -68,13 +68,13 @@ describe('e2e_snapshot_sync', () => {
         ...context.config,
         dataDirectory: join(context.config.dataDirectory!, randomBytes(8).toString('hex')),
         p2pEnabled: true, // So we don't need prover coordination
-        proverCoordinationNodeUrl: undefined,
+        proverCoordinationNodeUrls: [],
         proverNodeMaxPendingJobs: 10,
         proverNodeMaxParallelBlocksPerEpoch: 32,
         proverNodePollingIntervalMs: 200,
-        txGatheringTimeoutMs: 60000,
         txGatheringIntervalMs: 1000,
-        txGatheringMaxParallelRequests: 100,
+        txGatheringBatchSize: 10,
+        txGatheringMaxParallelRequestsPerNode: 10,
         proverAgentCount: 1,
         realProofs: false,
         ...config,

yarn-project/end-to-end/src/fixtures/utils.ts

@@ -801,17 +801,17 @@ export async function createAndSyncProverNode(
   // Prover node config is for simulated proofs
   const proverConfig: ProverNodeConfig = {
     ...aztecNodeConfig,
-    proverCoordinationNodeUrl: undefined,
+    proverCoordinationNodeUrls: [],
     dataDirectory: undefined,
     realProofs: false,
     proverAgentCount: 2,
     publisherPrivateKey: proverNodePrivateKey,
     proverNodeMaxPendingJobs: 10,
     proverNodeMaxParallelBlocksPerEpoch: 32,
     proverNodePollingIntervalMs: 200,
-    txGatheringTimeoutMs: 60000,
     txGatheringIntervalMs: 1000,
-    txGatheringMaxParallelRequests: 100,
+    txGatheringBatchSize: 10,
+    txGatheringMaxParallelRequestsPerNode: 10,
   };
 
   const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');

yarn-project/foundation/src/config/env_var.ts

@@ -132,15 +132,15 @@ export type EnvVar =
   | 'PROVER_BROKER_BATCH_INTERVAL_MS'
   | 'PROVER_BROKER_BATCH_SIZE'
   | 'PROVER_BROKER_MAX_EPOCHS_TO_KEEP_RESULTS_FOR'
-  | 'PROVER_COORDINATION_NODE_URL'
+  | 'PROVER_COORDINATION_NODE_URLS'
   | 'PROVER_FAILED_PROOF_STORE'
   | 'PROVER_ID'
   | 'PROVER_NODE_POLLING_INTERVAL_MS'
   | 'PROVER_NODE_MAX_PENDING_JOBS'
   | 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH'
-  | 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS'
   | 'PROVER_NODE_TX_GATHERING_INTERVAL_MS'
-  | 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS'
+  | 'PROVER_NODE_TX_GATHERING_BATCH_SIZE'
+  | 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE'
   | 'PROVER_PUBLISH_RETRY_INTERVAL_MS'
   | 'PROVER_PUBLISHER_PRIVATE_KEY'
   | 'PROVER_REAL_PROOFS'