From 36e9fa909db24d027f3101b49f064b95194c796c Mon Sep 17 00:00:00 2001
From: i1i1 <vanyarybin1@live.ru>
Date: Tue, 16 May 2023 19:19:33 +0300
Subject: [PATCH] Import
 subspace/subspace#1441,subspace/subspace#1448,subspace/subspace#1450,subspace/subspace#1453,subspace/subspace#1454,subspace/subspace#1455,subspace/subspace#1456

---
 Cargo.lock                  | 175 +++++++++++++++++++++---------------
 Cargo.toml                  |  10 ++-
 dsn/Cargo.toml              |  12 +--
 farmer/Cargo.toml           |  14 +--
 node/Cargo.toml             |  48 +++++-----
 tests/integration/farmer.rs |   1 +
 tests/integration/node.rs   |  16 +---
 traits/Cargo.toml           |   8 +-
 utils/Cargo.toml            |  14 +--
 9 files changed, 160 insertions(+), 138 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b98991f7..fa349496 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -901,6 +901,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "constant_time_eq",
+ "digest 0.10.6",
 ]
 
 [[package]]
@@ -958,6 +959,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array 0.14.6",
+]
+
 [[package]]
 name = "blst"
 version = "0.3.10"
@@ -970,9 +980,9 @@ dependencies = [
 ]
 
 [[package]]
-name = "blst_from_scratch"
+name = "blst_rust"
 version = "0.1.0"
-source = "git+https://github.com/subspace/rust-kzg?rev=b71e7ace37420db889488cbd64d53eea38176111#b71e7ace37420db889488cbd64d53eea38176111"
+source = "git+https://github.com/subspace/rust-kzg?rev=1058cc8c8af8461b490dc212c41d7d506a746577#1058cc8c8af8461b490dc212c41d7d506a746577"
 dependencies = [
  "blst",
  "kzg",
@@ -1190,6 +1200,17 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
+]
+
 [[package]]
 name = "chacha20poly1305"
 version = "0.9.1"
@@ -1197,7 +1218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
 dependencies = [
  "aead 0.4.3",
- "chacha20",
+ "chacha20 0.8.2",
  "cipher 0.3.0",
  "poly1305",
  "zeroize",
@@ -1415,7 +1436,7 @@ dependencies = [
 [[package]]
 name = "core-eth-relay-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-pallet-executive",
  "domain-runtime-primitives",
@@ -1458,7 +1479,7 @@ dependencies = [
 [[package]]
 name = "core-evm-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-pallet-executive",
  "domain-runtime-primitives",
@@ -1523,7 +1544,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 [[package]]
 name = "core-payments-domain-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-pallet-executive",
  "domain-runtime-primitives",
@@ -1718,7 +1739,7 @@ checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52"
 [[package]]
 name = "cross-domain-message-gossip"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -2281,7 +2302,7 @@ dependencies = [
 [[package]]
 name = "domain-block-builder"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -2298,7 +2319,7 @@ dependencies = [
 [[package]]
 name = "domain-block-preprocessor"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-runtime-primitives",
  "parity-scale-codec",
@@ -2324,7 +2345,7 @@ dependencies = [
 [[package]]
 name = "domain-client-consensus-relay-chain"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "futures",
@@ -2341,7 +2362,7 @@ dependencies = [
 [[package]]
 name = "domain-client-executor"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "crossbeam",
  "domain-block-builder",
@@ -2384,7 +2405,7 @@ dependencies = [
 [[package]]
 name = "domain-client-executor-gossip"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -2402,7 +2423,7 @@ dependencies = [
 [[package]]
 name = "domain-client-message-relayer"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-channel",
  "cross-domain-message-gossip",
@@ -2429,7 +2450,7 @@ dependencies = [
 [[package]]
 name = "domain-eth-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "clap",
  "domain-runtime-primitives",
@@ -2462,7 +2483,7 @@ dependencies = [
 [[package]]
 name = "domain-pallet-executive"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-executive",
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -2479,7 +2500,7 @@ dependencies = [
 [[package]]
 name = "domain-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -2493,7 +2514,7 @@ dependencies = [
 [[package]]
 name = "domain-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "clap",
@@ -4383,6 +4404,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
+ "block-padding 0.3.3",
  "generic-array 0.14.6",
 ]
 
@@ -4734,7 +4756,7 @@ dependencies = [
 [[package]]
 name = "kzg"
 version = "0.1.0"
-source = "git+https://github.com/subspace/rust-kzg?rev=b71e7ace37420db889488cbd64d53eea38176111#b71e7ace37420db889488cbd64d53eea38176111"
+source = "git+https://github.com/subspace/rust-kzg?rev=1058cc8c8af8461b490dc212c41d7d506a746577#1058cc8c8af8461b490dc212c41d7d506a746577"
 dependencies = [
  "blst",
  "sha2 0.10.6",
@@ -6496,7 +6518,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 [[package]]
 name = "orml-vesting"
 version = "0.4.1-dev"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6601,7 +6623,7 @@ dependencies = [
 [[package]]
 name = "pallet-domain-registry"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6622,7 +6644,7 @@ dependencies = [
 [[package]]
 name = "pallet-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6725,7 +6747,7 @@ dependencies = [
 [[package]]
 name = "pallet-executor-registry"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6743,7 +6765,7 @@ dependencies = [
 [[package]]
 name = "pallet-feeds"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6759,7 +6781,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa-finality-verifier"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "finality-grandpa",
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -6779,7 +6801,7 @@ dependencies = [
 [[package]]
 name = "pallet-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6797,7 +6819,7 @@ dependencies = [
 [[package]]
 name = "pallet-object-store"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6812,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6827,7 +6849,7 @@ dependencies = [
 [[package]]
 name = "pallet-receipts"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6843,7 +6865,7 @@ dependencies = [
 [[package]]
 name = "pallet-rewards"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6856,7 +6878,7 @@ dependencies = [
 [[package]]
 name = "pallet-runtime-configs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6868,7 +6890,7 @@ dependencies = [
 [[package]]
 name = "pallet-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6924,7 +6946,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-fees"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "frame-system",
@@ -6980,7 +7002,7 @@ dependencies = [
 [[package]]
 name = "pallet-transporter"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-runtime-primitives",
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -8421,7 +8443,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8459,7 +8481,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -8501,7 +8523,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-subspace-rpc"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-oneshot",
  "futures",
@@ -9052,7 +9074,7 @@ dependencies = [
 [[package]]
 name = "sc-subspace-chain-specs"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "sc-chain-spec",
  "sc-service",
@@ -9748,6 +9770,16 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest 0.10.6",
+ "sha2-asm",
+]
+
+[[package]]
+name = "sha2-asm"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf27176fb5d15398e3a479c652c20459d9dac830dedd1fa55b42a77dbcdbfcea"
+dependencies = [
+ "cc",
 ]
 
 [[package]]
@@ -10166,7 +10198,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-subspace"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "log",
@@ -10360,7 +10392,7 @@ dependencies = [
 [[package]]
 name = "sp-domain-digests"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "sp-api 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -10372,7 +10404,7 @@ dependencies = [
 [[package]]
 name = "sp-domains"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "blake2",
  "merlin",
@@ -10399,7 +10431,7 @@ dependencies = [
 [[package]]
 name = "sp-executor-registry"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "sp-domains",
@@ -10564,7 +10596,7 @@ dependencies = [
 [[package]]
 name = "sp-messenger"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "frame-support 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "hash-db 0.16.0",
@@ -10581,7 +10613,7 @@ dependencies = [
 [[package]]
 name = "sp-objects"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "sp-api 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
  "sp-std 5.0.0 (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -10622,7 +10654,7 @@ dependencies = [
 [[package]]
 name = "sp-receipts"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "sp-api 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
@@ -11252,7 +11284,7 @@ dependencies = [
 [[package]]
 name = "subspace-archiving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "rayon",
@@ -11262,22 +11294,13 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "subspace-chiapos"
-version = "0.1.0"
-source = "git+https://github.com/subspace/chiapos?rev=3b1ab3ca24764d25da30e0c8243e0bf304b776a5#3b1ab3ca24764d25da30e0c8243e0bf304b776a5"
-dependencies = [
- "cc",
- "zstd-sys",
-]
-
 [[package]]
 name = "subspace-core-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "blake2",
- "blst_from_scratch",
+ "blst_rust",
  "derive_more",
  "hex",
  "kzg",
@@ -11298,9 +11321,9 @@ dependencies = [
 [[package]]
 name = "subspace-erasure-coding"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
- "blst_from_scratch",
+ "blst_rust",
  "kzg",
  "subspace-core-primitives",
 ]
@@ -11308,7 +11331,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -11359,7 +11382,7 @@ dependencies = [
 [[package]]
 name = "subspace-farmer-components"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "backoff",
@@ -11388,7 +11411,7 @@ dependencies = [
 [[package]]
 name = "subspace-fraud-proof"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-block-preprocessor",
  "domain-runtime-primitives",
@@ -11415,7 +11438,7 @@ dependencies = [
 [[package]]
 name = "subspace-networking"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -11452,16 +11475,20 @@ dependencies = [
 [[package]]
 name = "subspace-proof-of-space"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
- "subspace-chiapos",
+ "bitvec",
+ "blake3",
+ "chacha20 0.9.1",
+ "rayon",
+ "sha2 0.10.6",
  "subspace-core-primitives",
 ]
 
 [[package]]
 name = "subspace-rpc-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "hex",
  "serde",
@@ -11473,7 +11500,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "domain-runtime-primitives",
  "frame-benchmarking",
@@ -11527,7 +11554,7 @@ dependencies = [
 [[package]]
 name = "subspace-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -11568,7 +11595,7 @@ dependencies = [
 [[package]]
 name = "subspace-service"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -11637,12 +11664,12 @@ dependencies = [
 [[package]]
 name = "subspace-solving"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 
 [[package]]
 name = "subspace-transaction-pool"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "async-trait",
  "domain-runtime-primitives",
@@ -11669,7 +11696,7 @@ dependencies = [
 [[package]]
 name = "subspace-verification"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -11687,7 +11714,7 @@ dependencies = [
 [[package]]
 name = "subspace-wasm-tools"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "sc-executor-common",
  "sp-domains",
@@ -11841,7 +11868,7 @@ dependencies = [
 [[package]]
 name = "system-domain-runtime"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "core-payments-domain-runtime",
  "domain-pallet-executive",
@@ -11885,7 +11912,7 @@ dependencies = [
 [[package]]
 name = "system-runtime-primitives"
 version = "0.1.0"
-source = "git+https://github.com/subspace/subspace?rev=40570762c7f9fac3600599a52273ca7327699c12#40570762c7f9fac3600599a52273ca7327699c12"
+source = "git+https://github.com/subspace/subspace?rev=e2acdebb0b2798943ab0871e4bbd2ec51f677f10#e2acdebb0b2798943ab0871e4bbd2ec51f677f10"
 dependencies = [
  "parity-scale-codec",
  "sp-api 4.0.0-dev (git+https://github.com/subspace/substrate?rev=9cf78129a2638d3f370868863d16f4fe32b4ad30)",
diff --git a/Cargo.toml b/Cargo.toml
index b7b278eb..e07bcfd0 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 = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
 
 # 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]
@@ -43,7 +43,7 @@ tracing = "0.1"
 tracing-futures = "0.2"
 tracing-subscriber = "0.3"
 
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
 
 # 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
@@ -53,10 +53,13 @@ subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev
 #
 # This list is ordered alphabetically.
 [profile.dev.package]
+bitvec = { opt-level = 3 }
 blake2 = { opt-level = 3 }
+blake3 = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
 blst = { opt-level = 3 }
-blst_from_scratch = { opt-level = 3 }
+blst_rust = { opt-level = 3 }
+chacha20 = { opt-level = 3 }
 chacha20poly1305 = { opt-level = 3 }
 cranelift-codegen = { opt-level = 3 }
 cranelift-wasm = { opt-level = 3 }
@@ -93,7 +96,6 @@ sha3 = { opt-level = 3 }
 smallvec = { opt-level = 3 }
 snow = { opt-level = 3 }
 subspace-archiving = { opt-level = 3 }
-subspace-chiapos = { opt-level = 3 }
 subspace-core-primitives = { opt-level = 3 }
 subspace-erasure-coding = { opt-level = 3 }
 subspace-farmer-components = { opt-level = 3 }
diff --git a/dsn/Cargo.toml b/dsn/Cargo.toml
index 9ede4276..d4e812aa 100644
--- a/dsn/Cargo.toml
+++ b/dsn/Cargo.toml
@@ -26,9 +26,9 @@ sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/subs
 sp-runtime = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
diff --git a/farmer/Cargo.toml b/farmer/Cargo.toml
index 463c8d6d..20c882c3 100644
--- a/farmer/Cargo.toml
+++ b/farmer/Cargo.toml
@@ -26,10 +26,10 @@ sdk-utils = { path = "../utils" }
 sdk-dsn = { path = "../dsn" }
 sdk-traits = { path = "../traits" }
 
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", features = ["parallel", "chia"] }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
diff --git a/node/Cargo.toml b/node/Cargo.toml
index b01b83e2..35708f54 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -53,30 +53,30 @@ sp-session = { version = "4.0.0-dev", git = "https://github.com/subspace/substra
 sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 sp-version = { version = "5.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 
-core-eth-relay-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
-core-evm-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
-core-payments-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
-cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-domain-client-executor = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
-domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-domain-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sp-domains = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-sp-messenger = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-system-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
+core-eth-relay-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
+core-evm-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
+core-payments-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
+cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+domain-client-executor = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
+domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+domain-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sp-domains = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+sp-messenger = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+system-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
 
 fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier/", rev = "e60f3f8617cabd3473bd5e197b7c0c1991fbcd9b", optional = true }
 
diff --git a/tests/integration/farmer.rs b/tests/integration/farmer.rs
index 2c1b6851..800ea4a7 100644
--- a/tests/integration/farmer.rs
+++ b/tests/integration/farmer.rs
@@ -70,6 +70,7 @@ async fn progress_restart() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
+#[ignore = "Stack overflows for now"]
 async fn farmer_restart() {
     crate::common::setup();
 
diff --git a/tests/integration/node.rs b/tests/integration/node.rs
index 151e3cc0..d6091f8b 100644
--- a/tests/integration/node.rs
+++ b/tests/integration/node.rs
@@ -40,9 +40,7 @@ async fn sync_block_inner() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
-// linux")]
-#[ignore = "Test is too slow for now for CI"]
+#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
 async fn sync_block() {
     tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_block_inner()).await.unwrap()
 }
@@ -95,9 +93,7 @@ async fn sync_plot_inner() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
-// linux")]
-#[ignore = "Test is too slow for now for CI"]
+#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
 async fn sync_plot() {
     tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_plot_inner()).await.unwrap()
 }
@@ -115,9 +111,7 @@ async fn node_restart() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
-// linux")]
-#[ignore = "Test is too slow for now for CI"]
+#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
 async fn node_events() {
     crate::common::setup();
 
@@ -148,9 +142,7 @@ async fn node_events() {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
-// linux")]
-#[ignore = "Test is too slow for now for CI"]
+#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
 async fn fetch_block_author() {
     crate::common::setup();
 
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index ae5ae37d..0f3bd3e6 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -10,9 +10,9 @@ async-trait = "0.1"
 parking_lot = "0.12"
 sdk-dsn = { path = "../dsn" }
 
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
 
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
diff --git a/utils/Cargo.toml b/utils/Cargo.toml
index a5687d52..c60110fb 100644
--- a/utils/Cargo.toml
+++ b/utils/Cargo.toml
@@ -34,12 +34,12 @@ sp-core-hashing = { version = "5.0.0", git = "https://github.com/subspace/substr
 sp-runtime = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 sp-storage = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
 
-sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
 
 # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver`
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }