aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/utils
diff options
context:
space:
mode:
authorzsfelfoldi <zsfelfoldi@gmail.com>2015-04-14 22:12:35 +0800
committerzelig <viktor.tron@gmail.com>2015-04-20 03:57:49 +0800
commitbb793c829f9ed82bfbb03d6f3cf669977cfc9548 (patch)
tree51e866d631dd0383fd68067b6b2d901582d7e68d /cmd/utils
parentd8fb834386caea0103fad8733f119b87238b75d3 (diff)
downloadgo-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.gz
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.bz2
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.lz
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.xz
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.zst
go-tangerine-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.zip
fixed incomplete merge
Diffstat (limited to 'cmd/utils')
-rw-r--r--cmd/utils/flags.go40
1 files changed, 21 insertions, 19 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 974fabbdc..f70f4243e 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -256,25 +256,27 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config {
}
return &eth.Config{
- Name: common.MakeName(clientID, version),
- DataDir: ctx.GlobalString(DataDirFlag.Name),
- ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name),
- NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
- LogFile: ctx.GlobalString(LogFileFlag.Name),
- LogLevel: ctx.GlobalInt(LogLevelFlag.Name),
- LogJSON: ctx.GlobalString(LogJSONFlag.Name),
- Etherbase: ctx.GlobalString(EtherbaseFlag.Name),
- MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
- AccountManager: GetAccountManager(ctx),
- VmDebug: ctx.GlobalBool(VMDebugFlag.Name),
- MaxPeers: ctx.GlobalInt(MaxPeersFlag.Name),
- Port: ctx.GlobalString(ListenPortFlag.Name),
- NAT: GetNAT(ctx),
- NatSpec: ctx.GlobalBool(NatspecEnabledFlag.Name),
- NodeKey: GetNodeKey(ctx),
- Shh: true,
- Dial: true,
- BootNodes: ctx.GlobalString(BootnodesFlag.Name),
+ Name: common.MakeName(clientID, version),
+ DataDir: ctx.GlobalString(DataDirFlag.Name),
+ ProtocolVersion: ctx.GlobalInt(ProtocolVersionFlag.Name),
+ BlockChainVersion: ctx.GlobalInt(BlockchainVersionFlag.Name),
+ SkipBcVersionCheck: false,
+ NetworkId: ctx.GlobalInt(NetworkIdFlag.Name),
+ LogFile: ctx.GlobalString(LogFileFlag.Name),
+ LogLevel: ctx.GlobalInt(LogLevelFlag.Name),
+ LogJSON: ctx.GlobalString(LogJSONFlag.Name),
+ Etherbase: ctx.GlobalString(EtherbaseFlag.Name),
+ MinerThreads: ctx.GlobalInt(MinerThreadsFlag.Name),
+ AccountManager: GetAccountManager(ctx),
+ VmDebug: ctx.GlobalBool(VMDebugFlag.Name),
+ MaxPeers: ctx.GlobalInt(MaxPeersFlag.Name),
+ Port: ctx.GlobalString(ListenPortFlag.Name),
+ NAT: GetNAT(ctx),
+ NatSpec: ctx.GlobalBool(NatspecEnabledFlag.Name),
+ NodeKey: GetNodeKey(ctx),
+ Shh: true,
+ Dial: true,
+ BootNodes: ctx.GlobalString(BootnodesFlag.Name),
}
}