diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-22 02:44:22 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-22 02:44:22 +0800 |
| commit | 0467a6ceec4973b00c344d2a724f7fb01a6b0aee (patch) | |
| tree | 66e010270bdf25fa0058c89fb31f6df8cf7f7829 /eth/backend.go | |
| parent | dba15d9c3609bcddfc7a4f0fe8f01c48a8bbfbc8 (diff) | |
| parent | 5b0ee8ec304663898073b7a4c659e1def23716df (diff) | |
| download | dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar.gz dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar.bz2 dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar.lz dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar.xz dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.tar.zst dexon-0467a6ceec4973b00c344d2a724f7fb01a6b0aee.zip | |
Merge pull request #1889 from karalabe/fast-sync-rebase
eth/63 fast synchronization algorithm
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/eth/backend.go b/eth/backend.go index 9ec3c1440..a4f656ecd 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -88,6 +88,7 @@ type Config struct { GenesisNonce int GenesisFile string GenesisBlock *types.Block // used by block tests + FastSync bool Olympic bool BlockChainVersion int @@ -390,7 +391,6 @@ func New(config *Config) (*Ethereum, error) { if err == core.ErrNoGenesis { return nil, fmt.Errorf(`Genesis block not found. Please supply a genesis block with the "--genesis /path/to/file" argument`) } - return nil, err } newPool := core.NewTxPool(eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit) @@ -398,8 +398,9 @@ func New(config *Config) (*Ethereum, error) { eth.blockProcessor = core.NewBlockProcessor(chainDb, eth.pow, eth.blockchain, eth.EventMux()) eth.blockchain.SetProcessor(eth.blockProcessor) - eth.protocolManager = NewProtocolManager(config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.blockchain, chainDb) - + if eth.protocolManager, err = NewProtocolManager(config.FastSync, config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.blockchain, chainDb); err != nil { + return nil, err + } eth.miner = miner.New(eth, eth.EventMux(), eth.pow) eth.miner.SetGasPrice(config.GasPrice) eth.miner.SetExtra(config.ExtraData) @@ -462,7 +463,7 @@ func (s *Ethereum) NodeInfo() *NodeInfo { DiscPort: int(node.UDP), TCPPort: int(node.TCP), ListenAddr: s.net.ListenAddr, - Td: s.BlockChain().Td().String(), + Td: s.BlockChain().GetTd(s.BlockChain().CurrentBlock().Hash()).String(), } } |