diff --git a/Cargo.lock b/Cargo.lock
index c11d378..d1b52e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -916,9 +916,9 @@ dependencies = [
 
 [[package]]
 name = "async-nats"
-version = "0.34.0"
+version = "0.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eea7b126ebfa4db78e9e788b2a792b6329f35b4f2fdd56dbc646dedc2beec7a5"
+checksum = "ab8df97cb8fc4a884af29ab383e9292ea0939cfcdd7d2a17179086dc6c427e7f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -941,7 +941,7 @@ dependencies = [
  "thiserror",
  "time",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
  "tracing",
  "tryhard",
  "url",
@@ -2149,7 +2149,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
 [[package]]
 name = "cross-domain-message-gossip"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -2631,7 +2631,7 @@ dependencies = [
 [[package]]
 name = "domain-block-preprocessor"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -2660,7 +2660,7 @@ dependencies = [
 [[package]]
 name = "domain-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "fp-account",
  "frame-support",
@@ -8637,6 +8637,20 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740"
+dependencies = [
+ "once_cell",
+ "ring 0.17.8",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.4",
+ "subtle 2.5.0",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -8956,7 +8970,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "futures",
@@ -8996,7 +9010,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace-rpc"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-oneshot",
  "futures",
@@ -9029,7 +9043,7 @@ dependencies = [
 [[package]]
 name = "sc-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "sc-client-api",
  "sc-executor",
@@ -9383,7 +9397,7 @@ dependencies = [
 [[package]]
 name = "sc-proof-of-time"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "atomic",
  "core_affinity",
@@ -9612,7 +9626,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-block-relay"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -9637,7 +9651,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-chain-specs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 
 [[package]]
 name = "sc-sysinfo"
@@ -10356,7 +10370,7 @@ dependencies = [
 [[package]]
 name = "sp-auto-id"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10380,7 +10394,7 @@ dependencies = [
 [[package]]
 name = "sp-block-fees"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -10473,7 +10487,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "log",
@@ -10609,7 +10623,7 @@ dependencies = [
 [[package]]
 name = "sp-domain-digests"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10618,7 +10632,7 @@ dependencies = [
 [[package]]
 name = "sp-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "blake2 0.10.6",
  "domain-runtime-primitives",
@@ -10650,7 +10664,7 @@ dependencies = [
 [[package]]
 name = "sp-domains-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "domain-block-preprocessor",
  "domain-runtime-primitives",
@@ -10673,6 +10687,7 @@ dependencies = [
  "sp-runtime-interface",
  "sp-state-machine",
  "sp-std",
+ "sp-subspace-mmr",
  "sp-trie",
  "subspace-core-primitives",
  "subspace-runtime-primitives",
@@ -10683,7 +10698,7 @@ dependencies = [
 [[package]]
 name = "sp-executive"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10772,7 +10787,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "frame-support",
@@ -10794,7 +10809,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger-host-functions"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "domain-block-preprocessor",
  "parity-scale-codec",
@@ -10851,7 +10866,7 @@ dependencies = [
 [[package]]
 name = "sp-objects"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "sp-api",
  "subspace-core-primitives",
@@ -11035,7 +11050,7 @@ dependencies = [
 [[package]]
 name = "sp-subspace-mmr"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11379,7 +11394,7 @@ dependencies = [
 [[package]]
 name = "subspace-archiving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "parity-scale-codec",
  "rayon",
@@ -11392,7 +11407,7 @@ dependencies = [
 [[package]]
 name = "subspace-core-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "blake3",
  "derive_more",
@@ -11415,7 +11430,7 @@ dependencies = [
 [[package]]
 name = "subspace-erasure-coding"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "kzg",
  "rust-kzg-blst",
@@ -11425,7 +11440,7 @@ dependencies = [
 [[package]]
 name = "subspace-fake-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "domain-runtime-primitives",
  "frame-support",
@@ -11456,7 +11471,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -11515,7 +11530,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer-components"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-lock",
  "async-trait",
@@ -11546,7 +11561,7 @@ dependencies = [
 [[package]]
 name = "subspace-metrics"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "actix-web",
  "prometheus",
@@ -11557,7 +11572,7 @@ dependencies = [
 [[package]]
 name = "subspace-networking"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -11595,20 +11610,22 @@ dependencies = [
 [[package]]
 name = "subspace-proof-of-space"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "chacha20",
  "derive_more",
+ "parking_lot 0.12.2",
  "rayon",
  "seq-macro",
  "sha2 0.10.8",
+ "spin 0.9.8",
  "subspace-core-primitives",
 ]
 
 [[package]]
 name = "subspace-proof-of-time"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "aes",
  "subspace-core-primitives",
@@ -11618,7 +11635,7 @@ dependencies = [
 [[package]]
 name = "subspace-rpc-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "hex",
  "parity-scale-codec",
@@ -11631,7 +11648,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "frame-support",
  "pallet-transaction-payment",
@@ -11645,7 +11662,7 @@ dependencies = [
 [[package]]
 name = "subspace-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "async-trait",
  "cross-domain-message-gossip",
@@ -11722,7 +11739,7 @@ dependencies = [
 [[package]]
 name = "subspace-verification"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=5f6132956dc93dce079f66d8a3319627ae20a2f9#5f6132956dc93dce079f66d8a3319627ae20a2f9"
+source = "git+https://github.com/subspace/subspace?rev=43db71a66866c4e0c46f95f217d9f81d1eb6c897#43db71a66866c4e0c46f95f217d9f81d1eb6c897"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -12119,6 +12136,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.8",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.15"
diff --git a/Cargo.toml b/Cargo.toml
index 6f102e1..309d8b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,13 +72,13 @@ reqwest = { version = "0.12.4", default-features = false, features = ["json", "r
 sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
 sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-sc-rpc =  { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
+sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
 sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 schnellru = "0.2.3"
 semver = "1.0.23"
@@ -87,22 +87,22 @@ serde_json = "1.0.117"
 simple_moving_average = "1.0.2"
 sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
 sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
 sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-sp-objects = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
+sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+sp-objects = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
 sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "9b8cdb87de8f1c0e6b48c468b6196d1d99eeabee", default-features = false }
-subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9", default-features = false }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "5f6132956dc93dce079f66d8a3319627ae20a2f9" }
+subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897", default-features = false }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "43db71a66866c4e0c46f95f217d9f81d1eb6c897" }
 supports-color = "3.0.0"
 thiserror = "1.0.60"
 thread-priority = "1.1.0"
diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs
index 4633827..c7e6f21 100644
--- a/src/backend/farmer.rs
+++ b/src/backend/farmer.rs
@@ -23,7 +23,9 @@ use std::{fmt, fs};
 use subspace_core_primitives::crypto::kzg::Kzg;
 use subspace_core_primitives::{PublicKey, Record, SectorIndex};
 use subspace_erasure_coding::ErasureCoding;
-use subspace_farmer::farm::{Farm, FarmingNotification, SectorPlottingDetails, SectorUpdate};
+use subspace_farmer::farm::{
+    FarmingNotification, PlottedSectors, SectorPlottingDetails, SectorUpdate,
+};
 use subspace_farmer::farmer_cache::{FarmerCache, FarmerCacheWorker};
 use subspace_farmer::node_client::NodeClient;
 use subspace_farmer::plotter::cpu::CpuPlotter;
@@ -393,7 +395,7 @@ where
                     );
                     info!("  Directory: {}", disk_farm.directory.display());
 
-                    (farm_index, Ok(Box::new(farm) as Box<dyn Farm>))
+                    (farm_index, Ok(farm))
                 }
                 .instrument(info_span!("", %farm_index))
             })
@@ -443,9 +445,15 @@ where
     }
     farmer_cache
         .replace_backing_caches(
-            farms.iter().map(|farm| farm.piece_cache()).collect(),
+            farms
+                .iter()
+                .map(|farm| Arc::new(farm.piece_cache()) as Arc<_>)
+                .collect(),
             if plot_cache {
-                farms.iter().map(|farm| farm.plot_cache()).collect()
+                farms
+                    .iter()
+                    .map(|farm| Arc::new(farm.plot_cache()) as Arc<_>)
+                    .collect()
             } else {
                 Vec::new()
             },
@@ -463,7 +471,7 @@ where
             .try_into()
             .map_err(|_error| anyhow!("More than 256 plots are not supported by Space Acres"))?;
 
-        plotted_pieces.add_farm(farm_index, farm.piece_reader());
+        plotted_pieces.add_farm(farm_index, Arc::new(farm.piece_reader()));
 
         let total_sectors_count = farm.total_sectors_count();
         let mut plotted_sectors_count = 0;