AztecProtocol · Maddiaa0 · Mar 12, 2025 · Mar 7, 2025 · Mar 7, 2025 · Mar 8, 2025
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,10 +49,8 @@ services:
       FEE_JUICE_CONTRACT_ADDRESS: "0x73c43b919973711e096bfc04c9d4b3be511ffc0b"
       FEE_JUICE_PORTAL_CONTRACT_ADDRESS: "0xdf25b0a34dbee9f25518f7a4d63bab8b3bb3e496"
       ETHEREUM_HOSTS:
-      P2P_TCP_LISTEN_ADDR: "0.0.0.0:9000"
-      P2P_UDP_LISTEN_ADDR: "0.0.0.0:9001"
-      P2P_TCP_ANNOUNCE_ADDR: ":9000"
-      P2P_UDP_ANNOUNCE_ADDR: ":9001"
+      P2P_IP: "127.0.0.1"
+      P2P_PORT: 9000
       P2P_QUERY_FOR_IP: true
       P2P_ENABLED: true
       PEER_ID_PRIVATE_KEY:

diff --git a/iac/network/scripts/bootnode_startup.sh b/iac/network/scripts/bootnode_startup.sh
@@ -123,8 +123,8 @@ docker run \
  --publish $P2P_PORT:$P2P_PORT/udp \
  --env DATA_DIRECTORY \
  --env DATA_STORE_MAP_SIZE_KB \
- --env P2P_UDP_ANNOUNCE_ADDR \
- --env P2P_UDP_LISTEN_ADDR \
+ --env P2P_IP \
+ --env P2P_PORT \
  --env PEER_ID_PRIVATE_KEY \
  --env L1_CHAIN_ID \
  --env AZTEC_PORT \
@@ -137,8 +137,7 @@ chmod +x /home/$SSH_USER/start.sh
 
 DATA_DIRECTORY=/home/$SSH_USER/data
 
-P2P_UDP_ANNOUNCE_ADDR="$PUBLIC_IP:$P2P_PORT"
-P2P_UDP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
+P2P_IP="$PUBLIC_IP"
 
 mkdir -p $DATA_DIRECTORY
 
@@ -157,12 +156,11 @@ WorkingDirectory=/home/$SSH_USER
 Environment="PEER_ID_PRIVATE_KEY=$PEER_ID_PRIVATE_KEY"
 Environment="DATA_STORE_MAP_SIZE_KB=$DATA_STORE_MAP_SIZE_KB"
 Environment="DATA_DIRECTORY=$DATA_DIRECTORY"
-Environment="P2P_UDP_ANNOUNCE_ADDR=$P2P_UDP_ANNOUNCE_ADDR"
-Environment="P2P_UDP_LISTEN_ADDR=$P2P_UDP_LISTEN_ADDR"
+Environment="P2P_IP=$P2P_IP"
+Environment="P2P_PORT=$P2P_PORT"
 Environment="L1_CHAIN_ID=$L1_CHAIN_ID"
 Environment="AZTEC_PORT=80"
 Environment="LOG_LEVEL=$LOG_LEVEL"
-Environment="P2P_PORT=$P2P_PORT"
 Environment="NETWORK_NAME=$NETWORK_NAME"
 Environment="REPO=$REPO"
 Environment="IMAGE=$IMAGE"

diff --git a/iac/network/scripts/deploy_bootnodes.sh b/iac/network/scripts/deploy_bootnodes.sh
@@ -136,8 +136,7 @@ while read -r REGION IP; do
     PRIVATE_KEY=$(gcloud secrets versions access latest --secret="${SECRET_NAME}")
 
     # Now we can generate the enr
-    UDP_ANNOUNCE="$IP:$P2P_UDP_PORT"
-    ENR=$(cd scripts && ./generate_encoded_enr.sh "$PRIVATE_KEY" "$UDP_ANNOUNCE" "$L1_CHAIN_ID" $TAG)
+    ENR=$(cd scripts && ./generate_encoded_enr.sh "$PRIVATE_KEY" "$IP" "$P2P_UDP_PORT" "$L1_CHAIN_ID" $TAG)
 
     echo "ENR: $ENR"
 

diff --git a/iac/network/scripts/generate_encoded_enr.sh b/iac/network/scripts/generate_encoded_enr.sh
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 
 PRIVATE_KEY=${1:-}
-UDP_ADDRESS=${2:-}
-L1_CHAIN_ID=${3:-}
-TAG=${4:-"latest"}
+P2P_IP=${2:-}
+P2P_PORT=${3:-}
+L1_CHAIN_ID=${4:-}
+TAG=${5:-"latest"}
 
 function get_enr {
-  docker run --rm aztecprotocol/aztec:$TAG node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js generate-bootnode-enr $PRIVATE_KEY $UDP_ADDRESS -c $L1_CHAIN_ID
+  docker run --rm aztecprotocol/aztec:$TAG node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js generate-bootnode-enr $PRIVATE_KEY $P2P_IP $P2P_PORT -c $L1_CHAIN_ID
 }
 
 OUTPUT="$(get_enr)"

diff --git a/spartan/aztec-network/files/config/setup-p2p-addresses.sh b/spartan/aztec-network/files/config/setup-p2p-addresses.sh
@@ -19,21 +19,15 @@ if [ "${NETWORK_PUBLIC}" = "true" ]; then
         EXTERNAL_IP=$(kubectl get node $NODE_NAME -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}')
     fi
 
-    TCP_ADDR="${EXTERNAL_IP}:${P2P_TCP_PORT}"
-    UDP_ADDR="${EXTERNAL_IP}:${P2P_UDP_PORT}"
-
+    IP=${EXTERNAL_IP}
 else
     # Get pod IP for non-public networks
-    POD_IP=$(hostname -i)
-    TCP_ADDR="${POD_IP}:${P2P_TCP_PORT}"
-    UDP_ADDR="${POD_IP}:${P2P_UDP_PORT}"
+    IP=$(hostname -i)
 fi
 
 # Write addresses to file for sourcing
-echo "export P2P_TCP_ANNOUNCE_ADDR=${TCP_ADDR}" > /shared/config/p2p-addresses
-echo "export P2P_TCP_LISTEN_ADDR=0.0.0.0:${P2P_TCP_PORT}" >> /shared/config/p2p-addresses
-echo "export P2P_UDP_ANNOUNCE_ADDR=${UDP_ADDR}" >> /shared/config/p2p-addresses
-echo "export P2P_UDP_LISTEN_ADDR=0.0.0.0:${P2P_UDP_PORT}" >> /shared/config/p2p-addresses
+echo "export P2P_IP=${IP}" > /shared/config/p2p-addresses
+echo "export P2P_PORT=${P2P_PORT}" >> /shared/config/p2p-addresses
 
 echo "P2P addresses configured:"
 cat /shared/config/p2p-addresses
diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl
@@ -311,10 +311,8 @@ Combined P2P, and Service Address Setup Container
       value: "{{ .Values.network.public }}"
     - name: NAMESPACE
       value: {{ .Release.Namespace }}
-    - name: P2P_TCP_PORT
-      value: "{{ .Values.validator.service.p2pTcpPort }}"
-    - name: P2P_UDP_PORT
-      value: "{{ .Values.validator.service.p2pUdpPort }}"
+    - name: P2P_PORT
+      value: "{{ .Values.validator.service.p2pPort }}"
     - name: TELEMETRY
       value: "{{ .Values.telemetry.enabled }}"
     - name: OTEL_COLLECTOR_ENDPOINT

diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml
@@ -235,8 +235,8 @@ spec:
             {{- end }}
           ports:
             - containerPort: {{ .Values.bootNode.service.nodePort }}
-            - containerPort: {{ .Values.bootNode.service.p2pTcpPort }}
-            - containerPort: {{ .Values.bootNode.service.p2pUdpPort }}
+            - containerPort: {{ .Values.bootNode.service.p2pPort }}
+            - containerPort: {{ .Values.bootNode.service.p2pPort }}
               protocol: UDP
           resources:
             {{- toYaml .Values.bootNode.resources | nindent 12 }}
@@ -283,9 +283,9 @@ spec:
   ports:
     # External load balancers cannot handle mixed TCP/UDP ports, so we only expose the node port
     {{- if not .Values.network.public }}
-    - port: {{ .Values.bootNode.service.p2pTcpPort }}
+    - port: {{ .Values.bootNode.service.p2pPort }}
       name: p2p-tcp
-    - port: {{ .Values.bootNode.service.p2pUdpPort }}
+    - port: {{ .Values.bootNode.service.p2pPort }}
       name: p2p-udp
       protocol: UDP
     {{- end }}

diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml
@@ -160,8 +160,8 @@ spec:
             {{- end }}
           ports:
             - containerPort: {{ .Values.fullNode.service.nodePort }}
-            - containerPort: {{ .Values.fullNode.service.p2pTcpPort }}
-            - containerPort: {{ .Values.fullNode.service.p2pUdpPort }}
+            - containerPort: {{ .Values.fullNode.service.p2pPort }}
+            - containerPort: {{ .Values.fullNode.service.p2pPort }}
               protocol: UDP
           resources:
             {{- toYaml .Values.fullNode.resources | nindent 12 }}
@@ -212,9 +212,9 @@ spec:
   ports:
     # External load balancers cannot handle mixed TCP/UDP ports, so we only expose the node port
     {{- if not .Values.network.public }}
-    - port: {{ .Values.fullNode.service.p2pTcpPort }}
+    - port: {{ .Values.fullNode.service.p2pPort }}
       name: p2p-tpc
-    - port: {{ .Values.fullNode.service.p2pUdpPort }}
+    - port: {{ .Values.fullNode.service.p2pPort }}
       name: p2p-udp
       protocol: UDP
     {{- end }}

diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml
@@ -210,10 +210,8 @@ spec:
               value: "{{ .Values.proverNode.p2p.enabled }}"
             - name: P2P_GOSSIPSUB_FLOOD_PUBLISH
               value: "{{ .Values.proverNode.p2p.floodPublish }}"
-            - name: P2P_TCP_LISTEN_ADDR
-              value: "0.0.0.0:{{ .Values.proverNode.service.p2pTcpPort }}"
-            - name: P2P_UDP_LISTEN_ADDR
-              value: "0.0.0.0:{{ .Values.proverNode.service.p2pUdpPort }}"
+            - name: P2P_PORT
+              value: "{{ .Values.proverNode.service.p2pPort }}"
             - name: ETHEREUM_SLOT_DURATION
               value: "{{ .Values.ethereum.blockTime }}"
             - name: AZTEC_SLOT_DURATION
@@ -244,8 +242,8 @@ spec:
               value: "{{ .Values.network.p2pBootstrapNodesAsFullPeers }}"
           ports:
             - containerPort: {{ .Values.proverNode.service.nodePort }}
-            - containerPort: {{ .Values.proverNode.service.p2pTcpPort }}
-            - containerPort: {{ .Values.proverNode.service.p2pUdpPort }}
+            - containerPort: {{ .Values.proverNode.service.p2pPort }}
+            - containerPort: {{ .Values.proverNode.service.p2pPort }}
               protocol: UDP
           resources:
             {{- toYaml .Values.proverNode.resources | nindent 12 }}
@@ -283,9 +281,9 @@ spec:
   ports:
     - port: {{ .Values.proverNode.service.nodePort }}
       name: node
-    - port: {{ .Values.proverNode.service.p2pTcpPort }}
+    - port: {{ .Values.proverNode.service.p2pPort }}
       name: p2p-tcp
-    - port: {{ .Values.proverNode.service.p2pUdpPort }}
+    - port: {{ .Values.proverNode.service.p2pPort }}
       name: p2p-udp
       protocol: UDP
 {{ end }}
diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
@@ -195,8 +195,8 @@ spec:
             {{- end }}
           ports:
             - containerPort: {{ .Values.validator.service.nodePort }}
-            - containerPort: {{ .Values.validator.service.p2pTcpPort }}
-            - containerPort: {{ .Values.validator.service.p2pUdpPort }}
+            - containerPort: {{ .Values.validator.service.p2pPort }}
+            - containerPort: {{ .Values.validator.service.p2pPort }}
               protocol: UDP
           resources:
             {{- toYaml .Values.validator.resources | nindent 12 }}
@@ -235,10 +235,10 @@ spec:
     {{- include "aztec-network.selectorLabels" . | nindent 4 }}
     app: validator
   ports:
-    - port: {{ .Values.validator.service.p2pTcpPort }}
+    - port: {{ .Values.validator.service.p2pPort }}
       name: p2p-tcp
       protocol: TCP
-    - port: {{ .Values.validator.service.p2pUdpPort }}
+    - port: {{ .Values.validator.service.p2pPort }}
       name: p2p-udp
       protocol: UDP
     - port: {{ .Values.validator.service.nodePort }}

diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -77,8 +77,7 @@ bootNode:
   externalHost: ""
   replicas: 1
   service:
-    p2pTcpPort: 40400
-    p2pUdpPort: 40400
+    p2pPort: 40400
     nodePort: 8080
   logLevel: "debug; info: aztec:simulator, json-rpc"
   p2p:
@@ -113,8 +112,7 @@ fullNode:
   externalHost: ""
   replicas: 1
   service:
-    p2pTcpPort: 40400
-    p2pUdpPort: 40400
+    p2pPort: 40400
     nodePort: 8080
   logLevel: "debug; info: aztec:simulator, json-rpc"
   p2p:
@@ -151,8 +149,7 @@ validator:
   dynamicBootNode: false
   replicas: 1
   service:
-    p2pTcpPort: 40400
-    p2pUdpPort: 40400
+    p2pPort: 40400
     nodePort: 8080
   logLevel: "debug; info: aztec:simulator, json-rpc"
   sequencer:
@@ -192,8 +189,7 @@ proverNode:
     enabled: true
     floodPublish: true
   service:
-    p2pTcpPort: 40400
-    p2pUdpPort: 40400
+    p2pPort: 40400
     nodePort: 8080
   logLevel: "debug; info: aztec:simulator, json-rpc"
   proverAgent:

diff --git a/yarn-project/aztec/src/cli/cmds/start_p2p_bootstrap.ts b/yarn-project/aztec/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 };
 }
diff --git a/yarn-project/aztec/terraform/prover-node/main.tf b/yarn-project/aztec/terraform/prover-node/main.tf
@@ -281,10 +281,8 @@ resource "aws_ecs_task_definition" "aztec-prover-node" {
         { name = "P2P_ENABLED", value = tostring(var.P2P_ENABLED) },
         { name = "BOOTSTRAP_NODES", value = var.BOOTSTRAP_NODES },
         { name = "PEER_ID_PRIVATE_KEY", value = local.node_p2p_private_keys[count.index] },
-        { name = "P2P_TCP_LISTEN_ADDR", value = "0.0.0.0:${var.NODE_P2P_TCP_PORT + count.index}" },
-        { name = "P2P_UDP_LISTEN_ADDR", value = "0.0.0.0:${var.NODE_P2P_UDP_PORT + count.index}" },
-        { name = "P2P_TCP_ANNOUNCE_ADDR", value = ":${var.NODE_P2P_TCP_PORT + count.index}" },
-        { name = "P2P_UDP_ANNOUNCE_ADDR", value = ":${var.NODE_P2P_UDP_PORT + count.index}" },
+        { name = "P2P_IP", value = "0.0.0.0" },
+        { name = "P2P_PORT", value = "${var.NODE_P2P_TCP_PORT + count.index}" },
         { name = "P2P_QUERY_FOR_IP", value = "true" },
         { name = "P2P_MAX_PEERS", value = var.P2P_MAX_PEERS },
         { name = "P2P_BLOCK_CHECK_INTERVAL_MS", value = "1000" },

diff --git a/yarn-project/cli/src/cmds/misc/generate_bootnode_enr.ts b/yarn-project/cli/src/cmds/misc/generate_bootnode_enr.ts
@@ -3,10 +3,11 @@ import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
 
 export async function generateEncodedBootnodeENR(
   privateKey: string,
-  udpAnnounceAddress: string,
+  p2pIp: string,
+  p2pPort: number,
   l1ChainId: number,
   log: LogFn,
 ) {
-  const { enr } = await createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId);
+  const { enr } = await createBootnodeENRandPeerId(privateKey, p2pIp, p2pPort, l1ChainId);
   log(`ENR: ${enr.encodeTxt()}`);
 }
diff --git a/yarn-project/cli/src/cmds/misc/index.ts b/yarn-project/cli/src/cmds/misc/index.ts
@@ -35,11 +35,12 @@ export function injectCommands(program: Command, log: LogFn) {
     .summary('Generates the encoded ENR record for a bootnode.')
     .description('Generates the encoded ENR record for a bootnode.')
     .argument('<privateKey>', 'The peer id private key of the bootnode')
-    .argument('<udpAnnounceAddress>', 'The bootnode UDP announce address')
+    .argument('<p2pIp>', 'The bootnode P2P IP address')
+    .argument('<p2pPort>', 'The bootnode P2P port')
     .addOption(l1ChainIdOption)
-    .action(async (privateKey: string, udpAnnounceAddress: string, options) => {
+    .action(async (privateKey: string, p2pIp: string, p2pPort: number, options) => {
       const { generateEncodedBootnodeENR } = await import('./generate_bootnode_enr.js');
-      await generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, options.l1ChainId, log);
+      await generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, options.l1ChainId, log);
     });
 
   program

diff --git a/yarn-project/end-to-end/scripts/docker-compose-p2p.yml b/yarn-project/end-to-end/scripts/docker-compose-p2p.yml
@@ -16,9 +16,8 @@ services:
     environment:
       LOG_LEVEL: ${LOG_LEVEL:-verbose}
       DEBUG: ${DEBUG:-""}
-      P2P_TCP_LISTEN_ADDR: '0.0.0.0:40400'
-      P2P_TCP_ANNOUNCE_ADDR: 'p2p-bootstrap:40400'
-      P2P_UDP_ANNOUNCE_ADDR: 'p2p-bootstrap:40400'
+      P2P_PORT: '40400'
+      P2P_IP: 'p2p-bootstrap'
       PEER_ID_PRIVATE_KEY: '0a260024080112205ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e1224080112205ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e1a44080112402df8b977f356c6e34fa021c9647973234dff4df706c185794405aafb556723cf5ea53185db2e52dae74d0d4d6cadc494174810d0a713cd09b0ac517c38bc781e'
 
   end-to-end:
@@ -38,7 +37,7 @@ services:
       SEQ_MIN_TX_PER_BLOCK: 1
       SEQ_MAX_SECONDS_BETWEEN_BLOCKS: 0
       SEQ_MIN_SECONDS_BETWEEN_BLOCKS: 0
-      P2P_TCP_LISTEN_ADDR: '0.0.0.0:40400'
+      P2P_PORT: '40400'
       P2P_NAT_ENABLED: 'false'
       P2P_ENABLED: 'true'
       BOOTSTRAP_NODES: '/ip4/p2p-bootstrap/tcp/40400/p2p/12D3KooWGBpbC6qQFkaCYphjNeY6sV99o4SnEWyTeBigoVriDn4D'

diff --git a/yarn-project/end-to-end/scripts/native-network/boot-node.sh b/yarn-project/end-to-end/scripts/native-network/boot-node.sh
@@ -22,10 +22,8 @@ export VALIDATOR_DISABLED="true"
 export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
 export SEQ_MAX_SECONDS_BETWEEN_BLOCKS="0"
 export SEQ_MIN_TX_PER_BLOCK="1"
-export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:40400"
-export P2P_UDP_ANNOUNCE_ADDR="127.0.0.1:40400"
-export P2P_TCP_LISTEN_ADDR="0.0.0.0:40400"
-export P2P_UDP_LISTEN_ADDR="0.0.0.0:40400"
+export P2P_IP="127.0.0.1"
+export P2P_PORT="40400"
 export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}"
 export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-}"
 export OTEL_EXPORTER_OTLP_LOGS_ENDPOINT="${OTEL_EXPORTER_OTLP_LOGS_ENDPOINT:-}"

diff --git a/yarn-project/end-to-end/scripts/native-network/validator.sh b/yarn-project/end-to-end/scripts/native-network/validator.sh
@@ -64,10 +64,8 @@ export P2P_ENABLED="true"
 export VALIDATOR_DISABLED="false"
 export SEQ_MAX_SECONDS_BETWEEN_BLOCKS="0"
 export SEQ_MIN_TX_PER_BLOCK="1"
-export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
-export P2P_UDP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT"
-export P2P_TCP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
-export P2P_UDP_LISTEN_ADDR="0.0.0.0:$P2P_PORT"
+export P2P_IP="127.0.0.1"
+export P2P_PORT="$P2P_PORT"
 export BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5053}"
 export L1_CHAIN_ID=${L1_CHAIN_ID:-31337}
 export OTEL_RESOURCE_ATTRIBUTES="service.name=validator-node-${PORT}"

diff --git a/yarn-project/end-to-end/scripts/start_p2p_e2e.sh b/yarn-project/end-to-end/scripts/start_p2p_e2e.sh
@@ -11,7 +11,7 @@ export SEQ_MIN_TX_PER_BLOCK=32
 export SEQ_MAX_SECONDS_BETWEEN_BLOCKS=0
 export SEQ_MIN_SECONDS_BETWEEN_BLOCKS=0
 export BOOTSTRAP_NODES='/ip4/127.0.0.1/tcp/40400/p2p/12D3KooWGBpbC6qQFkaCYphjNeY6sV99o4SnEWyTeBigoVriDn4D'
-export P2P_TCP_LISTEN_ADDR='0.0.0.0:40400'
+export P2P_PORT='40400'
 export P2P_NAT_ENABLED='false'
 export P2P_ENABLED='true'
 

diff --git a/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts b/yarn-project/end-to-end/src/fixtures/setup_p2p_test.ts
@@ -115,10 +115,8 @@ export async function createValidatorConfig(
 
   const nodeConfig: AztecNodeConfig = {
     ...config,
-    udpListenAddress: `0.0.0.0:${port}`,
-    tcpListenAddress: `0.0.0.0:${port}`,
-    tcpAnnounceAddress: `127.0.0.1:${port}`,
-    udpAnnounceAddress: `127.0.0.1:${port}`,
+    p2pIp: `127.0.0.1`,
+    p2pPort: port,
     p2pEnabled: true,
     peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
     blockCheckIntervalMS: 1000,

diff --git a/yarn-project/foundation/src/config/env_var.ts b/yarn-project/foundation/src/config/env_var.ts
@@ -102,12 +102,11 @@ export type EnvVar =
   | 'P2P_REQRESP_INDIVIDUAL_REQUEST_TIMEOUT_MS'
   | 'P2P_REQRESP_OVERALL_REQUEST_TIMEOUT_MS'
   | 'P2P_DOUBLE_SPEND_SEVERE_PEER_PENALTY_WINDOW'
-  | 'P2P_TCP_LISTEN_ADDR'
-  | 'P2P_TCP_ANNOUNCE_ADDR'
+  | 'P2P_LISTEN_ADDR'
+  | 'P2P_PORT'
+  | 'P2P_IP'
   | 'P2P_TX_POOL_KEEP_PROVEN_FOR'
   | 'P2P_ATTESTATION_POOL_KEEP_FOR'
-  | 'P2P_UDP_ANNOUNCE_ADDR'
-  | 'P2P_UDP_LISTEN_ADDR'
   | 'P2P_ARCHIVED_TX_LIMIT'
   | 'PEER_ID_PRIVATE_KEY'
   | 'PROVER_AGENT_CONCURRENCY'