From 69982e15e1e21ed3a38fc70825ab2c057b5ab48d Mon Sep 17 00:00:00 2001
From: undercover-cactus <lola@moonsonglabs.com>
Date: Mon, 23 Mar 2026 13:53:24 +0100
Subject: [PATCH] remove the TODO waiting for the storageHub PR; uncomment the
 code;

---
 operator/node/src/cli.rs     | 18 ++++++++----------
 operator/node/src/service.rs |  7 +++----
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/operator/node/src/cli.rs b/operator/node/src/cli.rs
index 7565b8cd..d661df4e 100644
--- a/operator/node/src/cli.rs
+++ b/operator/node/src/cli.rs
@@ -639,11 +639,10 @@ impl ProviderConfigurations {
             bs_changed = true;
         }
 
-        // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
-        // if let Some(extrinsic_mortality) = self.extrinsic_mortality {
-        //     bs_options.extrinsic_mortality = Some(extrinsic_mortality);
-        //     bs_changed = true;
-        // }
+        if let Some(extrinsic_mortality) = self.extrinsic_mortality {
+            bs_options.extrinsic_mortality = Some(extrinsic_mortality);
+            bs_changed = true;
+        }
 
         if let Some(check_for_pending_proofs_period) = self.check_for_pending_proofs_period {
             bs_options.check_for_pending_proofs_period = Some(check_for_pending_proofs_period);
@@ -865,11 +864,10 @@ impl FishermanConfigurations {
             let mut bs_options = BlockchainServiceOptions::default();
             let mut bs_changed = false;
 
-            // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
-            // if let Some(extrinsic_mortality) = self.fisherman_extrinsic_mortality {
-            //     bs_options.extrinsic_mortality = Some(extrinsic_mortality);
-            //     bs_changed = true;
-            // }
+            if let Some(extrinsic_mortality) = self.fisherman_extrinsic_mortality {
+                bs_options.extrinsic_mortality = Some(extrinsic_mortality);
+                bs_changed = true;
+            }
 
             if bs_changed {
                 blockchain_service = Some(bs_options);
diff --git a/operator/node/src/service.rs b/operator/node/src/service.rs
index afd42925..18f79c32 100644
--- a/operator/node/src/service.rs
+++ b/operator/node/src/service.rs
@@ -1331,11 +1331,10 @@ where
             // Set the indexer db pool
             builder.with_indexer_db_pool(Some(db_pool));
 
-            // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
             // Configure blockchain service options for the fisherman
-            // if let Some(c) = fisherman_options.blockchain_service.clone() {
-            //     builder.with_blockchain_service_config(c);
-            // }
+            if let Some(c) = fisherman_options.blockchain_service.clone() {
+                builder.with_blockchain_service_config(c);
+            }
 
             // Spawn the fisherman service
             builder