aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-06-01 02:49:20 +0800
committerPéter Szilágyi <peterke@gmail.com>2017-06-01 04:26:24 +0800
commitcba33029a844a6631935f0ad57afd9793eabde6f (patch)
treecaf0b7920c11dfe59002d69a1526bc1efdd8fd45 /core
parent9702badd83399d62dca4df0cfd65587340def300 (diff)
downloaddexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar.gz
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar.bz2
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar.lz
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar.xz
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.tar.zst
dexon-cba33029a844a6631935f0ad57afd9793eabde6f.zip
core: only reorg changed account, not all
Diffstat (limited to 'core')
-rw-r--r--core/tx_pool.go42
-rw-r--r--core/tx_pool_test.go14
2 files changed, 35 insertions, 21 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go
index 5e399d95f..04ffa8a98 100644
--- a/core/tx_pool.go
+++ b/core/tx_pool.go
@@ -251,7 +251,7 @@ func (pool *TxPool) resetState() {
}
// Check the queue and move transactions over to the pending if possible
// or remove those that have become invalid
- pool.promoteExecutables(currentState)
+ pool.promoteExecutables(currentState, nil)
}
// Stop terminates the transaction pool.
@@ -546,7 +546,8 @@ func (pool *TxPool) Add(tx *types.Transaction) error {
if err != nil {
return err
}
- pool.promoteExecutables(state)
+ from, _ := types.Sender(pool.signer, tx) // already validated
+ pool.promoteExecutables(state, []common.Address{from})
}
return nil
}
@@ -557,24 +558,26 @@ func (pool *TxPool) AddBatch(txs []*types.Transaction) error {
defer pool.mu.Unlock()
// Add the batch of transaction, tracking the accepted ones
- replaced, added := true, 0
+ dirty := make(map[common.Address]struct{})
for _, tx := range txs {
if replace, err := pool.add(tx); err == nil {
- added++
if !replace {
- replaced = false
+ from, _ := types.Sender(pool.signer, tx) // already validated
+ dirty[from] = struct{}{}
}
}
}
// Only reprocess the internal state if something was actually added
- if added > 0 {
- if !replaced {
- state, err := pool.currentState()
- if err != nil {
- return err
- }
- pool.promoteExecutables(state)
+ if len(dirty) > 0 {
+ state, err := pool.currentState()
+ if err != nil {
+ return err
+ }
+ addrs := make([]common.Address, 0, len(dirty))
+ for addr, _ := range dirty {
+ addrs = append(addrs, addr)
}
+ pool.promoteExecutables(state, addrs)
}
return nil
}
@@ -651,12 +654,23 @@ func (pool *TxPool) removeTx(hash common.Hash) {
// promoteExecutables moves transactions that have become processable from the
// future queue to the set of pending transactions. During this process, all
// invalidated transactions (low nonce, low balance) are deleted.
-func (pool *TxPool) promoteExecutables(state *state.StateDB) {
+func (pool *TxPool) promoteExecutables(state *state.StateDB, accounts []common.Address) {
gaslimit := pool.gasLimit()
+ // Gather all the accounts potentially needing updates
+ if accounts == nil {
+ accounts = make([]common.Address, 0, len(pool.queue))
+ for addr, _ := range pool.queue {
+ accounts = append(accounts, addr)
+ }
+ }
// Iterate over all accounts and promote any executable transactions
queued := uint64(0)
- for addr, list := range pool.queue {
+ for _, addr := range accounts {
+ list := pool.queue[addr]
+ if list == nil {
+ continue // Just in case someone calls with a non existing account
+ }
// Drop all transactions that are deemed too old (low nonce)
for _, tx := range list.Forward(state.GetNonce(addr)) {
hash := tx.Hash()
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go
index c12bd20a1..94b07170d 100644
--- a/core/tx_pool_test.go
+++ b/core/tx_pool_test.go
@@ -175,7 +175,7 @@ func TestTransactionQueue(t *testing.T) {
pool.resetState()
pool.enqueueTx(tx.Hash(), tx)
- pool.promoteExecutables(currentState)
+ pool.promoteExecutables(currentState, []common.Address{from})
if len(pool.pending) != 1 {
t.Error("expected valid txs to be 1 is", len(pool.pending))
}
@@ -184,7 +184,7 @@ func TestTransactionQueue(t *testing.T) {
from, _ = deriveSender(tx)
currentState.SetNonce(from, 2)
pool.enqueueTx(tx.Hash(), tx)
- pool.promoteExecutables(currentState)
+ pool.promoteExecutables(currentState, []common.Address{from})
if _, ok := pool.pending[from].txs.items[tx.Nonce()]; ok {
t.Error("expected transaction to be in tx pool")
}
@@ -206,7 +206,7 @@ func TestTransactionQueue(t *testing.T) {
pool.enqueueTx(tx2.Hash(), tx2)
pool.enqueueTx(tx3.Hash(), tx3)
- pool.promoteExecutables(currentState)
+ pool.promoteExecutables(currentState, []common.Address{from})
if len(pool.pending) != 1 {
t.Error("expected tx pool to be 1, got", len(pool.pending))
@@ -304,16 +304,16 @@ func TestTransactionDoubleNonce(t *testing.T) {
t.Errorf("second transaction insert failed (%v) or not reported replacement (%v)", err, replace)
}
state, _ := pool.currentState()
- pool.promoteExecutables(state)
+ pool.promoteExecutables(state, []common.Address{addr})
if pool.pending[addr].Len() != 1 {
t.Error("expected 1 pending transactions, got", pool.pending[addr].Len())
}
if tx := pool.pending[addr].txs.items[0]; tx.Hash() != tx2.Hash() {
t.Errorf("transaction mismatch: have %x, want %x", tx.Hash(), tx2.Hash())
}
- // Add the thid transaction and ensure it's not saved (smaller price)
+ // Add the third transaction and ensure it's not saved (smaller price)
pool.add(tx3)
- pool.promoteExecutables(state)
+ pool.promoteExecutables(state, []common.Address{addr})
if pool.pending[addr].Len() != 1 {
t.Error("expected 1 pending transactions, got", pool.pending[addr].Len())
}
@@ -1087,7 +1087,7 @@ func benchmarkFuturePromotion(b *testing.B, size int) {
// Benchmark the speed of pool validation
b.ResetTimer()
for i := 0; i < b.N; i++ {
- pool.promoteExecutables(state)
+ pool.promoteExecutables(state, nil)
}
}