Update Besu submodule url and expose default RPC port, add a Besu up …

…task to Makefile

.gitmodules

@@ -20,5 +20,5 @@
 	branch = eip4844
 [submodule "besu/besu"]
 	path = besu/besu
-	url = https://github.com/fab-10/besu
-	branch = 4844-block-proposal
+	url = https://github.com/hyperledger/besu.git
+	branch = eip-4844-interop

Makefile

@@ -39,12 +39,12 @@ lighthouse-prysm: devnet-setup
 	sleep 300
 	docker compose --project-name eip4844-interop up -d --build prysm-beacon-node-follower
 
-besu-prysm: devnet-build devnet-setup
+besu-prysm-up: devnet-build devnet-setup
 	docker compose --project-name eip4844-interop up -d --build \
 		besu-1 \
-		prysm-beacon-node \
+		prysm-beacon-node-besu-el \
 		prysm-beacon-node-follower \
-		prysm-validator-node
+		prysm-validator-node-besu-el
 
 
 devnet-down:

besu/Dockerfile.besu

@@ -1,11 +1,15 @@
 FROM gradle:7.6.0 as builder
 
 COPY besu/besu /src/besu
-COPY .git/modules/besu/besu /src/besu/.git
+COPY .git/modules/besu/besu /.git/modules/besu/besu
+
+# trick to avoid running the long downloadLicenses task
+RUN mkdir -p /src/besu/build/reports/license/ && \
+    touch /src/besu/build/reports/license/license-dependency.xml
 
 WORKDIR /src/besu
 
-RUN ./gradlew installDist
+RUN ./gradlew --no-daemon installDist
 
 FROM eclipse-temurin:17
 

docker-compose.yml

@@ -122,7 +122,7 @@ x-lighthouse-beacon-node: &lighthouse-bn
 
 services:
   genesis-generator:
-    image: fab10/ethereum-genesis-generator:eip4844
+    image: inphi/ethereum-genesis-generator:eip4844
     entrypoint: run_genesis_generator.sh
     volumes:
       - ./shared/run_genesis_generator.sh:/usr/local/bin/run_genesis_generator.sh
@@ -166,6 +166,7 @@ services:
     <<: *besu
     ports:
       - '7551:8551'
+      - '7545:8545'
 
   ethereumjs:
     image: g11tech/ethereumjs:jan23
@@ -209,6 +210,27 @@ services:
         target: /usr/local/bin/run_bootnode.sh
 
   prysm-beacon-node:
+    <<: *prysm-bn
+    depends_on:
+      geth-1:
+        condition: service_started
+      bootnode:
+        condition: service_started
+      jaeger-tracing:
+        condition: service_started
+      genesis-generator:
+        condition: service_completed_successfully
+    environment:
+      <<: *prysm-bn-env
+      EXECUTION_NODE_URL: http://geth-1:8551
+      PROCESS_NAME: beacon-node
+      MIN_SYNC_PEERS: 0
+    ports:
+      - '3500:3500'
+      - '4000:4000'
+      - '13000:13000'
+
+  prysm-beacon-node-besu-el:
     <<: *prysm-bn
     depends_on:
       besu-1:
@@ -284,6 +306,39 @@ services:
       - 'config_data:/config_data'
       - 'prysm_data:/prysm_data'
 
+  prysm-validator-node-besu-el:
+    depends_on:
+      prysm-beacon-node-besu-el:
+        condition: service_started
+      jaeger-tracing:
+        condition: service_started
+      genesis-generator:
+        condition: service_completed_successfully
+    build:
+      context: ./prysm
+      dockerfile: Dockerfile.prysm
+    command: >
+      validator
+      --accept-terms-of-use
+      --beacon-rpc-provider prysm-beacon-node:4000
+      --rpc
+      --grpc-gateway-host 0.0.0.0
+      --grpc-gateway-port 7500
+      --force-clear-db
+      --chain-config-file=/config_data/custom_config_data/config.yaml
+      --suggested-fee-recipient 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b
+      --wallet-password-file=/prysm_data/wallet_pass.txt
+      --wallet-dir=/prysm_data/wallet
+      --enable-tracing
+      --tracing-endpoint http://jaeger-tracing:14268/api/traces
+      --tracing-process-name validator-node
+      --verbosity trace
+    ports:
+      - '7500:7500'
+    volumes:
+      - 'config_data:/config_data'
+      - 'prysm_data:/prysm_data'
+
   lodestar-beacon-node:
     depends_on:
       bootnode: