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

Commit

Permalink
import autonomys/subspace#1671 autonomys/subspace#1657 autonomys/subs…
Browse files Browse the repository at this point in the history 
…pace#1650 autonomys/subspace#1672
  • Loading branch information
@ParthDesai
ParthDesai committed Aug 15, 2023
1 parent 090a508 commit 51fab17
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 78 deletions.
81 changes: 41 additions & 40 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 @@ -12,7 +12,7 @@ sdk-dsn = { path = "dsn" }
sdk-substrate = { path = "substrate" }
sdk-farmer = { path = "farmer" }

subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }

# 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 @@ -35,7 +35,7 @@ tracing = "0.1"
tracing-futures = "0.2"
tracing-subscriber = "0.3"

subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }

# The list of dependencies below (which can be both direct and indirect dependencies) are crates
# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
Expand Down
12 changes: 6 additions & 6 deletions dsn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/subs
sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }

subspace-networking = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
14 changes: 7 additions & 7 deletions farmer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ sdk-utils = { path = "../utils" }
sdk-dsn = { path = "../dsn" }
sdk-traits = { path = "../traits" }

subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4", features = ["parallel", "chia"] }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
27 changes: 14 additions & 13 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,17 @@ sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", r
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" }

pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
2 changes: 1 addition & 1 deletion node/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
// )
// /// Otherwise we only use the default Substrate host functions.
// #[cfg(not(feature = "runtime-benchmarks"))]
type ExtendHostFunctions = sp_consensus_subspace::consensus::HostFunctions;
type ExtendHostFunctions = (sp_consensus_subspace::consensus::HostFunctions, sp_domains::domain::HostFunctions);

fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
subspace_runtime::api::dispatch(method, data)
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 @@ -10,8 +10,8 @@ async-trait = "0.1"
parking_lot = "0.12"
sdk-dsn = { path = "../dsn" }

subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }

sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
12 changes: 6 additions & 6 deletions utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ sp-core-hashing = { version = "9.0.0", git = "https://github.com/subspace/substr
sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }
sp-storage = { version = "13.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71" }

sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }

# Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver`
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "5e9d36af4bc18e89631375d3ecb5b1cbe4171109" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "dca2fdde6f0cf440a79f9f0cbaae8e6146801ca4" }

0 comments on commit 51fab17

Please sign in to comment.