diff options
Diffstat (limited to 'cmd/ethereum/main.go')
| -rw-r--r-- | cmd/ethereum/main.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index aa933c4e7..da09e0b58 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -21,15 +21,16 @@ import ( "fmt" "os" "runtime" - "github.com/ethereum/go-ethereum/chain/types" + "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" ) const ( ClientIdentifier = "Ethereum(G)" - Version = "0.7.5" + Version = "0.7.9" ) var clilogger = logger.NewLogger("CLI") @@ -68,15 +69,15 @@ func main() { // create, import, export keys utils.KeyTasks(keyManager, KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) - clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier) + clientIdentity := utils.NewClientIdentity(ClientIdentifier, Version, Identifier, string(keyManager.PublicKey())) - ethereum := utils.NewEthereum(db, clientIdentity, keyManager, UseUPnP, OutboundPort, MaxPeer) + ethereum := utils.NewEthereum(db, clientIdentity, keyManager, utils.NatType(NatType, PMPGateway), OutboundPort, MaxPeer) if Dump { var block *types.Block if len(DumpHash) == 0 && DumpNumber == -1 { - block = ethereum.ChainManager().CurrentBlock + block = ethereum.ChainManager().CurrentBlock() } else if len(DumpHash) > 0 { block = ethereum.ChainManager().GetBlock(ethutil.Hex2Bytes(DumpHash)) } else { |