Genesis nonce is now added via network.env

saiaman · May 4, 2023 · 8a49a28 · 8a49a28
1 parent 8fff515
commit 8a49a28
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ include network.env
 
 # Build the base command
 # WARNING: WS_ADDR is a sensitive interface and should only be exposed to trusted networks
-BASE_CMD = nice -n -20 ./build/bin/go-quai --$(NETWORK) --syncmode $(SYNCMODE) --verbosity $(VERBOSITY)
+BASE_CMD = nice -n -20 ./build/bin/go-quai --$(NETWORK) --syncmode $(SYNCMODE) --verbosity $(VERBOSITY) --nonce $(NONCE)
 BASE_CMD += --http --http.vhosts=* --http.addr $(HTTP_ADDR) --http.api $(HTTP_API)
 BASE_CMD += --ws --ws.addr $(WS_ADDR) --ws.api $(WS_API)
 ifeq ($(ENABLE_ARCHIVE),true)

diff --git a/cmd/go-quai/main.go b/cmd/go-quai/main.go
@@ -117,6 +117,7 @@ var (
 		utils.OrchardFlag,
 		utils.GalenaFlag,
 		utils.LocalFlag,
+		utils.GenesisNonceFlag,
 		utils.VMEnableDebugFlag,
 		utils.NetworkIdFlag,
 		utils.QuaiStatsURLFlag,

diff --git a/cmd/go-quai/usage.go b/cmd/go-quai/usage.go
@@ -45,6 +45,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.OrchardFlag,
 			utils.GalenaFlag,
 			utils.LocalFlag,
+			utils.GenesisNonceFlag,
 			utils.SyncModeFlag,
 			utils.ExitWhenSyncedFlag,
 			utils.GCModeFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -150,6 +150,10 @@ var (
 		Name:  "local",
 		Usage: "Local network: localhost proof-of-work node, will not attempt to connect to bootnode or any public network",
 	}
+	GenesisNonceFlag = cli.Uint64Flag{
+		Name:  "nonce",
+		Usage: "Genesis block nonce (integer)",
+	}
 	DeveloperFlag = cli.BoolFlag{
 		Name:  "dev",
 		Usage: "Ephemeral proof-of-authority network with a pre-funded developer account, mining enabled",
@@ -1486,6 +1490,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 			SetDNSDiscoveryDefaults(cfg, params.ColosseumGenesisHash)
 		}
 	}
+	if !ctx.GlobalBool(ColosseumFlag.Name) {
+		cfg.Genesis.Nonce = ctx.GlobalUint64(GenesisNonceFlag.Name)
+	}
 }
 
 // SetDNSDiscoveryDefaults configures DNS discovery with the given URL if

diff --git a/core/genesis.go b/core/genesis.go
@@ -374,7 +374,7 @@ func DefaultColosseumGenesisBlock() *Genesis {
 func DefaultGardenGenesisBlock() *Genesis {
 	return &Genesis{
 		Config:     params.GardenChainConfig,
-		Nonce:      67,
+		Nonce:      0,
 		ExtraData:  hexutil.MustDecode("0x3535353535353535353535353535353535353535353535353535353535353535"),
 		GasLimit:   160000000,
 		Difficulty: big.NewInt(441092),
@@ -386,7 +386,7 @@ func DefaultGardenGenesisBlock() *Genesis {
 func DefaultOrchardGenesisBlock() *Genesis {
 	return &Genesis{
 		Config:     params.OrchardChainConfig,
-		Nonce:      68,
+		Nonce:      0,
 		ExtraData:  hexutil.MustDecode("0x3535353535353535353535353535353535353535353535353535353535353535"),
 		GasLimit:   80000000,
 		Difficulty: big.NewInt(4000000),
@@ -398,7 +398,7 @@ func DefaultOrchardGenesisBlock() *Genesis {
 func DefaultGalenaGenesisBlock() *Genesis {
 	return &Genesis{
 		Config:     params.GalenaChainConfig,
-		Nonce:      68,
+		Nonce:      0,
 		ExtraData:  hexutil.MustDecode("0x3535353535353535353535353535353535353535353535353535353535353535"),
 		GasLimit:   160000000,
 		Difficulty: big.NewInt(8800000000),
@@ -410,7 +410,7 @@ func DefaultGalenaGenesisBlock() *Genesis {
 func DefaultLocalGenesisBlock() *Genesis {
 	return &Genesis{
 		Config:     params.LocalChainConfig,
-		Nonce:      67,
+		Nonce:      0,
 		ExtraData:  hexutil.MustDecode("0x3535353535353535353535353535353535353535353535353535353535353535"),
 		GasLimit:   160000000,
 		Difficulty: big.NewInt(300000),

diff --git a/network.env.dist b/network.env.dist
@@ -91,6 +91,7 @@ ENABLE_ARCHIVE=false
 # network. At time of writing, no transport security is implemented, but this is
 # a trusted communication channel.
 NETWORK=colosseum
+NONCE=0 #Change this along with network
 HTTP_ADDR=0.0.0.0
 WS_ADDR=127.0.0.1
 WS_API=eth,net,web3,quai