From ca0dffe4c08b43e0001ec99319961201dedbdfc6 Mon Sep 17 00:00:00 2001
From: Roberto Bayardo <bayardo@alum.mit.edu>
Date: Wed, 16 Nov 2022 21:51:21 -0800
Subject: [PATCH] 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 |  8 ++++----
 .gitmodules              |  2 +-
 Makefile                 | 12 ++++++------
 erigon/erigon            |  2 +-
 geth/go-ethereum         |  2 +-
 prysm/prysm              |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1ab30d..12e8966 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/.gitmodules b/.gitmodules
index de818b5..7f3d654 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,4 +13,4 @@
 [submodule "erigon/erigon"]
 	path = erigon/erigon
 	url = https://github.com/roberto-bayardo/erigon
-	branch = devnet-v3
+	branch = eip-4844
diff --git a/Makefile b/Makefile
index 8be2d19..570431c 100644
--- a/Makefile
+++ b/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
diff --git a/erigon/erigon b/erigon/erigon
index 242b5a7..c50d4e6 160000
--- a/erigon/erigon
+++ b/erigon/erigon
@@ -1 +1 @@
-Subproject commit 242b5a76df3f25783b68411ebfd5a9c17a55d88a
+Subproject commit c50d4e6c0b35df4e341e8275b0572566a6e6adfd
diff --git a/geth/go-ethereum b/geth/go-ethereum
index 60ce55a..a720ac1 160000
--- a/geth/go-ethereum
+++ b/geth/go-ethereum
@@ -1 +1 @@
-Subproject commit 60ce55a30bd0b923b8deeff387ad9a047ea103b5
+Subproject commit a720ac19cc795529b462c0bb27e05b301dcebe6d
diff --git a/prysm/prysm b/prysm/prysm
index 11dda37..e25840e 160000
--- a/prysm/prysm
+++ b/prysm/prysm
@@ -1 +1 @@
-Subproject commit 11dda3728671e28f9797b825e02e514e6d4ec5ef
+Subproject commit e25840ee7e2e8a84e1bbdb9f094ac6e8656629cd