update geth & prysm subrepos to latest, pointing at eip-4844 instead …

…of devnet-v3 (#57)

* update subrepos to latest, move back to using eip-4844 branch for development

* add 30 min timeout to some tests that sometimes hang

.github/workflows/ci.yml

@@ -25,16 +25,20 @@ jobs:
           go-version: '1.18'
 
       - name: Prysm - Run pre-EIP4844 tests
+        timeout-minutes: 30
         run: go run ./tests/pre-4844 prysm
 
       # TODO: A bit redundant. combine this test with fee-market
       - name: Prysm - Run Blob transaction tests
+        timeout-minutes: 30
         run: go run ./tests/blobtx prysm
 
       - name: Prysm - Run Fee market spec tests
+        timeout-minutes: 30
         run: go run ./tests/fee-market prysm
 
       - name: Prysm - Run Initial sync tests
+        timeout-minutes: 30
         run: go run ./tests/initial-sync prysm
 
       - name: Collect docker logs on failure

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "geth/go-ethereum"]
 	path = geth/go-ethereum
 	url = https://github.com/mdehoog/go-ethereum
-	branch = devnet-v3
+	branch = eip-4844
 [submodule "prysm/prysm"]
 	path = prysm/prysm
 	url = https://github.com/Inphi/prysm
-	branch = devnet-v3
+	branch = eip-4844
 [submodule "lodestar/lodestar"]
 	path = lodestar/lodestar
 	url = https://github.com/dgcoffman/lodestar