Merge pull request #39 from gnosischain/fix/erigon-td-remove

Mocked SetTTDBlockClient function for Erigon
gnosischain · Sep 9, 2024 · 88746f1 · 88746f1
2 parents d327e56 + 3c70684
commit 88746f1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go b/simulators/ethereum/engine-gnosis-erigon/clmock/clmock.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/binary"
-	"encoding/json"
 	"fmt"
 	"math/big"
 	"math/rand"
@@ -274,21 +273,23 @@ func (cl *CLMocker) SetTTDBlockClient(ec client.EngineClient) {
 	}
 	cl.HeaderHistory[cl.LatestHeader.Number.Uint64()] = &cl.LatestHeader.Header
 
-	ctx, cancel = context.WithTimeout(cl.TestContext, globals.RPCTimeout)
-	defer cancel()
-
-	if td, err := ec.GetTotalDifficulty(ctx); err != nil {
-		cl.Fatalf("CLMocker: Error getting total difficulty from engine client: %v", err)
-		panic(err)
-	} else if td.Cmp(ec.TerminalTotalDifficulty()) < 0 {
-		cl.Fatalf("CLMocker: Attempted to set TTD Block when TTD had not been reached: %d > %d", ec.TerminalTotalDifficulty(), td)
-		panic(err)
-	} else {
-		cl.Logf("CLMocker: TTD has been reached at block %d (%d>=%d)\n", cl.LatestHeader.Number, td, ec.TerminalTotalDifficulty())
-		jsH, _ := json.MarshalIndent(cl.LatestHeader, "", " ")
-		cl.Logf("CLMocker: Client: %s, Block %d: %s\n", ec.ID(), cl.LatestHeader.Number, jsH)
-		cl.ChainTotalDifficulty = td
-	}
+	// ctx, cancel = context.WithTimeout(cl.TestContext, globals.RPCTimeout)
+	// defer cancel()
+
+	// TODO: Commented TotalDifficulty related things to remove it in the future
+
+	// if td, err := ec.GetTotalDifficulty(ctx); err != nil {
+	// 	cl.Fatalf("CLMocker: Error getting total difficulty from engine client: %v", err)
+	// 	panic(err)
+	// } else if td.Cmp(ec.TerminalTotalDifficulty()) < 0 {
+	// 	cl.Fatalf("CLMocker: Attempted to set TTD Block when TTD had not been reached: %d > %d", ec.TerminalTotalDifficulty(), td)
+	// 	panic(err)
+	// } else {
+	// 	cl.Logf("CLMocker: TTD has been reached at block %d (%d>=%d)\n", cl.LatestHeader.Number, td, ec.TerminalTotalDifficulty())
+	// 	jsH, _ := json.MarshalIndent(cl.LatestHeader, "", " ")
+	// 	cl.Logf("CLMocker: Client: %s, Block %d: %s\n", ec.ID(), cl.LatestHeader.Number, jsH)
+	// 	cl.ChainTotalDifficulty = td
+	// }
 
 	cl.TTDReached = true
 

diff --git a/simulators/ethereum/engine-gnosis-erigon/helper/helper.go b/simulators/ethereum/engine-gnosis-erigon/helper/helper.go
@@ -315,12 +315,14 @@ func WaitForTTD(ec client.EngineClient, wg *sync.WaitGroup, done chan<- WaitTTDR
 	for {
 		select {
 		case <-time.After(TTDCheckPeriod):
-			ttdReached, err := CheckTTD(ec, ctx)
-			if err == nil && ttdReached {
+			// ttdReached, err := CheckTTD(ec, ctx)
+			// TODO: Remove WaitForTTD in the future
+			ttdReached := true
+			if ttdReached {
 				select {
 				case done <- WaitTTDResponse{
 					ec:  ec,
-					err: err,
+					err: nil,
 				}:
 				case <-ctx.Done():
 				}