diff --git a/Cargo.lock b/Cargo.lock
index 082f9524..81a5b88e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2199,7 +2199,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
 [[package]]
 name = "cross-domain-message-gossip"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -2723,7 +2723,7 @@ dependencies = [
 [[package]]
 name = "domain-block-preprocessor"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -2752,7 +2752,7 @@ dependencies = [
 [[package]]
 name = "domain-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "fp-account",
  "frame-support",
@@ -7227,7 +7227,7 @@ dependencies = [
 [[package]]
 name = "orml-vesting"
 version = "0.9.1"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7280,7 +7280,7 @@ dependencies = [
 [[package]]
 name = "pallet-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "domain-runtime-primitives",
  "frame-benchmarking",
@@ -7306,7 +7306,7 @@ dependencies = [
 [[package]]
 name = "pallet-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7344,7 +7344,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7358,7 +7358,7 @@ dependencies = [
 [[package]]
 name = "pallet-rewards"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7375,7 +7375,7 @@ dependencies = [
 [[package]]
 name = "pallet-runtime-configs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7389,7 +7389,7 @@ dependencies = [
 [[package]]
 name = "pallet-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7412,7 +7412,7 @@ dependencies = [
 [[package]]
 name = "pallet-subspace-mmr"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7464,7 +7464,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-fees"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7520,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "pallet-transporter"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "domain-runtime-primitives",
  "frame-benchmarking",
@@ -9312,7 +9312,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "futures",
@@ -9352,7 +9352,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace-rpc"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-oneshot",
  "futures",
@@ -9385,7 +9385,7 @@ dependencies = [
 [[package]]
 name = "sc-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "sc-client-api",
  "sc-executor",
@@ -9738,7 +9738,7 @@ dependencies = [
 [[package]]
 name = "sc-proof-of-time"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "atomic",
  "core_affinity",
@@ -9967,7 +9967,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-block-relay"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -9992,7 +9992,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-chain-specs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 
 [[package]]
 name = "sc-sysinfo"
@@ -10714,7 +10714,7 @@ dependencies = [
 [[package]]
 name = "sp-auto-id"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10738,7 +10738,7 @@ dependencies = [
 [[package]]
 name = "sp-block-fees"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -10831,7 +10831,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "log",
@@ -10967,7 +10967,7 @@ dependencies = [
 [[package]]
 name = "sp-domain-digests"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -10976,7 +10976,7 @@ dependencies = [
 [[package]]
 name = "sp-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "blake2 0.10.6",
  "domain-runtime-primitives",
@@ -11008,7 +11008,7 @@ dependencies = [
 [[package]]
 name = "sp-domains-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "domain-block-preprocessor",
  "domain-runtime-primitives",
@@ -11041,7 +11041,7 @@ dependencies = [
 [[package]]
 name = "sp-executive"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -11130,7 +11130,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "frame-support",
@@ -11152,7 +11152,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger-host-functions"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "domain-block-preprocessor",
  "parity-scale-codec",
@@ -11209,7 +11209,7 @@ dependencies = [
 [[package]]
 name = "sp-objects"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "sp-api",
  "subspace-core-primitives",
@@ -11393,7 +11393,7 @@ dependencies = [
 [[package]]
 name = "sp-subspace-mmr"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11746,7 +11746,7 @@ dependencies = [
 [[package]]
 name = "subspace-archiving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "parity-scale-codec",
  "rayon",
@@ -11759,7 +11759,7 @@ dependencies = [
 [[package]]
 name = "subspace-core-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "blake3",
  "derive_more",
@@ -11782,7 +11782,7 @@ dependencies = [
 [[package]]
 name = "subspace-erasure-coding"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "kzg",
  "rust-kzg-blst",
@@ -11792,7 +11792,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "anyhow",
  "async-lock 3.3.0",
@@ -11850,7 +11850,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer-components"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-lock 3.3.0",
  "async-trait",
@@ -11881,7 +11881,7 @@ dependencies = [
 [[package]]
 name = "subspace-metrics"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "actix-web",
  "prometheus",
@@ -11892,7 +11892,7 @@ dependencies = [
 [[package]]
 name = "subspace-networking"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-mutex",
  "async-trait",
@@ -11930,7 +11930,7 @@ dependencies = [
 [[package]]
 name = "subspace-proof-of-space"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "chacha20",
  "derive_more",
@@ -11943,7 +11943,7 @@ dependencies = [
 [[package]]
 name = "subspace-proof-of-time"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "aes",
  "subspace-core-primitives",
@@ -11953,7 +11953,7 @@ dependencies = [
 [[package]]
 name = "subspace-rpc-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "hex",
  "parity-scale-codec",
@@ -11966,7 +11966,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "domain-runtime-primitives",
  "frame-benchmarking",
@@ -12023,7 +12023,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "pallet-transaction-payment",
  "sp-core",
@@ -12034,7 +12034,7 @@ dependencies = [
 [[package]]
 name = "subspace-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "async-trait",
  "cross-domain-message-gossip",
@@ -12111,7 +12111,7 @@ dependencies = [
 [[package]]
 name = "subspace-verification"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=17273eeefd6781f4fa570e42cac722e580f9476a#17273eeefd6781f4fa570e42cac722e580f9476a"
+source = "git+https://github.com/subspace/subspace?rev=a4180f9e99a848dae87c77a402d2a414558b1520#a4180f9e99a848dae87c77a402d2a414558b1520"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
diff --git a/Cargo.toml b/Cargo.toml
index 6c02647f..e8553dfc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,25 +75,25 @@ sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742
 sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742b90e7852aed1f08ab5299d5d88cfa1c6ed", default-features = false }
 sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742b90e7852aed1f08ab5299d5d88cfa1c6ed", default-features = false }
 sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742b90e7852aed1f08ab5299d5d88cfa1c6ed", default-features = false }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
 semver = "1.0.22"
 serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 simple_moving_average = "1.0.2"
 sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742b90e7852aed1f08ab5299d5d88cfa1c6ed", default-features = false }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
 sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "44d742b90e7852aed1f08ab5299d5d88cfa1c6ed", default-features = false }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a", default-features = false }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "17273eeefd6781f4fa570e42cac722e580f9476a" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520", default-features = false }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "a4180f9e99a848dae87c77a402d2a414558b1520" }
 supports-color = "3.0.0"
 thiserror = "1.0.59"
 thread-priority = "0.16.0"
diff --git a/src/backend.rs b/src/backend.rs
index e3b901c5..ed414763 100644
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -213,7 +213,6 @@ pub enum BackendNotification {
         best_block_number: BlockNumber,
         reward_address_balance: Balance,
         initial_farm_states: Vec<InitialFarmState>,
-        farm_during_initial_plotting: bool,
         chain_info: ChainInfo,
     },
     Node(NodeNotification),
@@ -494,7 +493,6 @@ async fn run(
             best_block_number: consensus_node.best_block_number(),
             reward_address_balance: consensus_node.account_balance(&config.reward_address),
             initial_farm_states: farmer.initial_farm_states().to_vec(),
-            farm_during_initial_plotting: farmer.farm_during_initial_plotting(),
             chain_info: consensus_node.chain_info().clone(),
         })
         .await?;
diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs
index 2f5637cc..582067ad 100644
--- a/src/backend/farmer.rs
+++ b/src/backend/farmer.rs
@@ -29,7 +29,7 @@ use subspace_farmer::single_disk_farm::{
 };
 use subspace_farmer::utils::plotted_pieces::PlottedPieces;
 use subspace_farmer::utils::{
-    all_cpu_cores, create_plotting_thread_pool_manager, recommended_number_of_farming_threads,
+    create_plotting_thread_pool_manager, recommended_number_of_farming_threads,
     run_future_in_dedicated_thread, thread_pool_core_indices, AsyncJoinOnDrop,
 };
 use subspace_farmer::NodeClient;
@@ -84,7 +84,6 @@ pub(super) struct Farmer {
     farmer_fut: BoxFuture<'static, anyhow::Result<()>>,
     farmer_cache_worker_fut: BoxFuture<'static, ()>,
     initial_farm_states: Vec<InitialFarmState>,
-    farm_during_initial_plotting: bool,
     notifications: Arc<Notifications>,
     action_sender: mpsc::Sender<FarmerAction>,
 }
@@ -95,7 +94,6 @@ impl Farmer {
             farmer_fut,
             farmer_cache_worker_fut,
             initial_farm_states,
-            farm_during_initial_plotting: _,
             notifications,
             action_sender,
         } = self;
@@ -144,10 +142,6 @@ impl Farmer {
         &self.initial_farm_states
     }
 
-    pub(super) fn farm_during_initial_plotting(&self) -> bool {
-        self.farm_during_initial_plotting
-    }
-
     pub(super) fn action_sender(&self) -> mpsc::Sender<FarmerAction> {
         self.action_sender.clone()
     }
@@ -163,14 +157,6 @@ impl fmt::Debug for Farmer {
     }
 }
 
-fn should_farm_during_initial_plotting() -> bool {
-    let total_cpu_cores = all_cpu_cores()
-        .iter()
-        .flat_map(|set| set.cpu_cores())
-        .count();
-    total_cpu_cores > 8
-}
-
 #[derive(Debug, Clone)]
 pub struct DiskFarm {
     pub directory: PathBuf,
@@ -245,7 +231,6 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu
             .in_current_span(),
     );
 
-    let farm_during_initial_plotting = should_farm_during_initial_plotting();
     let plotting_thread_pool_core_indices = thread_pool_core_indices(None, None);
     let replotting_thread_pool_core_indices = {
         let mut replotting_thread_pool_core_indices = thread_pool_core_indices(None, None);
@@ -338,8 +323,7 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu
                             reward_address,
                             kzg,
                             erasure_coding,
-                            cache_percentage: CACHE_PERCENTAGE,
-                            farm_during_initial_plotting,
+                            cache_percentage: CACHE_PERCENTAGE.get(),
                             farming_thread_pool_size: recommended_number_of_farming_threads(),
                             plotting_delay: Some(plotting_delay_receiver),
                             global_mutex,
@@ -702,7 +686,6 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu
         farmer_fut,
         farmer_cache_worker_fut,
         initial_farm_states,
-        farm_during_initial_plotting,
         notifications,
         action_sender,
     })
diff --git a/src/frontend/running.rs b/src/frontend/running.rs
index d71f7458..945d0b3b 100644
--- a/src/frontend/running.rs
+++ b/src/frontend/running.rs
@@ -26,7 +26,6 @@ pub enum RunningInput {
         best_block_number: BlockNumber,
         reward_address_balance: Balance,
         initial_farm_states: Vec<InitialFarmState>,
-        farm_during_initial_plotting: bool,
         raw_config: RawConfig,
         chain_info: ChainInfo,
     },
@@ -220,7 +219,6 @@ impl RunningView {
                 best_block_number,
                 reward_address_balance,
                 initial_farm_states,
-                farm_during_initial_plotting,
                 raw_config,
                 chain_info,
             } => {
@@ -239,7 +237,6 @@ impl RunningView {
                             farm,
                             total_sectors: initial_farm_state.total_sectors_count,
                             plotted_total_sectors: initial_farm_state.plotted_sectors_count,
-                            farm_during_initial_plotting,
                             plotting_paused: self.plotting_paused,
                         },
                     );
diff --git a/src/frontend/running/farm.rs b/src/frontend/running/farm.rs
index 6133fb05..903d802f 100644
--- a/src/frontend/running/farm.rs
+++ b/src/frontend/running/farm.rs
@@ -75,7 +75,6 @@ pub(super) struct FarmWidgetInit {
     pub(super) farm: Farm,
     pub(super) total_sectors: SectorIndex,
     pub(super) plotted_total_sectors: SectorIndex,
-    pub(super) farm_during_initial_plotting: bool,
     pub(super) plotting_paused: bool,
 }
 
@@ -105,7 +104,6 @@ pub(super) struct FarmWidget {
     last_sector_plotted: Option<SectorIndex>,
     plotting_state: PlottingState,
     is_node_synced: bool,
-    farm_during_initial_plotting: bool,
     sector_rows: gtk::Box,
     sectors: HashMap<SectorIndex, gtk::Box>,
     non_fatal_farming_error: Option<Arc<FarmingError>>,
@@ -254,11 +252,6 @@ impl FactoryComponent for FarmWidget {
 
                     gtk::Box {
                         set_spacing: 5,
-                        set_tooltip: if self.farm_during_initial_plotting {
-                            "Farming runs in parallel to plotting on CPUs with more than 8 logical cores"
-                        } else {
-                            "Farming starts after initial plotting is complete on CPUs with 8 or less logical cores"
-                        },
 
                         gtk::Label {
                             set_halign: gtk::Align::Start,
@@ -286,7 +279,7 @@ impl FactoryComponent for FarmWidget {
                                         } else {
                                             "Initial plotting"
                                         };
-                                        let farming = if self.is_node_synced && self.farm_during_initial_plotting {
+                                        let farming = if self.is_node_synced {
                                             "farming"
                                         } else {
                                             "not farming"
@@ -389,7 +382,6 @@ impl FactoryComponent for FarmWidget {
             last_sector_plotted: None,
             plotting_state: PlottingState::Idle,
             is_node_synced: false,
-            farm_during_initial_plotting: init.farm_during_initial_plotting,
             sector_rows,
             sectors: HashMap::from_iter((SectorIndex::MIN..).zip(sectors)),
             non_fatal_farming_error: None,
diff --git a/src/main.rs b/src/main.rs
index f776b56f..9b9c59d2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -699,7 +699,6 @@ impl App {
                 best_block_number,
                 reward_address_balance,
                 initial_farm_states,
-                farm_during_initial_plotting,
                 chain_info,
             } => {
                 self.current_raw_config.replace(raw_config.clone());
@@ -708,7 +707,6 @@ impl App {
                     best_block_number,
                     reward_address_balance,
                     initial_farm_states,
-                    farm_during_initial_plotting,
                     raw_config,
                     chain_info,
                 });