feat: move devnet to shanghai

topos-protocol · Dec 18, 2023 · 202433a · 202433a
1 parent 128b137
commit 202433a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/state/stateless/stateless.go b/cmd/state/stateless/stateless.go
@@ -8,6 +8,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io/ioutil"
+	"math/big"
 	"os"
 	"os/signal"
 	"strconv"
@@ -227,6 +228,9 @@ func Stateless(
 	genesis = core.DeveloperGenesisBlock(0, core.DevnetEtherbase)
 	chainConfig := genesis.Config
 
+	// Activate Shanghai from genesis
+	chainConfig.ShanghaiTime = big.NewInt(0)
+
 	fmt.Printf("Genesis: %+v\n", genesis)
 
 	var preRoot common.Hash
@@ -496,7 +500,7 @@ func Stateless(
 				finalRootFail = true
 			} else if !binary {
 				if err = s.CheckRoot(header.Root); err != nil {
-					fmt.Printf("Wrong block hash %x in block %d\n", block.Hash(), blockNum)
+					fmt.Printf("Wrong block hash %x in block %d: %v\n", block.Hash(), blockNum, err)
 					finalRootFail = true
 				}
 			}

diff --git a/params/config.go b/params/config.go
@@ -118,6 +118,7 @@ var (
 		MuirGlacierBlock:      big.NewInt(0),
 		BerlinBlock:           big.NewInt(0),
 		LondonBlock:           big.NewInt(0),
+		ShanghaiTime:          big.NewInt(0),
 		Clique:                &chain.CliqueConfig{Period: 0, Epoch: 30000},
 	}