diff options
| author | zsfelfoldi <zsfelfoldi@gmail.com> | 2015-04-14 22:12:35 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-04-20 03:57:49 +0800 |
| commit | bb793c829f9ed82bfbb03d6f3cf669977cfc9548 (patch) | |
| tree | 51e866d631dd0383fd68067b6b2d901582d7e68d | |
| parent | d8fb834386caea0103fad8733f119b87238b75d3 (diff) | |
| download | dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.gz dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.bz2 dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.lz dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.xz dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.tar.zst dexon-bb793c829f9ed82bfbb03d6f3cf669977cfc9548.zip | |
fixed incomplete merge
| -rw-r--r-- | cmd/utils/flags.go | 40 |
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 ð.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), } } |