From 74148cfe5ca6f6f7ad69598303b8980137566af1 Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Tue, 7 Jun 2022 18:05:41 +0100
Subject: [PATCH] Update TTD for ropsten.

---
 cmd/blockinfo.go | 8 ++++----
 cmd/version.go   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/blockinfo.go b/cmd/blockinfo.go
index 3cea793..317322c 100644
--- a/cmd/blockinfo.go
+++ b/cmd/blockinfo.go
@@ -179,7 +179,7 @@ func outputTimeToMerge(ctx context.Context,
 	}
 
 	ttds := map[uint64]*big.Int{
-		3: big.NewInt(43531756765713534),
+		3: big.NewInt(50000000000000000),
 	}
 
 	if difficulty <= 0 {
@@ -193,9 +193,9 @@ func outputTimeToMerge(ctx context.Context,
 
 	left := new(big.Int).Sub(ttd, totalDifficulty)
 	blocksLeft := new(big.Int).Div(left, big.NewInt(int64(difficulty))).Int64()
-	timeLeft := blocksLeft * 14
-	when := time.Now().Add(time.Duration(timeLeft) * time.Second)
-	builder.WriteString(fmt.Sprintf("Approximate merge time: %s\n", when))
+	timeLeft := time.Duration(blocksLeft*13) * time.Second
+	when := time.Now().Add(timeLeft)
+	builder.WriteString(fmt.Sprintf("Approximate merge time: %s (%v to go)\n", when.Format(time.RFC3339), timeLeft))
 }
 
 func outputUncles(builder *strings.Builder, uncles []types.Hash, verbose bool) {
diff --git a/cmd/version.go b/cmd/version.go
index 07e49b1..786c997 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -30,7 +30,7 @@ var versionCmd = &cobra.Command{
 
     ethereal version.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("2.8.1")
+		fmt.Println("2.8.2")
 		if viper.GetBool("verbose") {
 			buildInfo, ok := dbg.ReadBuildInfo()
 			if ok {