Merge pull request #215 from subspace/sync-with-sep-13-2

Update the sdk with gemini-3f-2023-sep-13-2 snapshot

Cargo.toml

@@ -11,7 +11,7 @@ sdk-substrate = { path = "substrate" }
 sdk-utils = { path = "utils" }
 static_assertions = "1.1.0"
 
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 
 # 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]
@@ -28,7 +28,7 @@ derive_more = "0.99"
 fdlimit = "0.2"
 futures = "0.3"
 serde_json = "1"
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 tempfile = "3"
 tokio = { version = "1.26", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1"

dsn/Cargo.toml

@@ -13,13 +13,13 @@ futures = "0.3"
 hex = "0.4.3"
 parking_lot = "0.12"
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sdk-utils = { path = "../utils" }
 serde = { version = "1", features = ["derive"] }
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 tracing = "0.1"
 
 [features]

farmer/Cargo.toml

@@ -18,13 +18,13 @@ pin-project = "1"
 sdk-traits = { path = "../traits" }
 sdk-utils = { path = "../utils" }
 serde = { version = "1", features = ["derive"] }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4", features = ["parallel", "chia"] }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff", features = ["parallel", "chia"] }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 thiserror = "1"
 tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
 tokio-stream = { version = "0.1", features = ["sync", "time"] }

node/Cargo.toml

@@ -7,36 +7,36 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 backoff = "0.4"
-cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 derivative = "2.2.0"
 derive_builder = "0.12"
 derive_more = "0.99"
-domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-domain-service = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+domain-service = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "74483666645e121c0c5e6616f43fdfd8664ea0d3" }
 frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 futures = "0.3"
 hex-literal = "0.4"
 once_cell = "1.18.0"
-pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 parity-scale-codec = "3.6.3"
 parking_lot = "0.12"
 pin-project = "1"
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-sc-proof-of-time = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sc-proof-of-time = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", default-features = false }
 sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", default-features = false }
-sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sdk-dsn = { path = "../dsn" }
 sdk-substrate = { path = "../substrate" }
@@ -46,20 +46,20 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
-sp-domains = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-sp-messenger = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sp-domains = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+sp-messenger = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 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" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-networking = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-service = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-networking = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-service = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
 tokio-stream = { version = "0.1", features = ["sync", "time"] }
 tracing = "0.1"

node/src/builder.rs

@@ -53,6 +53,10 @@ pub struct Config<F: Farmer> {
     #[builder(default)]
     #[serde(default, skip_serializing_if = "sdk_utils::is_default")]
     pub sync_from_dsn: bool,
+    /// DSN Sync parallelism level
+    #[builder(default)]
+    #[serde(default, skip_serializing_if = "sdk_utils::is_default")]
+    pub dsn_sync_parallelism_level: usize,
     #[doc(hidden)]
     #[builder(
         setter(into, strip_option),
@@ -107,6 +111,7 @@ impl<F: Farmer + 'static> Builder<F> {
             .dsn(DsnBuilder::dev())
             .rpc(RpcBuilder::dev())
             .offchain_worker(OffchainWorkerBuilder::dev())
+            .dsn_sync_parallelism_level(5)
     }
 
     /// Gemini 3f configuration
@@ -120,6 +125,7 @@ impl<F: Farmer + 'static> Builder<F> {
             .role(Role::Authority)
             .state_pruning(PruningMode::ArchiveAll)
             .blocks_pruning(BlocksPruning::Some(256))
+            .dsn_sync_parallelism_level(5)
     }
 
     /// Devnet chain configuration
@@ -133,6 +139,7 @@ impl<F: Farmer + 'static> Builder<F> {
             .role(Role::Authority)
             .state_pruning(PruningMode::ArchiveAll)
             .blocks_pruning(BlocksPruning::Some(256))
+            .dsn_sync_parallelism_level(5)
     }
 
     /// Get configuration for saving on disk

node/src/lib.rs

@@ -81,7 +81,13 @@ impl<F: Farmer + 'static> Config<F> {
         pot_configuration: PotConfiguration,
     ) -> anyhow::Result<Node<F>> {
         let Self {
-            base, mut dsn, sync_from_dsn, storage_monitor, enable_subspace_block_relay, ..
+            base,
+            mut dsn,
+            sync_from_dsn,
+            storage_monitor,
+            enable_subspace_block_relay,
+            dsn_sync_parallelism_level,
+            ..
         } = self;
 
         let PotConfiguration { is_pot_enabled, is_node_time_keeper } = pot_configuration;
@@ -163,6 +169,7 @@ impl<F: Farmer + 'static> Config<F> {
             subspace_networking,
             sync_from_dsn,
             enable_subspace_block_relay,
+            dsn_sync_parallelism_level,
         };
 
         let node_runner_future = subspace_farmer::utils::run_future_in_dedicated_thread(

traits/Cargo.toml

@@ -9,9 +9,9 @@ async-trait = "0.1"
 parking_lot = "0.12"
 sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 sdk-dsn = { path = "../dsn" }
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 
 [features]
 default = []

utils/Cargo.toml

@@ -19,7 +19,7 @@ futures = "0.3"
 jsonrpsee-core = "0.16"
 libp2p-core = "0.40.0"
 parity-scale-codec = "3.6.3"
-sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", default-features = false }
 sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", default-features = false }
 sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", default-features = false }
@@ -31,11 +31,11 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate"
 sp-storage = { version = "13.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
 ss58-registry = "1.33"
 # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver`
-subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
-subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "35ea647d290a051cbc63c289e8506e6b733536b4" }
+subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
+subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "303e99e57b0938082542a1a59f1cc2f875016aff" }
 thiserror = "1"
 tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
 tracing = "0.1"