Unverified Commit db82ea2e authored by Marius van der Wijden's avatar Marius van der Wijden Committed by GitHub

core: reset txpool on sethead (#26392)

This change sends a HeadChainEvent when SetHead is invoked. The txpool will then reset the txnoncer on receiving the event. 
parent c87f321b
......@@ -532,8 +532,12 @@ func (bc *BlockChain) loadLastState() error {
// was fast synced or full synced and in which state, the method will try to
// delete minimal data from disk whilst retaining chain consistency.
func (bc *BlockChain) SetHead(head uint64) error {
_, err := bc.setHeadBeyondRoot(head, common.Hash{}, false)
return err
if _, err := bc.setHeadBeyondRoot(head, common.Hash{}, false); err != nil {
return err
}
// Send chain head event to update the transaction pool
bc.chainHeadFeed.Send(ChainHeadEvent{Block: bc.CurrentBlock()})
return nil
}
// SetFinalized sets the finalized block.
......
......@@ -118,9 +118,6 @@ func TestGethClient(t *testing.T) {
}, {
"TestGetNodeInfo",
func(t *testing.T) { testGetNodeInfo(t, client) },
}, {
"TestSetHead",
func(t *testing.T) { testSetHead(t, client) },
}, {
"TestSubscribePendingTxHashes",
func(t *testing.T) { testSubscribePendingTransactions(t, client) },
......@@ -138,6 +135,9 @@ func TestGethClient(t *testing.T) {
{
"TestAccessList",
func(t *testing.T) { testAccessList(t, client) },
}, {
"TestSetHead",
func(t *testing.T) { testSetHead(t, client) },
},
}
for _, tt := range tests {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment