Merge pull request #16843 from karalabe/txpool-fix-deadlock

karalabe · web-flow · commit ca34e8230e52 · 2018-05-30T10:45:02.000+03:00
core: fix transaction event asynchronicity
diff --git a/core/tx_pool.go b/core/tx_pool.go
@@ -962,7 +962,7 @@ func (pool *TxPool) promoteExecutables(accounts []common.Address) {
 	}
 	// Notify subsystem for new promoted transactions.
 	if len(promoted) > 0 {
-		pool.txFeed.Send(NewTxsEvent{promoted})
+		go pool.txFeed.Send(NewTxsEvent{promoted})
 	}
 	// If the pending limit is overflown, start equalizing allowances
 	pending := uint64(0)

Original file line number	Diff line number	Diff line change
`@@ -962,7 +962,7 @@ func (pool *TxPool) promoteExecutables(accounts []common.Address) {`
`962`	`962`	`}`
`963`	`963`	`// Notify subsystem for new promoted transactions.`
`964`	`964`	`if len(promoted) > 0 {`
`965`		`- pool.txFeed.Send(NewTxsEvent{promoted})`
	`965`	`+ go pool.txFeed.Send(NewTxsEvent{promoted})`
`966`	`966`	`}`
`967`	`967`	`// If the pending limit is overflown, start equalizing allowances`
`968`	`968`	`pending := uint64(0)`