Merge pull request #3429 from bas-vk/txpool-crash

core: init pending state in tx pool on creation
pull/3438/head
Péter Szilágyi 8 years ago committed by GitHub
commit 9cc0f60666
  1. 14
      core/tx_pool.go

@ -124,6 +124,8 @@ func NewTxPool(config *params.ChainConfig, eventMux *event.TypeMux, currentState
quit: make(chan struct{}), quit: make(chan struct{}),
} }
pool.resetState()
pool.wg.Add(2) pool.wg.Add(2)
go pool.eventLoop() go pool.eventLoop()
go pool.expirationLoop() go pool.expirationLoop()
@ -196,12 +198,8 @@ func (pool *TxPool) Stop() {
} }
func (pool *TxPool) State() *state.ManagedState { func (pool *TxPool) State() *state.ManagedState {
pool.mu.Lock() pool.mu.RLock()
defer pool.mu.Unlock() defer pool.mu.RUnlock()
if pool.pendingState == nil {
pool.resetState()
}
return pool.pendingState return pool.pendingState
} }
@ -381,10 +379,6 @@ func (pool *TxPool) enqueueTx(hash common.Hash, tx *types.Transaction) {
// //
// Note, this method assumes the pool lock is held! // Note, this method assumes the pool lock is held!
func (pool *TxPool) promoteTx(addr common.Address, hash common.Hash, tx *types.Transaction) { func (pool *TxPool) promoteTx(addr common.Address, hash common.Hash, tx *types.Transaction) {
// Init delayed since tx pool could have been started before any state sync
if pool.pendingState == nil {
pool.resetState()
}
// Try to insert the transaction into the pending queue // Try to insert the transaction into the pending queue
if pool.pending[addr] == nil { if pool.pending[addr] == nil {
pool.pending[addr] = newTxList(true) pool.pending[addr] = newTxList(true)

Loading…
Cancel
Save