diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-04 00:56:36 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-04 00:56:36 +0800 |
| commit | 40ff3cac3943ee672d818776fdd8235fc6684dca (patch) | |
| tree | e32f82689b0c669d61688470af5e92c2eda44d34 /cmd/ethereum/main.go | |
| parent | 53b5a45856c5d4c307dc55b4ae1b46efd9471142 (diff) | |
| parent | 6e50a1e9f59532671eaa2bb2f2081a67f659bd0d (diff) | |
| download | go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar.gz go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar.bz2 go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar.lz go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar.xz go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.tar.zst go-tangerine-40ff3cac3943ee672d818776fdd8235fc6684dca.zip | |
merge
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index dc25e4ae0..9d78b6282 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -62,20 +62,21 @@ func main() { utils.InitConfig(VmType, ConfigFile, Datadir, "ETH") ethereum, err := eth.New(ð.Config{ - Name: p2p.MakeName(ClientIdentifier, Version), - KeyStore: KeyStore, - DataDir: Datadir, - LogFile: LogFile, - LogLevel: LogLevel, - LogFormat: LogFormat, - MaxPeers: MaxPeer, - Port: OutboundPort, - NAT: NAT, - KeyRing: KeyRing, - Shh: true, - Dial: Dial, - BootNodes: BootNodes, - NodeKey: NodeKey, + Name: p2p.MakeName(ClientIdentifier, Version), + KeyStore: KeyStore, + DataDir: Datadir, + LogFile: LogFile, + LogLevel: LogLevel, + LogFormat: LogFormat, + MaxPeers: MaxPeer, + Port: OutboundPort, + NAT: NAT, + KeyRing: KeyRing, + Shh: true, + Dial: Dial, + BootNodes: BootNodes, + NodeKey: NodeKey, + MinerThreads: MinerThreads, }) if err != nil { @@ -128,7 +129,7 @@ func main() { } if StartRpc { - utils.StartRpc(ethereum, RpcPort) + utils.StartRpc(ethereum, RpcListenAddress, RpcPort) } if StartWebSockets { @@ -139,6 +140,10 @@ func main() { fmt.Printf("Welcome to the FRONTIER\n") + if StartMining { + ethereum.Miner().Start() + } + if StartJsConsole { InitJsConsole(ethereum) } else if len(InputFile) > 0 { |