From 57e0a0b8160be10c3367d2ddb48873190753b2dc Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:25:08 +0100
Subject: [PATCH 1/4] Update lodestar remote

---
 .gitmodules                  | 4 ++--
 lodestar/Dockerfile.lodestar | 4 ++--
 lodestar/lodestar            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 7f3d654..dbdc7f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,8 @@
 	branch = eip-4844
 [submodule "lodestar/lodestar"]
 	path = lodestar/lodestar
-	url = https://github.com/dgcoffman/lodestar
-	branch = dgc/eip-4844
+	url = https://github.com/ChainSafe/lodestar
+	branch = dapplion/eip-4844
 [submodule "erigon/erigon"]
 	path = erigon/erigon
 	url = https://github.com/roberto-bayardo/erigon
diff --git a/lodestar/Dockerfile.lodestar b/lodestar/Dockerfile.lodestar
index 70617a0..f4fcf8d 100644
--- a/lodestar/Dockerfile.lodestar
+++ b/lodestar/Dockerfile.lodestar
@@ -1,11 +1,11 @@
 FROM node:16
 
 RUN apt-get update && \
-    apt-get install -y jq
+    apt-get install -y jq wget
 
 COPY ./lodestar/package.json /app/lodestar/package.json
 COPY ./lodestar/yarn.lock /app/lodestar/yarn.lock
-COPY ./lodestar/trusted_setup.txt /app/lodestar/trusted_setup.txt
+RUN wget https://raw.githubusercontent.com/dgcoffman/lodestar/513b8731eb4735122972e86c2c13dbd21001fe92/trusted_setup.txt -O /app/lodestar/trusted_setup.txt
 
 COPY ./lodestar/packages/api/package.json /app/lodestar/packages/api/package.json
 COPY ./lodestar/packages/beacon-node/package.json /app/lodestar/packages/beacon-node/package.json
diff --git a/lodestar/lodestar b/lodestar/lodestar
index 513b873..c6fc7e7 160000
--- a/lodestar/lodestar
+++ b/lodestar/lodestar
@@ -1 +1 @@
-Subproject commit 513b8731eb4735122972e86c2c13dbd21001fe92
+Subproject commit c6fc7e71459a8cd2a138a312274e6dd7383cff70

From 3f6330838f5dddf7038d5b30128084f359bde0ba Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:41:26 +0100
Subject: [PATCH 2/4] Ignore empty blobs

---
 lodestar/lodestar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lodestar/lodestar b/lodestar/lodestar
index c6fc7e7..6e4bc7f 160000
--- a/lodestar/lodestar
+++ b/lodestar/lodestar
@@ -1 +1 @@
-Subproject commit c6fc7e71459a8cd2a138a312274e6dd7383cff70
+Subproject commit 6e4bc7f817d93f8035ec688e5c36b6e291fd3d8a

From af5c13a885c15d9d0836a1b6c9b0afc5c81fdaf8 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:49:01 +0100
Subject: [PATCH 3/4] Enable all Lodestar tests

---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12e8966..95ab369 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,14 +75,14 @@ jobs:
       - name: Lodestar - Run pre-EIP4844 tests
         run: go run ./tests/pre-4844 lodestar
 
-      # - name: Lodestar - Run Blob transaction tests
-      #   run: go run ./tests/blobtx lodestar
+      - name: Lodestar - Run Blob transaction tests
+        run: go run ./tests/blobtx lodestar
 
-      # - name: Lodestar - Run Fee market spec tests
-      #   run: go run ./tests/fee-market lodestar
+      - name: Lodestar - Run Fee market spec tests
+        run: go run ./tests/fee-market lodestar
 
-      # - name: Lodestar - Run Initial sync tests
-      #   run: go run ./tests/initial-sync lodestar
+      - name: Lodestar - Run Initial sync tests
+        run: go run ./tests/initial-sync lodestar
 
       - name: Collect docker logs on failure
         if: failure()

From c2c3bb73b8afa92ab9530d02d395a8c713b23265 Mon Sep 17 00:00:00 2001
From: dapplion <35266934+dapplion@users.noreply.github.com>
Date: Fri, 18 Nov 2022 22:50:04 +0100
Subject: [PATCH 4/4] Build lodestar first

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95ab369..cff306a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,6 +72,9 @@ jobs:
           #       go 1.19 is incompatible with the github.com/lucas-clemente/quic-go v0.27.2 dependency
           go-version: '1.18'
 
+      - name: Build lodestar
+        run: docker-compose build lodestar-beacon-node lodestar-beacon-node-follower
+
       - name: Lodestar - Run pre-EIP4844 tests
         run: go run ./tests/pre-4844 lodestar