aboutsummaryrefslogtreecommitdiffstats
path: root/eth/handler.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-05-17 19:17:20 +0800
committerPéter Szilágyi <peterke@gmail.com>2016-05-17 19:17:20 +0800
commitd87f7a1e817cbecbb62c012ed3811ceba933ae3a (patch)
tree438a14920171c8fbbff7995c15bf09a80993a50b /eth/handler.go
parentadc1b503957e572c4ec30533de3ec28ec6feea13 (diff)
downloadgo-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar.gz
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar.bz2
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar.lz
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar.xz
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.tar.zst
go-tangerine-d87f7a1e817cbecbb62c012ed3811ceba933ae3a.zip
eth: skip transaction handling during fast sync
Diffstat (limited to 'eth/handler.go')
-rw-r--r--eth/handler.go23
1 files changed, 15 insertions, 8 deletions
diff --git a/eth/handler.go b/eth/handler.go
index 3980a625e..202acdc78 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -22,6 +22,7 @@ import (
"math"
"math/big"
"sync"
+ "sync/atomic"
"time"
"github.com/ethereum/go-ethereum/common"
@@ -58,7 +59,7 @@ type blockFetcherFn func([]common.Hash) error
type ProtocolManager struct {
networkId int
- fastSync bool
+ fastSync uint32
txpool txPool
blockchain *core.BlockChain
chaindb ethdb.Database
@@ -87,15 +88,9 @@ 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 *core.ChainConfig, fastSync bool, networkId int, mux *event.TypeMux, txpool txPool, pow pow.PoW, blockchain *core.BlockChain, chaindb ethdb.Database) (*ProtocolManager, error) {
- // Figure out whether to allow fast sync or not
- if fastSync && blockchain.CurrentBlock().NumberU64() > 0 {
- glog.V(logger.Info).Infof("blockchain not empty, fast sync disabled")
- fastSync = false
- }
// Create the protocol manager with the base fields
manager := &ProtocolManager{
networkId: networkId,
- fastSync: fastSync,
eventMux: mux,
txpool: txpool,
blockchain: blockchain,
@@ -106,6 +101,14 @@ func NewProtocolManager(config *core.ChainConfig, fastSync bool, networkId int,
txsyncCh: make(chan *txsync),
quitSync: make(chan struct{}),
}
+ // Figure out whether to allow fast sync or not
+ if fastSync && blockchain.CurrentBlock().NumberU64() > 0 {
+ glog.V(logger.Info).Infof("blockchain not empty, fast sync disabled")
+ fastSync = false
+ }
+ if fastSync {
+ manager.fastSync = uint32(1)
+ }
// Initiate a sub-protocol for every implemented version we can handle
manager.SubProtocols = make([]p2p.Protocol, 0, len(ProtocolVersions))
for i, version := range ProtocolVersions {
@@ -678,7 +681,11 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
}
case msg.Code == TxMsg:
- // Transactions arrived, parse all of them and deliver to the pool
+ // Transactions arrived, make sure we have a valid chain to handle them
+ if atomic.LoadUint32(&pm.fastSync) == 1 {
+ break
+ }
+ // Transactions can be processed, parse all of them and deliver to the pool
var txs []*types.Transaction
if err := msg.Decode(&txs); err != nil {
return errResp(ErrDecode, "msg %v: %v", msg, err)