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 #222 from subspace/update-oct-4
Browse files Browse the repository at this point in the history 
Update sdk with monorepo snapshot gemini-3f-2023-oct-4
  • Loading branch information
@ParthDesai
ParthDesai authored Oct 4, 2023
2 parents 605c2dd + 5aabc18 commit 5c66ede
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 107 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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }

# 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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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
16 changes: 4 additions & 12 deletions farmer/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,6 @@ impl Config {
Some(m) => m,
None => farmer_app_info.protocol_info.max_pieces_in_sector,
};

let farming_thread_pool = Arc::new(
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}"))
Expand All @@ -483,7 +475,7 @@ impl Config {
description,
kzg: kzg.clone(),
erasure_coding: erasure_coding.clone(),
farming_thread_pool: farming_thread_pool.clone(),
farming_thread_pool_size,
plotting_thread_pool: plotting_thread_pool.clone(),
replotting_thread_pool: replotting_thread_pool.clone(),
})
Expand Down Expand Up @@ -774,7 +766,7 @@ struct FarmOptions<'a, PG, N: sdk_traits::Node> {
pub kzg: kzg::Kzg,
pub erasure_coding: ErasureCoding,
pub max_pieces_in_sector: u16,
pub farming_thread_pool: Arc<ThreadPool>,
pub farming_thread_pool_size: usize,
pub plotting_thread_pool: Arc<ThreadPool>,
pub replotting_thread_pool: Arc<ThreadPool>,
}
Expand All @@ -791,7 +783,7 @@ impl<T: subspace_proof_of_space::Table> Farm<T> {
kzg,
erasure_coding,
max_pieces_in_sector,
farming_thread_pool,
farming_thread_pool_size,
plotting_thread_pool,
replotting_thread_pool,
}: FarmOptions<
Expand All @@ -816,7 +808,7 @@ impl<T: subspace_proof_of_space::Table> Farm<T> {
erasure_coding,
piece_getter,
cache_percentage,
farming_thread_pool,
farming_thread_pool_size,
plotting_thread_pool,
replotting_thread_pool,
};
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
derivative = "2.2.0"
derive_builder = "0.12"
derive_more = "0.99"
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sc-proof-of-time = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }

[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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "28d4693dace02eab10da69fdfd0d650ea28ff098" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "7b120feb0b5976803cde8843cdb9ed185c7ec0ec" }
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 5c66ede

Please sign in to comment.