fix CI, Makefile, and update Prysm & geth subrepos

Note: the new prysm & geth subrepos use a different kzg trusted setup matching, which now matches the latest consensus spec

.github/workflows/ci.yml

@@ -6,9 +6,9 @@ env:
 
 on:
   push:
-    branches: ['master', 'devnet-v3']
+    branches: ['master']
   pull_request:
-    branches: ['master', 'devnet-v3']
+    branches: ['master']
 
 jobs:
   test-prysm:
@@ -45,7 +45,7 @@ jobs:
         if: failure()
         uses: jwalton/gh-docker-logs@v1
         with:
-          images: 'eip4844-interop_beacon-node-follower,eip4844-interop_beacon-node,eip4844-interop_execution-node-2,eip4844-interop_execution-node,eip4844-interop_validator-node'
+          images: 'eip4844-interop_prysm-beacon-node-follower,eip4844-interop_prysm-beacon-node,eip4844-interop_execution-node-2,eip4844-interop_execution-node,eip4844-interop_prysm-validator-node'
           dest: './logs'
 
       - name: Tar logs
@@ -88,7 +88,7 @@ jobs:
         if: failure()
         uses: jwalton/gh-docker-logs@v1
         with:
-          images: 'eip4844-interop_beacon-node-follower,eip4844-interop_beacon-node,eip4844-interop_execution-node-2,eip4844-interop_execution-node,eip4844-interop_validator-node'
+          images: 'eip4844-interop_prysm-beacon-node-follower,eip4844-interop_prysm-beacon-node,eip4844-interop_execution-node-2,eip4844-interop_execution-node,eip4844-interop_prysm-validator-node'
           dest: './logs'
 
       - name: Tar logs

.gitmodules

@@ -13,4 +13,4 @@
 [submodule "erigon/erigon"]
 	path = erigon/erigon
 	url = https://github.com/roberto-bayardo/erigon
-	branch = devnet-v3
+	branch = eip-4844

Makefile

@@ -1,5 +1,5 @@
 devnet-up:
-	docker compose --project-name eip-4844 up -d\
+	docker compose --project-name eip4844-interop up -d\
 		execution-node\
 		execution-node-2\
 		prysm-beacon-node\
@@ -8,20 +8,20 @@ devnet-up:
 		jaeger-tracing
 
 lodestar-up:
-	docker compose --project-name eip-4844 up -d\
+	docker compose --project-name eip4844-interop up -d\
 		execution-node\
 		execution-node-2\
 		lodestar-beacon-node\
 		lodestar-beacon-node-follower\
 
 devnet-down:
-	docker compose --project-name eip-4844 down -v
+	docker compose --project-name eip4844-interop down -v
 
 devnet-restart: devnet-down devnet-up
 
 devnet-clean:
-	docker compose --project-name eip-4844 down --rmi local --volumes
-	docker image ls 'eip-4844-interop*' --format='{{.Repository}}' | xargs -r docker rmi
-	docker volume ls --filter name=eip-4844-interop --format='{{.Name}}' | xargs -r docker volume rm
+	docker compose --project-name eip4844-interop down --rmi local --volumes
+	docker image ls 'eip4844-interop*' --format='{{.Repository}}' | xargs -r docker rmi
+	docker volume ls --filter name=eip4844-interop --format='{{.Name}}' | xargs -r docker volume rm
 
 .PHONY: devnet-clean