diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
| commit | 5c251b69282b3992512d0c17ed0063f294a0e663 (patch) | |
| tree | 7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /cmd/ethereum/main.go | |
| parent | 75d164037fb9bbf75def7c5501727fd634ef124f (diff) | |
| parent | bde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff) | |
| download | go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.bz2 go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.lz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.xz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.zip | |
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index f8851ecd3..d2b3418cd 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -31,6 +31,7 @@ import ( "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/state" ) @@ -61,21 +62,19 @@ func main() { utils.InitConfig(VmType, ConfigFile, Datadir, "ETH") ethereum, err := eth.New(ð.Config{ - Name: ClientIdentifier, - Version: Version, - KeyStore: KeyStore, - DataDir: Datadir, - LogFile: LogFile, - LogLevel: LogLevel, - LogFormat: LogFormat, - Identifier: Identifier, - MaxPeers: MaxPeer, - Port: OutboundPort, - NATType: PMPGateway, - PMPGateway: PMPGateway, - KeyRing: KeyRing, - Shh: SHH, - Dial: Dial, + Name: p2p.MakeName(ClientIdentifier, Version), + KeyStore: KeyStore, + DataDir: Datadir, + LogFile: LogFile, + LogLevel: LogLevel, + MaxPeers: MaxPeer, + Port: OutboundPort, + NAT: NAT, + KeyRing: KeyRing, + Shh: SHH, + Dial: Dial, + BootNodes: BootNodes, + NodeKey: NodeKey, }) if err != nil { @@ -135,7 +134,7 @@ func main() { utils.StartWebSockets(ethereum, WsPort) } - utils.StartEthereum(ethereum, SeedNode) + utils.StartEthereum(ethereum) if StartJsConsole { InitJsConsole(ethereum) |