cmd/utils, params: define chain ids

obscuren · obscuren · commit 7a6c6ec94697 · 2016-11-14T17:23:39.000+01:00
diff --git 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
@@ -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
 )

Original file line number	Diff line number	Diff line change
`@@ -881,6 +881,13 @@ func MakeChainConfigFromDb(ctx cli.Context, db ethdb.Database) params.ChainCon`
`881`	`881`	`config.EIP158Block = params.MainNetSpuriousDragon`
`882`	`882`	`}`
`883`	`883`	`}`
	`884`	`+ if config.ChainId.BitLen() == 0 {`
	`885`	`+ if ctx.GlobalBool(TestNetFlag.Name) {`
	`886`	`+ config.ChainId = params.TestNetChainID`
	`887`	`+ } else {`
	`888`	`+ config.ChainId = params.MainNetChainID`
	`889`	`+ }`
	`890`	`+ }`
`884`	`891`	`config.DAOForkSupport = true`
`885`	`892`	`}`
`886`	`893`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,7 @@ var (`
`37`	`37`
`38`	`38`	`TestNetSpuriousDragon = big.NewInt(3000000)`
`39`	`39`	`MainNetSpuriousDragon = big.NewInt(3000000)`
	`40`	`+`
	`41`	`+ TestNetChainID = big.NewInt(2) // Test net default chain ID`
	`42`	`+ MainNetChainID = big.NewInt(1) // main net default chain ID`
`40`	`43`	`)`