Skip to content

Commit

Permalink
Update TTD for ropsten.
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdee committed Jun 7, 2022
1 parent 61aa8c3 commit 74148cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions cmd/blockinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 74148cf

Please sign in to comment.