Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Merge pull request #220 from subspace/oct-1-update
Browse files Browse the repository at this point in the history 
Update sdk with gemini-3f-2023-oct-1 monorepo snapshot
  • Loading branch information
@ParthDesai
ParthDesai authored Oct 2, 2023
2 parents d1ecb61 + 8b51263 commit ed2d5ae
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 96 deletions.
104 changes: 52 additions & 52 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }

# 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]
Expand All @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
tempfile = "3"
tokio = { version = "1.26", features = ["rt-multi-thread", "macros"] }
tracing = "0.1"
Expand Down
6 changes: 3 additions & 3 deletions dsn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
tracing = "0.1"

[features]
Expand Down
14 changes: 7 additions & 7 deletions farmer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ rayon = "1.7.0"
sdk-traits = { path = "../traits" }
sdk-utils = { path = "../utils" }
serde = { version = "1", features = ["derive"] }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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"] }
Expand Down
6 changes: 5 additions & 1 deletion farmer/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use subspace_farmer::single_disk_farm::{
use subspace_farmer::utils::farmer_piece_getter::FarmerPieceGetter;
use subspace_farmer::utils::piece_validator::SegmentCommitmentPieceValidator;
use subspace_farmer::utils::readers_and_pieces::ReadersAndPieces;
use subspace_farmer::utils::tokio_rayon_spawn_handler;
use subspace_farmer::Identity;
use subspace_farmer_components::plotting::PlottedSector;
use subspace_farmer_components::sector::{sector_size, SectorMetadataChecksummed};
Expand Down Expand Up @@ -181,7 +182,7 @@ mod builder {
#[builder(default = "available_parallelism()")]
pub plotting_thread_pool_size: usize,
/// Replotting thread pool size
#[builder(default = "available_parallelism()")]
#[builder(default = "available_parallelism() / 2")]
pub replotting_thread_pool_size: usize,
}

Expand Down Expand Up @@ -453,18 +454,21 @@ impl Config {
ThreadPoolBuilder::new()
.thread_name(move |thread_index| format!("farming#{thread_index}"))
.num_threads(farming_thread_pool_size)
.spawn_handler(tokio_rayon_spawn_handler())
.build()?,
);
let plotting_thread_pool = Arc::new(
ThreadPoolBuilder::new()
.thread_name(move |thread_index| format!("plotting#{thread_index}"))
.num_threads(plotting_thread_pool_size)
.spawn_handler(tokio_rayon_spawn_handler())
.build()?,
);
let replotting_thread_pool = Arc::new(
ThreadPoolBuilder::new()
.thread_name(move |thread_index| format!("replotting#{thread_index}"))
.num_threads(replotting_thread_pool_size)
.spawn_handler(tokio_rayon_spawn_handler())
.build()?,
);

Expand Down
44 changes: 22 additions & 22 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@ edition = "2021"
[dependencies]
anyhow = "1"
backoff = "0.4"
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
derivative = "2.2.0"
derive_builder = "0.12"
derive_more = "0.99"
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sc-proof-of-time = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
sdk-dsn = { path = "../dsn" }
sdk-substrate = { path = "../substrate" }
Expand All @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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"
Expand Down
6 changes: 3 additions & 3 deletions traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }

[features]
default = []
Expand Down
12 changes: 6 additions & 6 deletions utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
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 }
Expand All @@ -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 = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "d3914a13ea2d5a476b9b93749416ae960f2d105a" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "346bcabcec760ce25fec22bbaa69e06c51d9105c" }
thiserror = "1"
tokio = { version = "1.28.2", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] }
tracing = "0.1"
Expand Down

0 comments on commit ed2d5ae

Please sign in to comment.