aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-07-04 00:30:04 +0800
committerzelig <viktor.tron@gmail.com>2014-07-04 00:30:04 +0800
commitc833c3fec8cd327e22d7a481e6e4b795f27eb1de (patch)
treea34683e7162b7d8f93f9e96cbabd40a4f7b66aa4
parentc64629964fb96e5ddc8aa590abc7cee4b14c8e84 (diff)
downloadgo-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar.gz
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar.bz2
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar.lz
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar.xz
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.tar.zst
go-tangerine-c833c3fec8cd327e22d7a481e6e4b795f27eb1de.zip
add ClientIdentity() ethwire.ClientIdentity to Ethereum
-rw-r--r--ethereum.go25
1 files changed, 16 insertions, 9 deletions
diff --git a/ethereum.go b/ethereum.go
index b78b0658f..35d98e831 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -76,9 +76,11 @@ type Ethereum struct {
RpcServer *ethrpc.JsonRpcServer
keyManager *ethcrypto.KeyManager
+
+ clientIdentity ethwire.ClientIdentity
}
-func New(db ethutil.Database, keyManager *ethcrypto.KeyManager, caps Caps, usePnp bool) (*Ethereum, error) {
+func New(db ethutil.Database, clientIdentity ethwire.ClientIdentity, keyManager *ethcrypto.KeyManager, caps Caps, usePnp bool) (*Ethereum, error) {
var err error
var nat NAT
@@ -94,14 +96,15 @@ func New(db ethutil.Database, keyManager *ethcrypto.KeyManager, caps Caps, usePn
nonce, _ := ethutil.RandomUint64()
ethereum := &Ethereum{
- shutdownChan: make(chan bool),
- quit: make(chan bool),
- db: db,
- peers: list.New(),
- Nonce: nonce,
- serverCaps: caps,
- nat: nat,
- keyManager: keyManager,
+ shutdownChan: make(chan bool),
+ quit: make(chan bool),
+ db: db,
+ peers: list.New(),
+ Nonce: nonce,
+ serverCaps: caps,
+ nat: nat,
+ keyManager: keyManager,
+ clientIdentity: clientIdentity,
}
ethereum.reactor = ethutil.NewReactorEngine()
@@ -123,6 +126,10 @@ func (s *Ethereum) KeyManager() *ethcrypto.KeyManager {
return s.keyManager
}
+func (s *Ethereum) ClientIdentity() ethwire.ClientIdentity {
+ return s.clientIdentity
+}
+
func (s *Ethereum) BlockChain() *ethchain.BlockChain {
return s.blockChain
}