mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-03 17:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
alex.sharov 2021-09-27 22:25:13 +07:00
parent ffac34a86f
commit 559f376ed4
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
txpool/pool.go
View File

@ -177,17 +177,7 @@ var emptySender = newSender(0, *uint256.NewInt(0))
type sortByNonce struct{ *metaTx }
func (i *sortByNonce) Less(than btree.Item) bool {
mt := than.(*sortByNonce).metaTx
if i.metaTx.Tx.senderID != mt.Tx.senderID {
return i.metaTx.Tx.senderID < mt.Tx.senderID
}
return i.metaTx.Tx.nonce < mt.Tx.nonce
}
type sortByNonce2 struct{ *metaTx }
func (i *sortByNonce2) Less(than btree.Item) bool {
return i.metaTx.Tx.nonce < than.(*sortByNonce2).metaTx.Tx.nonce
return i.metaTx.Tx.nonce < than.(*sortByNonce).metaTx.Tx.nonce
}
func calcProtocolBaseFee(baseFee uint64) uint64 {
@ -253,7 +243,7 @@ func New(newTxs chan Hashes, coreDB kv.RoDB, cfg Config, cache kvcache.Cache, ru
byHash: map[string]*metaTx{},
isLocalLRU: localsHistory,
discardReasonsLRU: discardHistory,
byNonce: &ByNonce{bySenderID: map[uint64]*btree.BTree{}, search: &sortByNonce2{&metaTx{Tx: &TxSlot{}}}},
byNonce: &ByNonce{bySenderID: map[uint64]*btree.BTree{}, search: &sortByNonce{&metaTx{Tx: &TxSlot{}}}},
recentlyConnectedPeers: &recentlyConnectedPeers{},
pending: NewPendingSubPool(PendingSubPool, cfg.PendingSubPoolLimit),
baseFee: NewSubPool(BaseFeeSubPool, cfg.BaseFeeSubPoolLimit),
@ -824,15 +814,14 @@ func removeMined(byNonce *ByNonce, minedTxs []*TxSlot, pending *PendingPool, bas
}
func onBaseFeeChange(byNonce *ByNonce, pendingBaseFee uint64) {
var minFeeCap, minTip uint64
for _, byNonceSet := range byNonce.bySenderID {
if byNonceSet == nil || byNonceSet.Len() == 0 {
continue
}
minFeeCap, minTip = math.MaxUint64, math.MaxUint64
minFeeCap, minTip := uint64(math.MaxUint64), uint64(math.MaxUint64)
byNonceSet.Ascend(func(i btree.Item) bool {
mt := i.(*sortByNonce2).metaTx
mt := i.(*sortByNonce).metaTx
minFeeCap = min(minFeeCap, mt.Tx.feeCap)
minTip = min(minTip, mt.Tx.tip)
if pendingBaseFee <= minFeeCap {
@ -1563,7 +1552,7 @@ func (sc *sendersBatch) onNewBlock(stateChanges *remote.StateChangeBatch, unwind
type ByNonce struct {
bySenderID map[uint64]*btree.BTree // senderID -> nonce ordered txs
search *sortByNonce2
search *sortByNonce
}
func (b *ByNonce) ascend(senderID uint64, f func(*metaTx) bool) {
@ -1573,7 +1562,7 @@ func (b *ByNonce) ascend(senderID uint64, f func(*metaTx) bool) {
}
byNonce.Ascend(func(i btree.Item) bool {
return f(i.(*sortByNonce2).metaTx)
return f(i.(*sortByNonce).metaTx)
})
}
func (b *ByNonce) hasTxs(senderID uint64) bool {
@ -1587,7 +1576,7 @@ func (b *ByNonce) get(senderID, txNonce uint64) *metaTx {
}
b.search.metaTx.Tx.nonce = txNonce
if found := byNonce.Get(b.search); found != nil {
return found.(*sortByNonce2).metaTx
return found.(*sortByNonce).metaTx
}
return nil
}
@ -1598,7 +1587,7 @@ func (b *ByNonce) has(mt *metaTx) bool {
if !ok || byNonce == nil || byNonce.Len() == 0 {
return false
}
found := byNonce.Get(&sortByNonce2{mt})
found := byNonce.Get(&sortByNonce{mt})
return found != nil
}
func (b *ByNonce) delete(mt *metaTx) {
@ -1606,7 +1595,7 @@ func (b *ByNonce) delete(mt *metaTx) {
if !ok || byNonce == nil || byNonce.Len() == 0 {
return
}
byNonce.Delete(&sortByNonce2{mt})
byNonce.Delete(&sortByNonce{mt})
if byNonce.Len() == 0 {
delete(b.bySenderID, mt.Tx.senderID)
}
@ -1617,9 +1606,9 @@ func (b *ByNonce) replaceOrInsert(mt *metaTx) *metaTx {
byNonce = btree.New(32)
b.bySenderID[mt.Tx.senderID] = byNonce
}
it := byNonce.ReplaceOrInsert(&sortByNonce2{mt})
it := byNonce.ReplaceOrInsert(&sortByNonce{mt})
if it != nil {
return it.(*sortByNonce2).metaTx
return it.(*sortByNonce).metaTx
}
return nil
}

34
txpool/pool_test.go
View File

@ -18,6 +18,7 @@ package txpool
import (
"container/heap"
"math/rand"
"testing"
)
@ -40,17 +41,32 @@ func BenchmarkName(b *testing.B) {
}
func BenchmarkName2(b *testing.B) {
txs := make([]*metaTx, 10_000)
p := NewSubPool(BaseFeeSubPool, 1024)
for i := 0; i < len(txs); i++ {
txs[i] = &metaTx{Tx: &TxSlot{}}
}
for i := 0; i < len(txs); i++ {
p.UnsafeAdd(txs[i])
}
p.EnforceInvariants()
var (
a = rand.Uint64()
c = rand.Uint64()
d = rand.Uint64()
)
b.ResetTimer()
var min1 uint64
var min2 uint64
var r uint64
for i := 0; i < b.N; i++ {
min1 = min(min1, a)
min2 = min(min2, c)
if d <= min1 {
r = min(min1-d, min2)
} else {
r = 0
}
//
//// 4. Dynamic fee requirement. Set to 1 if feeCap of the transaction is no less than
//// baseFee of the currently pending block. Set to 0 otherwise.
//mt.subPool &^= EnoughFeeCapBlock
//if mt.Tx.feeCap >= pendingBaseFee {
// mt.subPool |= EnoughFeeCapBlock
//}
}
_ = r
}