From 2baaf1137165208f2c9dae1ac1b376af37c4b44d Mon Sep 17 00:00:00 2001
From: Mario Vega <marioevz@gmail.com>
Date: Wed, 28 Jun 2023 19:46:01 +0000
Subject: [PATCH] simulators/ethereum/engine: Add ForkConfig to environment

---
 simulators/ethereum/engine/main.go              | 1 +
 simulators/ethereum/engine/suites/sync/tests.go | 2 +-
 simulators/ethereum/engine/test/env.go          | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/simulators/ethereum/engine/main.go b/simulators/ethereum/engine/main.go
index 83dd11bc81..75d782b13c 100644
--- a/simulators/ethereum/engine/main.go
+++ b/simulators/ethereum/engine/main.go
@@ -163,6 +163,7 @@ func addTestsToSuite(sim *hivesim.Simulation, suite *hivesim.Suite, tests []test
 							t,
 							c,
 							genesis,
+							&forkConfig,
 							newParams,
 							testFiles,
 						)
diff --git a/simulators/ethereum/engine/suites/sync/tests.go b/simulators/ethereum/engine/suites/sync/tests.go
index 9f4f166fd7..ee565ef5d7 100644
--- a/simulators/ethereum/engine/suites/sync/tests.go
+++ b/simulators/ethereum/engine/suites/sync/tests.go
@@ -99,7 +99,7 @@ func AddSyncTestsToSuite(sim *hivesim.Simulation, suite *hivesim.Suite, tests []
 						}
 
 						// Run the test case
-						test.Run(currentTest, big.NewInt(ttd), timeout, t, c, &genesis, syncClientParams, testFiles.Copy())
+						test.Run(currentTest, big.NewInt(ttd), timeout, t, c, &genesis, nil, syncClientParams, testFiles.Copy())
 					},
 				})
 			}
diff --git a/simulators/ethereum/engine/test/env.go b/simulators/ethereum/engine/test/env.go
index 5f4eb594d0..581c8cccbb 100644
--- a/simulators/ethereum/engine/test/env.go
+++ b/simulators/ethereum/engine/test/env.go
@@ -41,6 +41,7 @@ type Env struct {
 
 	// Client parameters used to launch the default client
 	Genesis      *core.Genesis
+	ForkConfig   *globals.ForkConfig
 	ClientParams hivesim.Params
 	ClientFiles  hivesim.Params
 
@@ -48,7 +49,7 @@ type Env struct {
 	TestTransactionType helper.TestTransactionType
 }
 
-func Run(testSpec SpecInterface, ttd *big.Int, timeout time.Duration, t *hivesim.T, c *hivesim.Client, genesis *core.Genesis, cParams hivesim.Params, cFiles hivesim.Params) {
+func Run(testSpec SpecInterface, ttd *big.Int, timeout time.Duration, t *hivesim.T, c *hivesim.Client, genesis *core.Genesis, forkConfig *globals.ForkConfig, cParams hivesim.Params, cFiles hivesim.Params) {
 	// Setup the CL Mocker for this test
 	consensusConfig := testSpec.GetConsensusConfig()
 	clMocker := clmock.NewCLMocker(
@@ -87,6 +88,7 @@ func Run(testSpec SpecInterface, ttd *big.Int, timeout time.Duration, t *hivesim
 		HiveEngine:          ec,
 		CLMock:              clMocker,
 		Genesis:             genesis,
+		ForkConfig:          forkConfig,
 		ClientParams:        cParams,
 		ClientFiles:         cFiles,
 		TestTransactionType: testSpec.GetTestTransactionType(),