From f89d9247762a7abf3dd45f22d73565d3a3f4ef6b Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Wed, 20 Dec 2023 21:43:58 +0200 Subject: [PATCH] Upgrade Subspace to the latest release --- Cargo.lock | 78 +++++++++++++++++++++---------------------- Cargo.toml | 26 +++++++-------- src/backend/farmer.rs | 6 +++- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53211b2a..8dd491f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1954,7 +1954,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "futures", "parity-scale-codec", @@ -2565,7 +2565,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2591,7 +2591,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "parity-scale-codec", "scale-info", @@ -6679,7 +6679,7 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "frame-system", @@ -6753,7 +6753,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -6777,7 +6777,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-benchmarking", "frame-support", @@ -6796,7 +6796,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "frame-system", @@ -6810,7 +6810,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "frame-system", @@ -6822,7 +6822,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "frame-system", @@ -6835,7 +6835,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-benchmarking", "frame-support", @@ -6893,7 +6893,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "frame-system", @@ -6949,7 +6949,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -8546,7 +8546,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-trait", "futures", @@ -8586,7 +8586,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-oneshot", "futures", @@ -8903,7 +8903,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "atomic", "core_affinity", @@ -9123,7 +9123,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-channel", "async-trait", @@ -9148,7 +9148,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "sc-chain-spec", "sc-service", @@ -9959,7 +9959,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-trait", "log", @@ -10074,7 +10074,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10083,7 +10083,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "blake2", "domain-runtime-primitives", @@ -10114,7 +10114,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -10146,7 +10146,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-trait", "parity-scale-codec", @@ -10238,7 +10238,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "frame-support", "hash-db", @@ -10268,7 +10268,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "sp-api", "sp-std", @@ -10580,7 +10580,7 @@ dependencies = [ [[package]] name = "space-acres" -version = "0.0.9" +version = "0.0.10" dependencies = [ "anyhow", "arc-swap", @@ -10788,7 +10788,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "parity-scale-codec", "rayon", @@ -10801,7 +10801,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "blake3", "derive_more", @@ -10824,7 +10824,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "kzg", "rust-kzg-blst", @@ -10834,7 +10834,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -10887,7 +10887,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-lock 2.8.0", "async-trait", @@ -10917,7 +10917,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "actix-web", "parking_lot 0.12.1", @@ -10929,7 +10929,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "actix-web", "async-mutex", @@ -10968,7 +10968,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "chacha20", "derive_more", @@ -10981,7 +10981,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "aes 0.8.3", "subspace-core-primitives", @@ -10991,7 +10991,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "hex", "serde", @@ -11003,7 +11003,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11055,7 +11055,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "pallet-transaction-payment", "serde", @@ -11068,7 +11068,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "async-trait", "atomic", @@ -11138,7 +11138,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=309a07ddae9369f2a37997e78ddcea40aea025f0#309a07ddae9369f2a37997e78ddcea40aea025f0" +source = "git+https://github.com/subspace/subspace?rev=1b8b5f310685a9cc0ef8192042257435ace285af#1b8b5f310685a9cc0ef8192042257435ace285af" dependencies = [ "parity-scale-codec", "schnorrkel", diff --git a/Cargo.toml b/Cargo.toml index 207da512..3378ee13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "space-acres" description = "Space Acres is an opinionated unofficial GUI application for farming on Subspace Network" license = "0BSD" -version = "0.0.9" +version = "0.0.10" authors = ["Nazar Mokrynskyi "] repository = "https://github.com/nazar-pc/space-acres" edition = "2021" @@ -59,22 +59,22 @@ sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } serde = { version = "1.0.193", features = ["derive"]} serde_json = "1.0.108" sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "309a07ddae9369f2a37997e78ddcea40aea025f0" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "1b8b5f310685a9cc0ef8192042257435ace285af" } supports-color = "2.0.0" thiserror = "1.0.50" tokio = { version = "1.34.0", features = ["fs", "time"] } diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs index 270f3cd2..2d97d2ba 100644 --- a/src/backend/farmer.rs +++ b/src/backend/farmer.rs @@ -147,6 +147,10 @@ fn available_parallelism() -> usize { } } +fn should_farm_during_initial_plotting() -> bool { + available_parallelism() > 8 +} + #[derive(Debug, Clone)] pub struct DiskFarm { pub directory: PathBuf, @@ -197,7 +201,7 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu let sector_downloading_concurrency = NonZeroUsize::new(2).expect("Not zero; qed"); let sector_encoding_concurrency = NonZeroUsize::new(1).expect("Not zero; qed"); - let farm_during_initial_plotting = false; + let farm_during_initial_plotting = should_farm_during_initial_plotting(); let available_parallelism = available_parallelism(); let farming_thread_pool_size = available_parallelism; let plotting_thread_pool_size = available_parallelism;