From 17959663cad6b8a167a1ae3933eab6c489c84e93 Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Mon, 7 Nov 2022 21:12:26 +0100
Subject: [PATCH] txpool: enactment state forced update (#12632)

* txpool: enactment state forced update

When `tree_route` computation fails, we still need to update the
`enactment_state` to be aligned with last known finalized/best block.

We do not execute enactment phase of maintain procedure, but we do
update the state.

* error -> debug

* test added
---
 .../transaction-pool/src/enactment_state.rs   | 28 +++++++++++++++++++
 client/transaction-pool/src/lib.rs            |  4 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/client/transaction-pool/src/enactment_state.rs b/client/transaction-pool/src/enactment_state.rs
index 242b557dfbbbd..b347de824fa12 100644
--- a/client/transaction-pool/src/enactment_state.rs
+++ b/client/transaction-pool/src/enactment_state.rs
@@ -134,6 +134,16 @@ where
 
 		Ok(Some(tree_route))
 	}
+
+	/// Forces update of the state according to the given `ChainEvent`. Intended to be used as a
+	/// fallback when tree_route cannot be computed.
+	pub fn force_update(&mut self, event: &ChainEvent<Block>) {
+		match event {
+			ChainEvent::NewBestBlock { hash, .. } => self.recent_best_block = *hash,
+			ChainEvent::Finalized { hash, .. } => self.recent_finalized_block = *hash,
+		};
+		log::debug!(target: "txpool", "forced update: {:?}, {:?}", self.recent_best_block, self.recent_finalized_block);
+	}
 }
 
 #[cfg(test)]
@@ -576,4 +586,22 @@ mod enactment_state_tests {
 		assert_eq!(result, false);
 		assert_es_eq(&es, e1(), d1());
 	}
+
+	#[test]
+	fn test_enactment_forced_update_best_block() {
+		sp_tracing::try_init_simple();
+		let mut es = EnactmentState::new(a().hash, a().hash);
+
+		es.force_update(&ChainEvent::NewBestBlock { hash: b1().hash, tree_route: None });
+		assert_es_eq(&es, b1(), a());
+	}
+
+	#[test]
+	fn test_enactment_forced_update_finalize() {
+		sp_tracing::try_init_simple();
+		let mut es = EnactmentState::new(a().hash, a().hash);
+
+		es.force_update(&ChainEvent::Finalized { hash: b1().hash, tree_route: Arc::from([]) });
+		assert_es_eq(&es, a(), b1());
+	}
 }
diff --git a/client/transaction-pool/src/lib.rs b/client/transaction-pool/src/lib.rs
index 410ab662e3601..e2f4cb0b22439 100644
--- a/client/transaction-pool/src/lib.rs
+++ b/client/transaction-pool/src/lib.rs
@@ -746,8 +746,8 @@ where
 
 		match result {
 			Err(msg) => {
-				log::warn!(target: "txpool", "{msg}");
-				return
+				log::debug!(target: "txpool", "{msg}");
+				self.enactment_state.lock().force_update(&event);
 			},
 			Ok(None) => {},
 			Ok(Some(tree_route)) => {