diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-10-20 17:34:43 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2017-10-20 19:42:19 +0800 |
commit | 0e7d019e0eb3a4929c504ac5899fbe55c4227f7e (patch) | |
tree | b4bdcac24edd9148e850faeea5bcbd209c98127a /core/tx_pool.go | |
parent | eaa4f8a5f925592bd777d5b0daf635bec85f6242 (diff) | |
download | dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar.gz dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar.bz2 dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar.lz dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar.xz dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.tar.zst dexon-0e7d019e0eb3a4929c504ac5899fbe55c4227f7e.zip |
core: fire tx event on replace, expand tests
Diffstat (limited to 'core/tx_pool.go')
-rw-r--r-- | core/tx_pool.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go index 0ad765179..a705e36d6 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -640,6 +640,10 @@ func (pool *TxPool) add(tx *types.Transaction, local bool) (bool, error) { pool.journalTx(from, tx) log.Trace("Pooled new executable transaction", "hash", hash, "from", from, "to", tx.To()) + + // We've directly injected a replacement transaction, notify subsystems + go pool.txFeed.Send(TxPreEvent{tx}) + return old != nil, nil } // New transaction isn't replacing a pending one, push into queue @@ -729,6 +733,7 @@ func (pool *TxPool) promoteTx(addr common.Address, hash common.Hash, tx *types.T // Set the potentially new pending nonce and notify any subsystems of the new tx pool.beats[addr] = time.Now() pool.pendingState.SetNonce(addr, tx.Nonce()+1) + go pool.txFeed.Send(TxPreEvent{tx}) } |