From ccd257cfb30623bbe547921d662d113009bf2c0b Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Wed, 4 Dec 2024 09:32:49 +0200 Subject: [PATCH] Update Subspace to the latest `main` revision --- Cargo.lock | 76 +++++++++++++++++++++---------------------- Cargo.toml | 34 +++++++++---------- src/backend/farmer.rs | 14 +++----- src/backend/node.rs | 4 +-- 4 files changed, 60 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 98fc426..6c39007 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2056,7 +2056,7 @@ checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "domain-block-preprocessor", "fp-account", @@ -2575,7 +2575,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2608,7 +2608,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "fp-account", "frame-support", @@ -9896,7 +9896,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "futures", @@ -9937,7 +9937,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-oneshot", "futures", @@ -9972,7 +9972,7 @@ dependencies = [ [[package]] name = "sc-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "sc-client-api", "sc-executor", @@ -10333,7 +10333,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "core_affinity", "derive_more 1.0.0", @@ -10568,7 +10568,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -10594,12 +10594,12 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" [[package]] name = "sc-subspace-sync-common" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "array-bytes", "futures", @@ -11312,7 +11312,7 @@ dependencies = [ [[package]] name = "sp-auto-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "parity-scale-codec", "scale-info", @@ -11336,7 +11336,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -11431,7 +11431,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "log", @@ -11547,7 +11547,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -11556,7 +11556,7 @@ dependencies = [ [[package]] name = "sp-domain-sudo" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "parity-scale-codec", @@ -11567,7 +11567,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -11599,7 +11599,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -11634,7 +11634,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "parity-scale-codec", @@ -11725,7 +11725,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-trait", "frame-support", @@ -11747,7 +11747,7 @@ dependencies = [ [[package]] name = "sp-messenger-host-functions" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "domain-block-preprocessor", "parity-scale-codec", @@ -11804,7 +11804,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "sp-api", "subspace-core-primitives", @@ -11990,7 +11990,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "parity-scale-codec", "scale-info", @@ -12379,7 +12379,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "parity-scale-codec", "rayon", @@ -12393,7 +12393,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "blake3", "bytes", @@ -12412,7 +12412,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "kzg", "rust-kzg-blst", @@ -12423,7 +12423,7 @@ dependencies = [ [[package]] name = "subspace-fake-runtime-api" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "domain-runtime-primitives", "frame-support", @@ -12455,7 +12455,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "anyhow", "async-lock", @@ -12510,7 +12510,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "anyhow", "async-lock", @@ -12543,7 +12543,7 @@ dependencies = [ [[package]] name = "subspace-kzg" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "derive_more 1.0.0", "kzg", @@ -12558,7 +12558,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "actix-web", "prometheus", @@ -12569,7 +12569,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "async-lock", "async-trait", @@ -12608,7 +12608,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "chacha20", "derive_more 1.0.0", @@ -12624,7 +12624,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space-gpu" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "blst", "cc", @@ -12637,7 +12637,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "aes 0.9.0-pre.2", "subspace-core-primitives", @@ -12647,7 +12647,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "hex", "parity-scale-codec", @@ -12660,7 +12660,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "frame-support", "frame-system", @@ -12676,7 +12676,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "array-bytes", "async-channel 1.9.0", @@ -12762,7 +12762,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=16118dab78eb73bbc9601edae708ce7702f2155c#16118dab78eb73bbc9601edae708ce7702f2155c" +source = "git+https://github.com/subspace/subspace?rev=bdf31b82954f267b7e2815a0e833f45d7d41021c#bdf31b82954f267b7e2815a0e833f45d7d41021c" dependencies = [ "parity-scale-codec", "schnorrkel", diff --git a/Cargo.toml b/Cargo.toml index 7acb538..acaa468 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,13 +72,13 @@ reqwest = { version = "0.12.8", default-features = false, features = ["json", "r sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-network-types = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } schnellru = "0.2.3" semver = "1.0.23" @@ -87,23 +87,23 @@ serde_json = "1.0.132" simple_moving_average = "1.0.2" sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } -sp-objects = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } +sp-objects = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "94a1a8143a89bbe9f938c1939ff68abc1519a305", default-features = false } -subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-kzg = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-proof-of-space-gpu = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c", optional = true } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "16118dab78eb73bbc9601edae708ce7702f2155c" } +subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-kzg = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-proof-of-space-gpu = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c", optional = true } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "bdf31b82954f267b7e2815a0e833f45d7d41021c" } supports-color = "3.0.1" sys-locale = "0.3.1" tempfile = "3.13.0" diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs index 33df233..e07a581 100644 --- a/src/backend/farmer.rs +++ b/src/backend/farmer.rs @@ -43,9 +43,10 @@ use subspace_farmer::utils::{ run_future_in_dedicated_thread, thread_pool_core_indices, AsyncJoinOnDrop, }; use subspace_farmer_components::plotting::PlottedSector; +use subspace_farmer_components::reading::ReadSectorRecordChunksMode; use subspace_kzg::Kzg; use thread_priority::ThreadPriority; -use tokio::sync::{watch, Barrier}; +use tokio::sync::watch; use tracing::{debug, error, info, info_span, Instrument}; /// Minimal cache percentage, there is no need in setting it higher @@ -409,8 +410,6 @@ where let (farms, plotting_delay_senders) = { let farms_total = disk_farms.len(); let info_mutex = &AsyncMutex::new(()); - let faster_read_sector_record_chunks_mode_barrier = Arc::new(Barrier::new(farms_total)); - let faster_read_sector_record_chunks_mode_concurrency = Arc::new(Semaphore::new(1)); let (plotting_delay_senders, plotting_delay_receivers) = (0..farms_total) .map(|_| oneshot::channel()) .unzip::<_, _, Vec<_>, Vec<_>>(); @@ -429,10 +428,6 @@ where let erasure_coding = erasure_coding.clone(); let plotter = Arc::clone(&plotter); let global_mutex = Arc::clone(&global_mutex); - let faster_read_sector_record_chunks_mode_barrier = - Arc::clone(&faster_read_sector_record_chunks_mode_barrier); - let faster_read_sector_record_chunks_mode_concurrency = - Arc::clone(&faster_read_sector_record_chunks_mode_concurrency); async move { let farm_fut = SingleDiskFarm::new::<_, PosTable>( @@ -452,9 +447,8 @@ where global_mutex, max_plotting_sectors_per_farm: MAX_PLOTTING_SECTORS_PER_FARM, disable_farm_locking: false, - read_sector_record_chunks_mode: None, - faster_read_sector_record_chunks_mode_barrier, - faster_read_sector_record_chunks_mode_concurrency, + read_sector_record_chunks_mode: + ReadSectorRecordChunksMode::ConcurrentChunks, registry: None, create: true, }, diff --git a/src/backend/node.rs b/src/backend/node.rs index 5689b94..e6a4083 100644 --- a/src/backend/node.rs +++ b/src/backend/node.rs @@ -517,10 +517,8 @@ pub(super) async fn create_consensus_node( subspace_networking: SubspaceNetworking::Reuse { node, bootstrap_nodes: dsn_bootstrap_nodes, - // This will not be used since we provide piece getter explicitly below - max_connections: 0, + piece_getter, }, - dsn_piece_getter: Some(piece_getter), is_timekeeper: false, timekeeper_cpu_cores: Default::default(), sync,