diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08f928574..9f84ddabc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -126,7 +126,7 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: latest
+          version: v1.59.0
           skip-pkg-cache: true
       - name: Custom Lint
         run: |
diff --git a/cmd/replay/db.go b/cmd/replay/db.go
index 63b36526b..8488168a9 100644
--- a/cmd/replay/db.go
+++ b/cmd/replay/db.go
@@ -36,7 +36,6 @@ func (db PreimageDb) Get(key []byte) ([]byte, error) {
 		return nil, fmt.Errorf("preimage DB attempted to access non-hash key %v", hex.EncodeToString(key))
 	}
 
-	println("Reading pre-image", hex.EncodeToString(hash[:]))
 	return wavmio.ResolveTypedPreimage(arbutil.Keccak256PreimageType, hash)
 }
 
diff --git a/cmd/replay/main.go b/cmd/replay/main.go
index 34b749edc..6666f5f6b 100644
--- a/cmd/replay/main.go
+++ b/cmd/replay/main.go
@@ -246,9 +246,9 @@ func main() {
 		if dasEnabled {
 			// DAS batch and keysets are all together in the same preimage binary.
 			dasReader = &PreimageDASReader{}
+			dasKeysetFetcher = &PreimageDASReader{}
 		} else if eigenDAEnabled {
 			eigenDAReader = &EigenDAPreimageReader{}
-			dasKeysetFetcher = &PreimageDASReader{}
 		}
 		backend := WavmInbox{}
 		var keysetValidationMode = daprovider.KeysetPanicIfInvalid
diff --git a/contracts b/contracts
index 2ac6e8160..44895f80e 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit 2ac6e8160bd64eb6a36dd8484b91f1ba8d492ea5
+Subproject commit 44895f80e8225a02a722379ab24c125f851e10db
diff --git a/go-ethereum b/go-ethereum
index 1708dd657..5a2943cbe 160000
--- a/go-ethereum
+++ b/go-ethereum
@@ -1 +1 @@
-Subproject commit 1708dd657505bbb8319c0d73bdf27fe386105372
+Subproject commit 5a2943cbed319de002d3cc326f9404e8c083950d
diff --git a/system_tests/full_challenge_impl_test.go b/system_tests/full_challenge_impl_test.go
index 2fca53602..91b2cb80b 100644
--- a/system_tests/full_challenge_impl_test.go
+++ b/system_tests/full_challenge_impl_test.go
@@ -358,6 +358,14 @@ func RunChallengeTest(t *testing.T, asserterIsCorrect bool, useStubs bool, chall
 	conf.InboxReader.CheckDelay = time.Second
 
 	if useEigenDA {
+		t.Log("Using EigenDA configurations for challenge test")
+		builder.chainConfig = params.ArbitrumDevTestEigenDAConfig()
+		builder.chainConfig.ArbitrumChainParams.EigenDA = true
+		builder.nodeConfig.EigenDA = eigenda.EigenDAConfig{
+			Enable: true,
+			Rpc:    "http://localhost:4242",
+		}
+
 		chainConfig = params.ArbitrumDevTestEigenDAConfig()
 		chainConfig.ArbitrumChainParams.EigenDA = true
 		conf.EigenDA = eigenda.EigenDAConfig{
@@ -402,9 +410,19 @@ func RunChallengeTest(t *testing.T, asserterIsCorrect bool, useStubs bool, chall
 	challengerRollupAddresses.Bridge = challengerBridgeAddr
 	challengerRollupAddresses.SequencerInbox = challengerSeqInboxAddr
 	challengerL2Info := NewArbTestInfo(t, chainConfig.ChainID)
-	challengerParams := SecondNodeParams{
-		addresses: &challengerRollupAddresses,
-		initData:  &challengerL2Info.ArbInitData,
+
+	var challengerParams SecondNodeParams
+	if useEigenDA {
+		challengerParams = SecondNodeParams{
+			nodeConfig: conf,
+			addresses:  &challengerRollupAddresses,
+			initData:   &challengerL2Info.ArbInitData,
+		}
+	} else {
+		challengerParams = SecondNodeParams{
+			addresses: &challengerRollupAddresses,
+			initData:  &challengerL2Info.ArbInitData,
+		}
 	}
 	challenger, challengerCleanup := builder.Build2ndNode(t, &challengerParams)
 	defer challengerCleanup()
@@ -508,7 +526,6 @@ func RunChallengeTest(t *testing.T, asserterIsCorrect bool, useStubs bool, chall
 	confirmLatestBlock(ctx, t, l1Info, l1Backend)
 
 	readers := make([]daprovider.Reader, 1)
-
 	if useEigenDA {
 		eigenDA, err := eigenda.NewEigenDA(&conf.EigenDA)
 
diff --git a/system_tests/full_challenge_mock_test.go b/system_tests/full_challenge_mock_test.go
index 1e6ac3d58..c6f821745 100644
--- a/system_tests/full_challenge_mock_test.go
+++ b/system_tests/full_challenge_mock_test.go
@@ -9,15 +9,15 @@ import "testing"
 func TestMockChallengeManagerAsserterIncorrect(t *testing.T) {
 	defaultWasmRootDir := ""
 	for i := int64(1); i <= makeBatch_MsgsPerBatch*3; i++ {
-		RunChallengeTest(t, false, true, i, true, defaultWasmRootDir)
 		RunChallengeTest(t, false, true, i, false, defaultWasmRootDir)
+		RunChallengeTest(t, false, true, i, true, defaultWasmRootDir)
 	}
 }
 
 func TestMockChallengeManagerAsserterCorrect(t *testing.T) {
 	defaultWasmRootDir := ""
 	for i := int64(1); i <= makeBatch_MsgsPerBatch*3; i++ {
-		RunChallengeTest(t, true, true, i, true, defaultWasmRootDir)
 		RunChallengeTest(t, true, true, i, false, defaultWasmRootDir)
+		RunChallengeTest(t, true, true, i, true, defaultWasmRootDir)
 	}
 }
diff --git a/system_tests/full_challenge_test.go b/system_tests/full_challenge_test.go
index deebfd912..f8c92a00e 100644
--- a/system_tests/full_challenge_test.go
+++ b/system_tests/full_challenge_test.go
@@ -17,6 +17,7 @@ func TestChallengeManagerFullAsserterIncorrect(t *testing.T) {
 	t.Parallel()
 	defaultWasmRootDir := ""
 	RunChallengeTest(t, false, false, makeBatch_MsgsPerBatch+1, false, defaultWasmRootDir)
+	RunChallengeTest(t, false, false, makeBatch_MsgsPerBatch+1, true, defaultWasmRootDir)
 }
 
 func TestChallengeManagerFullAsserterIncorrectWithPublishedMachine(t *testing.T) {
@@ -25,12 +26,14 @@ func TestChallengeManagerFullAsserterIncorrectWithPublishedMachine(t *testing.T)
 	Require(t, err)
 	machPath := populateMachineDir(t, cr)
 	RunChallengeTest(t, false, true, makeBatch_MsgsPerBatch+1, false, machPath)
+	RunChallengeTest(t, false, true, makeBatch_MsgsPerBatch+1, true, machPath)
 }
 
 func TestChallengeManagerFullAsserterCorrect(t *testing.T) {
 	t.Parallel()
 	defaultWasmRootDir := ""
 	RunChallengeTest(t, true, false, makeBatch_MsgsPerBatch+2, false, defaultWasmRootDir)
+	RunChallengeTest(t, true, false, makeBatch_MsgsPerBatch+2, true, defaultWasmRootDir)
 }
 
 func TestChallengeManagerFullAsserterCorrectWithPublishedMachine(t *testing.T) {
@@ -39,4 +42,5 @@ func TestChallengeManagerFullAsserterCorrectWithPublishedMachine(t *testing.T) {
 	Require(t, err)
 	machPath := populateMachineDir(t, cr)
 	RunChallengeTest(t, true, true, makeBatch_MsgsPerBatch+2, false, machPath)
+	RunChallengeTest(t, true, true, makeBatch_MsgsPerBatch+2, true, machPath)
 }