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

add state check assert routine

Browse Source
This commit is contained in:
alex.sharov 2021-08-27 17:17:10 +07:00
parent 16607d14e7
commit 92740a3935
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
txpool/pool.go
View File

@ -569,7 +569,7 @@ func (sc *SendersCache) flush(tx kv.RwTx, byNonce *ByNonce, sendersWithoutTransa
if sc.commitID-binary.BigEndian.Uint64(k) < 5 { if sc.commitID-binary.BigEndian.Uint64(k) < 5 {
break break
} }
fmt.Printf("del:%d\n", binary.BigEndian.Uint64(k)) fmt.Printf("del:%d,%d\n", binary.BigEndian.Uint64(k), sc.commitID)
for i := 0; i < len(v); i += 8 { for i := 0; i < len(v); i += 8 {
senderID := binary.BigEndian.Uint64(v[i : i+8]) senderID := binary.BigEndian.Uint64(v[i : i+8])
if _, ok := sc.senderInfo[senderID]; ok { if _, ok := sc.senderInfo[senderID]; ok {
@ -976,9 +976,6 @@ func (p *TxPool) OnNewBlock(stateChanges map[string]senderInfo, unwindTxs, mined
return err return err
} }
defer tx.Rollback() defer tx.Rollback()
p.lock.Lock()
defer p.lock.Unlock()
protocolBaseFee, pendingBaseFee = p.setBaseFee(protocolBaseFee, pendingBaseFee) protocolBaseFee, pendingBaseFee = p.setBaseFee(protocolBaseFee, pendingBaseFee)
if err := senders.onNewBlock(tx, stateChanges, unwindTxs, minedTxs, blockHeight, blockHash); err != nil { if err := senders.onNewBlock(tx, stateChanges, unwindTxs, minedTxs, blockHeight, blockHash); err != nil {
return err return err
@ -991,6 +988,8 @@ func (p *TxPool) OnNewBlock(stateChanges map[string]senderInfo, unwindTxs, mined
return err return err
} }
p.lock.Lock()
defer p.lock.Unlock()
if err := onNewBlock(tx, senders, unwindTxs, minedTxs.txs, protocolBaseFee, pendingBaseFee, p.pending, p.baseFee, p.queued, p.txNonce2Tx, p.byHash, p.discardLocked); err != nil { if err := onNewBlock(tx, senders, unwindTxs, minedTxs.txs, protocolBaseFee, pendingBaseFee, p.pending, p.baseFee, p.queued, p.txNonce2Tx, p.byHash, p.discardLocked); err != nil {
return err return err
} }