From b38f4cb215c8bdacec964fbb562ae802d0bd3f7c Mon Sep 17 00:00:00 2001
From: Parth Desai <desaiparth08@gmail.com>
Date: Sat, 5 Aug 2023 12:08:58 +0400
Subject: [PATCH] import subspace/subspace#1703 subspace/subspace#1719
 subspace/subspace#1721 subspace/subspace#1716 subspace/subspace#1722
 subspace/subspace#1732 subspace/subspace#1733 subspace/subspace#1704
 subspace/subspace#1710 subspace#1737 subspace/subspace#1736

---
 .github/workflows/push.yml |  4 +-
 Cargo.lock                 | 77 +++++++++++++++++++-------------------
 Cargo.toml                 |  4 +-
 dsn/Cargo.toml             | 10 ++---
 farmer/Cargo.toml          | 14 +++----
 farmer/src/lib.rs          |  7 +---
 node/Cargo.toml            | 28 +++++++-------
 traits/Cargo.toml          |  6 +--
 utils/Cargo.toml           | 12 +++---
 9 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ba1b1f65..eae9825f 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,7 +26,9 @@ env:
   CARGO_INCREMENTAL: 0
   CARGO_TERM_COLOR: always
   MAX_TARGET_SIZE: 1024 # MB
-  RUSTFLAGS: -C debuginfo=0
+  # TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate bumps MSRV to at least
+  #  1.61: https://github.com/RustCrypto/block-ciphers/issues/373
+  RUSTFLAGS: -C strip=symbols -C opt-level=s --cfg aes_armv8
 
 jobs:
   fmt:
diff --git a/Cargo.lock b/Cargo.lock
index 9b4cf3d2..7598523e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1581,7 +1581,7 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
 [[package]]
 name = "cross-domain-message-gossip"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -2136,7 +2136,7 @@ dependencies = [
 [[package]]
 name = "domain-block-preprocessor"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "domain-runtime-primitives",
  "parity-scale-codec",
@@ -2160,7 +2160,7 @@ dependencies = [
 [[package]]
 name = "domain-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -5625,7 +5625,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 [[package]]
 name = "orml-vesting"
 version = "0.4.1-dev"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5716,7 +5716,7 @@ dependencies = [
 [[package]]
 name = "pallet-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5736,7 +5736,7 @@ dependencies = [
 [[package]]
 name = "pallet-feeds"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5752,7 +5752,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa-finality-verifier"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "finality-grandpa",
  "frame-support",
@@ -5772,7 +5772,7 @@ dependencies = [
 [[package]]
 name = "pallet-object-store"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5787,7 +5787,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5802,7 +5802,7 @@ dependencies = [
 [[package]]
 name = "pallet-rewards"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5815,7 +5815,7 @@ dependencies = [
 [[package]]
 name = "pallet-runtime-configs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5827,7 +5827,7 @@ dependencies = [
 [[package]]
 name = "pallet-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5886,7 +5886,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-fees"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7244,7 +7244,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -7282,7 +7282,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -7325,7 +7325,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace-rpc"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-oneshot",
  "futures",
@@ -7848,7 +7848,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-block-relay"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-channel",
  "async-trait",
@@ -7870,7 +7870,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-chain-specs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "sc-chain-spec",
  "sc-service",
@@ -8842,7 +8842,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "log",
@@ -8959,7 +8959,7 @@ dependencies = [
 [[package]]
 name = "sp-domain-digests"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8971,7 +8971,7 @@ dependencies = [
 [[package]]
 name = "sp-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "blake2",
  "parity-scale-codec",
@@ -9074,7 +9074,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "frame-support",
  "hash-db",
@@ -9102,7 +9102,7 @@ dependencies = [
 [[package]]
 name = "sp-objects"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "sp-api",
  "sp-std",
@@ -9552,7 +9552,7 @@ dependencies = [
 [[package]]
 name = "subspace-archiving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "parity-scale-codec",
  "rayon",
@@ -9565,7 +9565,7 @@ dependencies = [
 [[package]]
 name = "subspace-core-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "blake2",
  "blst_rust",
@@ -9589,7 +9589,7 @@ dependencies = [
 [[package]]
 name = "subspace-erasure-coding"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "blst_rust",
  "kzg",
@@ -9599,7 +9599,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -9620,7 +9620,6 @@ dependencies = [
  "jsonrpsee",
  "lru",
  "memmap2 0.7.0",
- "num-traits",
  "parity-db",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -9652,7 +9651,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer-components"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "backoff",
@@ -9681,7 +9680,7 @@ dependencies = [
 [[package]]
 name = "subspace-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "domain-block-preprocessor",
  "domain-runtime-primitives",
@@ -9705,7 +9704,7 @@ dependencies = [
 [[package]]
 name = "subspace-networking"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -9749,7 +9748,7 @@ dependencies = [
 [[package]]
 name = "subspace-proof-of-space"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "blake3",
  "chacha20 0.9.1",
@@ -9763,7 +9762,7 @@ dependencies = [
 [[package]]
 name = "subspace-rpc-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "hex",
  "serde",
@@ -9775,7 +9774,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "domain-runtime-primitives",
  "frame-benchmarking",
@@ -9826,7 +9825,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9867,7 +9866,7 @@ dependencies = [
 [[package]]
 name = "subspace-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "atomic",
@@ -9939,12 +9938,12 @@ dependencies = [
 [[package]]
 name = "subspace-solving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 
 [[package]]
 name = "subspace-transaction-pool"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -9972,7 +9971,7 @@ dependencies = [
 [[package]]
 name = "subspace-verification"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=cad1704bb1ea49b4ee145b480711a632e64dd221#cad1704bb1ea49b4ee145b480711a632e64dd221"
+source = "git+https://github.com/subspace/subspace?rev=ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec#ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
diff --git a/Cargo.toml b/Cargo.toml
index dc55528a..cdcd4376 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ sdk-dsn = { path = "dsn" }
 sdk-substrate = { path = "substrate" }
 sdk-farmer = { path = "farmer" }
 
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
 
 # The only triple tested and confirmed as working in `jemallocator` crate is `x86_64-unknown-linux-gnu`
 [target.'cfg(all(target_arch = "x86_64", target_vendor = "unknown", target_os = "linux", target_env = "gnu"))'.dev-dependencies]
@@ -35,7 +35,7 @@ tracing = "0.1"
 tracing-futures = "0.2"
 tracing-subscriber = "0.3"
 
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
 
 # The list of dependencies below (which can be both direct and indirect dependencies) are crates
 # that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
diff --git a/dsn/Cargo.toml b/dsn/Cargo.toml
index b33fb9e2..e7f250e3 100644
--- a/dsn/Cargo.toml
+++ b/dsn/Cargo.toml
@@ -24,8 +24,8 @@ sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/subs
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
diff --git a/farmer/Cargo.toml b/farmer/Cargo.toml
index f1368f60..81f4166f 100644
--- a/farmer/Cargo.toml
+++ b/farmer/Cargo.toml
@@ -25,10 +25,10 @@ sdk-utils = { path = "../utils" }
 sdk-dsn = { path = "../dsn" }
 sdk-traits = { path = "../traits" }
 
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221", features = ["parallel", "chia"] }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec", features = ["parallel", "chia"] }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
diff --git a/farmer/src/lib.rs b/farmer/src/lib.rs
index cda16aca..63f50073 100644
--- a/farmer/src/lib.rs
+++ b/farmer/src/lib.rs
@@ -446,9 +446,8 @@ impl Config {
             Box::pin({
                 let piece_cache = piece_cache.clone();
                 let piece_getter = piece_getter.clone();
-                let dsn_node = node.dsn().node.clone();
 
-                populate_pieces_cache(dsn_node, last_segment_index, piece_getter, piece_cache)
+                populate_pieces_cache(last_segment_index, piece_getter, piece_cache)
             }),
             format!("subspace-sdk-farmer-{node_name}-pieces-cache-population"),
         )
@@ -933,13 +932,11 @@ impl<T: subspace_proof_of_space::Table> Farmer<T> {
 
 const GET_PIECE_MAX_RETRIES_COUNT: u16 = 3;
 const GET_PIECE_DELAY_IN_SECS: u64 = 3;
-const POPULATE_PIECE_DELAY: Duration = Duration::from_secs(10);
 
 /// Populates piece cache on startup. It waits for the new segment index and
 /// check all pieces from previous segments to see if they are already in the
 /// cache. If they are not, they are added from DSN.
 async fn populate_pieces_cache<PV, PC>(
-    dsn_node: subspace_networking::Node,
     segment_index: SegmentIndex,
     piece_getter: Arc<FarmerPieceGetter<PV, PC>>,
     piece_cache: Arc<tokio::sync::Mutex<FarmerPieceCache>>,
@@ -947,8 +944,6 @@ async fn populate_pieces_cache<PV, PC>(
     PV: PieceValidator + Send + Sync + 'static,
     PC: PieceCache + Send + 'static,
 {
-    let _ = dsn_node.wait_for_connected_peers(POPULATE_PIECE_DELAY).await;
-
     debug!(%segment_index, "Started syncing piece cache...");
     let final_piece_index =
         u64::from(segment_index.first_piece_index()) + ArchivedHistorySegment::NUM_PIECES as u64;
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 228fb2fa..86ef6b66 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -42,17 +42,17 @@ sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", r
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sp-version = { version = "22.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 
-pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-sp-domains = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+sp-domains = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index c348542f..cf8a1a9e 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -10,8 +10,8 @@ async-trait = "0.1"
 parking_lot = "0.12"
 sdk-dsn = { path = "../dsn" }
 
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
 
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
index f598bb77..68b3bb0a 100644
--- a/utils/Cargo.toml
+++ b/utils/Cargo.toml
@@ -34,11 +34,11 @@ sp-core-hashing = { version = "9.0.0", git = "https://github.com/subspace/substr
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sp-storage = { version = "13.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 
-sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }
 
 # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver`
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "cad1704bb1ea49b4ee145b480711a632e64dd221" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "ed9c3baea6b9d917bd8a6c5118f089e4230bf7ec" }