diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-04-25 23:30:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 23:30:56 +0800 |
| commit | fff16169c64a83d57d2eed35b6a2e33248c7d5eb (patch) | |
| tree | 9dd32e8fb794b4950313ae2b2cd5499bb60dc4cd /eth/handler.go | |
| parent | ba3bcd16a6d99bc0e58516556df8e96b730c2d60 (diff) | |
| parent | e61035c5a3630e4f6fd0fb3e5346a4eed8cedc80 (diff) | |
| download | dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar.gz dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar.bz2 dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar.lz dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar.xz dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.tar.zst dexon-fff16169c64a83d57d2eed35b6a2e33248c7d5eb.zip | |
Merge pull request #14377 from karalabe/unify-network-ids
cmd, eth, les, mobile: make networkid uint64 everywhere
Diffstat (limited to 'eth/handler.go')
| -rw-r--r-- | eth/handler.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eth/handler.go b/eth/handler.go index fb8a0fd57..16e371227 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -60,7 +60,7 @@ func errResp(code errCode, format string, v ...interface{}) error { } type ProtocolManager struct { - networkId int + networkId uint64 fastSync uint32 // Flag whether fast sync is enabled (gets disabled if we already have blocks) acceptTxs uint32 // Flag whether we're considered synchronised (enables transaction processing) @@ -96,7 +96,7 @@ type ProtocolManager struct { // NewProtocolManager returns a new ethereum sub protocol manager. The Ethereum sub protocol manages peers capable // with the ethereum network. -func NewProtocolManager(config *params.ChainConfig, mode downloader.SyncMode, networkId int, maxPeers int, mux *event.TypeMux, txpool txPool, engine consensus.Engine, blockchain *core.BlockChain, chaindb ethdb.Database) (*ProtocolManager, error) { +func NewProtocolManager(config *params.ChainConfig, mode downloader.SyncMode, networkId uint64, maxPeers int, mux *event.TypeMux, txpool txPool, engine consensus.Engine, blockchain *core.BlockChain, chaindb ethdb.Database) (*ProtocolManager, error) { // Create the protocol manager with the base fields manager := &ProtocolManager{ networkId: networkId, @@ -733,7 +733,7 @@ func (self *ProtocolManager) txBroadcastLoop() { // EthNodeInfo represents a short summary of the Ethereum sub-protocol metadata known // about the host peer. type EthNodeInfo struct { - Network int `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3) + Network uint64 `json:"network"` // Ethereum network ID (1=Frontier, 2=Morden, Ropsten=3) Difficulty *big.Int `json:"difficulty"` // Total difficulty of the host's blockchain Genesis common.Hash `json:"genesis"` // SHA3 hash of the host's genesis block Head common.Hash `json:"head"` // SHA3 hash of the host's best owned block |