Add transactions from retracted blocks back to the pool #3562
Conversation
arkpar
requested review from
andresilva,
Demi-Marie and
tomusdrw
as code owners
| if let Some(block) = client.block(&BlockId::hash(*r))? { | ||
| let extrinsics = block.block.extrinsics(); | ||
| if let Err(e) = transaction_pool.submit_at(id, extrinsics.iter().cloned(), true) { | ||
| warn!("Error re-submitting transactions: {:?}", e); |
There was a problem hiding this comment.
This might be triggered quite often in case of re-orgs. I would either lower this to debug or figure out how to detect transactions that were already included in another chain and print a warning only for other transactions.
There was a problem hiding this comment.
submit_at pushes a list of transactions. I believe it only fails when there's something fundamentally wrong with the pool. Otherwise it returns a list of individual results that we ignore here.
| @@ -893,6 +894,16 @@ pub(crate) fn maintain_transaction_pool<Api, Backend, Block, Executor, PoolApi>( | |||
| Executor: client::CallExecutor<Block, Blake2Hasher>, | |||
| PoolApi: txpool::ChainApi<Hash = Block::Hash, Block = Block>, | |||
| { | |||
| // Put transactions from retracted blocks back into the pool. | |||
| for r in retracted { | |||
There was a problem hiding this comment.
Does it makes sense to change to retracted.into_iter().rev(), so that depending transactions are imported in-order and not moving to/from future/ready queues? I mean if block #5 had a TX1 that provides OUT1 and block #6 had a TX2 that requires OUT1, then if we first import TX2, then it'll be inserted to future queue (because we miss OUT1). And after we import TX1, it'll be moved to ready queue (because TX1 provides OUT1). If we import TX1 first, then both transactions will be inserted in ready queue immediately.
(and hashes in retracted are in reverse order, afaik)
There was a problem hiding this comment.
Changes retracted in notification to be in ascending order, as documented.
* Add transactions from retracted blocks back to the pool * Line width * Reverse retracted
Closes #3462