aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-11-15 00:23:39 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-11-15 00:23:39 +0800
commit7a6c6ec9469722abca93f94c4a3725f026ab09bc (patch)
tree2564af662c6bdc3d0fafe08a024f7d38ae0f862f
parent6c9c1e6712d684e782a8920dac0173b49257fa1f (diff)
downloaddexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar.gz
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar.bz2
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar.lz
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar.xz
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.tar.zst
dexon-7a6c6ec9469722abca93f94c4a3725f026ab09bc.zip
cmd/utils, params: define chain ids
-rw-r--r--cmd/utils/flags.go7
-rw-r--r--params/util.go3
2 files changed, 10 insertions, 0 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 2d6bb4f5b..f86fc37f5 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -881,6 +881,13 @@ func MakeChainConfigFromDb(ctx *cli.Context, db ethdb.Database) *params.ChainCon
config.EIP158Block = params.MainNetSpuriousDragon
}
}
+ if config.ChainId.BitLen() == 0 {
+ if ctx.GlobalBool(TestNetFlag.Name) {
+ config.ChainId = params.TestNetChainID
+ } else {
+ config.ChainId = params.MainNetChainID
+ }
+ }
config.DAOForkSupport = true
}
diff --git a/params/util.go b/params/util.go
index 377f4ce7c..b96f33da2 100644
--- a/params/util.go
+++ b/params/util.go
@@ -37,4 +37,7 @@ var (
TestNetSpuriousDragon = big.NewInt(3000000)
MainNetSpuriousDragon = big.NewInt(3000000)
+
+ TestNetChainID = big.NewInt(2) // Test net default chain ID
+ MainNetChainID = big.NewInt(1) // main net default chain ID
)