diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-21 20:04:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-21 20:04:25 +0800 |
| commit | 7fe73deb2d1d52581fb2bdf9d87045427d2fed12 (patch) | |
| tree | acd7e552677cb5fb66cf27e481b7377ebc5a2939 /peer.go | |
| parent | 85793a470605677d860d61d90c5f22ea10e8f84b (diff) | |
| parent | 8f5eddd0ba9287cfcdc0e1f114c3fb367e54c46c (diff) | |
| download | dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar.gz dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar.bz2 dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar.lz dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar.xz dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.tar.zst dexon-7fe73deb2d1d52581fb2bdf9d87045427d2fed12.zip | |
Merge branch 'release/poc5-rc8'
Diffstat (limited to 'peer.go')
| -rw-r--r-- | peer.go | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -335,8 +335,8 @@ func (p *Peer) HandleInbound() { block = ethchain.NewBlockFromRlpValue(msg.Data.Get(i)) //p.ethereum.StateManager().PrepareDefault(block) - state := p.ethereum.StateManager().CurrentState() - err = p.ethereum.StateManager().ProcessBlock(state, block, false) + //state := p.ethereum.StateManager().CurrentState() + err = p.ethereum.StateManager().Process(block, false) if err != nil { if ethutil.Config.Debug { @@ -658,10 +658,8 @@ func (p *Peer) CatchupWithPeer(blockHash []byte) { ethutil.Config.Log.Debugf("Requesting blockchain %x... from peer %s\n", p.ethereum.BlockChain().CurrentBlock.Hash()[:4], p.conn.RemoteAddr()) - /* - msg = ethwire.NewMessage(ethwire.MsgGetTxsTy, []interface{}{}) - p.QueueMessage(msg) - */ + msg = ethwire.NewMessage(ethwire.MsgGetTxsTy, []interface{}{}) + p.QueueMessage(msg) } } |