diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-04 21:32:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-04 21:32:25 +0800 |
| commit | 3ebcd36667a32cb79c1686e3b74f6196d6ed16b1 (patch) | |
| tree | d88bfa53ee9d3572437aa276a3b5e8014e38632d /ethereum | |
| parent | 0076fa583ce16c45f904b6cd0a6e5ab3cc1ab197 (diff) | |
| parent | 9e38ca555dccd6b9a4a3fa0eb9eb749d2dc3c82c (diff) | |
| download | dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.gz dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.bz2 dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.lz dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.xz dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.tar.zst dexon-3ebcd36667a32cb79c1686e3b74f6196d6ed16b1.zip | |
Merge branch 'develop'
Diffstat (limited to 'ethereum')
| -rw-r--r-- | ethereum/main.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ethereum/main.go b/ethereum/main.go index 1531871cb..e4d73d494 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -6,6 +6,11 @@ import ( "runtime" ) +const ( + ClientIdentifier = "Ethereum(G)" + Version = "0.5.16" +) + var logger = ethlog.NewLogger("CLI") func main() { @@ -15,7 +20,7 @@ func main() { // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line - utils.InitConfig(ConfigFile, Datadir, Identifier, "ETH") + utils.InitConfig(ConfigFile, Datadir, "ETH") utils.InitDataDir(Datadir) @@ -28,7 +33,9 @@ func main() { // create, import, export keys utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) - ethereum := utils.NewEthereum(db, keyManager, UseUPnP, OutboundPort, MaxPeer) + clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier) + + ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) if ShowGenesis { utils.ShowGenesis(ethereum) |