From 1e2f086464c1568a4bc68078025ea99bf5175e50 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Fri, 1 Oct 2021 08:00:28 +0800 Subject: [PATCH 1/8] Pure reorder of the dependencies in Cargo.toml Ref https://github.com/subspace/subspace/issues/44#issuecomment-931778280 --- Cargo.toml | 2 +- crates/pallet-feeds/Cargo.toml | 22 ++++---- crates/pallet-offences-poc/Cargo.toml | 10 ++-- crates/pallet-spartan/Cargo.toml | 34 ++++++------ crates/sc-consensus-poc-rpc/Cargo.toml | 21 ++++---- crates/sc-consensus-poc/Cargo.toml | 44 +++++++++------- crates/sp-consensus-poc/Cargo.toml | 19 ++++--- crates/sp-consensus-spartan/Cargo.toml | 2 + crates/spartan-farmer/Cargo.toml | 29 +++-------- crates/subspace-archiving/Cargo.toml | 26 ++-------- crates/subspace-codec/Cargo.toml | 4 +- crates/subspace-core-primitives/Cargo.toml | 23 ++------- node-template-spartan/node/Cargo.toml | 26 ++++++---- node-template-spartan/runtime/Cargo.toml | 60 ++++++++++++---------- 14 files changed, 152 insertions(+), 170 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d6dcb3b81c..03a4a39342 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [workspace] resolver = "2" members = [ + "crates/*", "node-template-spartan/node", "node-template-spartan/runtime", - "crates/*", "substrate/*", ] diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml index 536bcd032c..7c9bd7ad43 100644 --- a/crates/pallet-feeds/Cargo.toml +++ b/crates/pallet-feeds/Cargo.toml @@ -1,28 +1,30 @@ [package] -authors = ["Serge Kovbasiuk "] -description = "Subspace node pallet for interacting with storage" +name = "pallet-feeds" +version = "0.1.0" +authors = ["Subspace Labs "] edition = "2018" -homepage = "https://subspace.network" license = "Apache-2.0" -name = "pallet-feeds" -readme = "README.md" +homepage = "https://subspace.network" repository = "https://github.com/subspace/subspace" -version = "0.1.0" +description = "Subspace node pallet for interacting with storage" +readme = "README.md" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = {package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]} -frame-support = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -frame-system = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} log = {version = "0.4.14", default-features = false} scale-info = {version = "1.0", default-features = false, features = ["derive"]} + sp-core = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} sp-std = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} +frame-support = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} +frame-system = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} + [dev-dependencies] -serde = {version = "1.0.127"} +serde = "1.0.127" sp-io = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} sp-runtime = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} @@ -30,10 +32,10 @@ sp-runtime = {version = "4.0.0-dev", default-features = false, git = "https://gi default = ["std"] std = [ "codec/std", + "log/std", "scale-info/std", "sp-std/std", "frame-support/std", "frame-system/std", - "log/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-offences-poc/Cargo.toml b/crates/pallet-offences-poc/Cargo.toml index 57e81b5d2c..43b324b0f0 100644 --- a/crates/pallet-offences-poc/Cargo.toml +++ b/crates/pallet-offences-poc/Cargo.toml @@ -14,13 +14,17 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.14", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -log = { version = "0.4.14", default-features = false } + +# Subspace +sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } [dev-dependencies] sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } diff --git a/crates/pallet-spartan/Cargo.toml b/crates/pallet-spartan/Cargo.toml index 10a0fda14a..5a3a70adf4 100644 --- a/crates/pallet-spartan/Cargo.toml +++ b/crates/pallet-spartan/Cargo.toml @@ -14,44 +14,48 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +log = { version = "0.4.14", default-features = false } +num-traits = { version = "0.2.14", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } + +sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + +# Subspace sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } -sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-spartan = { version = "0.1.0", default-features = false, path = "../sp-consensus-spartan" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -log = { version = "0.4.14", default-features = false } -num-traits = { version = "0.2.14", default-features = false } subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } [dev-dependencies] +ring = "0.16" +schnorrkel = "0.9.1" +sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-balances = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-offences-poc = { version = "0.1.0", path = "../pallet-offences-poc" } -sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -schnorrkel = { version = "0.9.1" } -ring = "0.16" subspace-codec = { version = "0.1.0", path = "../subspace-codec" } [features] default = ["std"] std = [ "codec/std", + "log/std", + "num-traits/std", "scale-info/std", + "sp-consensus-slots/std", + "sp-io/std", + "sp-runtime/std", + "sp-std/std", "frame-support/std", "frame-system/std", "pallet-timestamp/std", "sp-consensus-poc/std", - "sp-consensus-slots/std", "sp-consensus-spartan/std", - "sp-io/std", - "sp-runtime/std", - "sp-std/std", - "log/std", - "num-traits/std", "subspace-core-primitives/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/sc-consensus-poc-rpc/Cargo.toml b/crates/sc-consensus-poc-rpc/Cargo.toml index 6f339a288a..d5f7f34b02 100644 --- a/crates/sc-consensus-poc-rpc/Cargo.toml +++ b/crates/sc-consensus-poc-rpc/Cargo.toml @@ -14,23 +14,24 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] async-oneshot = "0.5.0" -sc-consensus-poc = { version = "0.1.0", path = "../sc-consensus-poc" } -sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +futures = "0.3.17" +futures-timer = "3.0.2" jsonrpc-core = "18.0.0" jsonrpc-core-client = "18.0.0" jsonrpc-derive = "18.0.0" jsonrpc-pubsub = "18.0.0" -sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } -sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +log = "0.4.14" +parking_lot = "0.11.1" serde = { version = "1.0.127", features = ["derive"] } -futures = "0.3.17" -futures-timer = "3.0.2" + +sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } +sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -log = "0.4.14" -parking_lot = "0.11.1" -subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } -[dev-dependencies] +# Subspace +sc-consensus-poc = { version = "0.1.0", path = "../sc-consensus-poc" } +subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } diff --git a/crates/sc-consensus-poc/Cargo.toml b/crates/sc-consensus-poc/Cargo.toml index 249171c087..4adff5f943 100644 --- a/crates/sc-consensus-poc/Cargo.toml +++ b/crates/sc-consensus-poc/Cargo.toml @@ -14,48 +14,54 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] +async-trait = "0.1.51" codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } -sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +derive_more = "0.99.16" +futures = "0.3.16" +log = "0.4.14" +lru = { version = "0.6.6", default-features = false } +parking_lot = "0.11.1" +rand = "0.8.4" +ring = "0.16" +schnorrkel = "0.9.1" serde = { version = "1.0.127", features = ["derive"] } -sp-version = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + +# Substrate +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus-epochs = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-utils = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan" } -sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-version = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + fork-tree = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", version = "0.9.0"} -futures = "0.3.16" -parking_lot = "0.11.1" -log = "0.4.14" -schnorrkel = { version = "0.9.1" } -rand = "0.8.4" -derive_more = "0.99.16" -async-trait = "0.1.51" -lru = { version = "0.6.6", default-features = false } -ring = "0.16" + +# Subspace +sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } subspace-archiving = { version = "0.1.0", path = "../subspace-archiving" } subspace-codec = { version = "0.1.0", path = "../subspace-codec" } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } [dev-dependencies] +sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-tracing = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-network-test = { version = "0.8.0", path = "../../substrate/sc-network-test" } substrate-test-runtime = { version = "2.0.0", path = "../../substrate/substrate-test-runtime" } substrate-test-runtime-client = { version = "2.0.0", path = "../../substrate/substrate-test-runtime-client" } -sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } diff --git a/crates/sp-consensus-poc/Cargo.toml b/crates/sp-consensus-poc/Cargo.toml index bca18003ad..b6fd9f02b2 100644 --- a/crates/sp-consensus-poc/Cargo.toml +++ b/crates/sp-consensus-poc/Cargo.toml @@ -13,38 +13,41 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-application-crypto = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +async-trait = { version = "0.1.51", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +serde = { version = "1.0.127", features = ["derive"], optional = true } + sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-application-crypto = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", optional = true, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan", default-features = false } sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } -serde = { version = "1.0.127", features = ["derive"], optional = true } -async-trait = { version = "0.1.51", optional = true } + +# Subspace subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } [features] default = ["std"] std = [ - "sp-application-crypto/std", + "async-trait", "codec/std", "scale-info/std", - "sp-std/std", + "serde", "sp-api/std", + "sp-application-crypto/std", "sp-consensus", "sp-consensus-slots/std", "sp-consensus-spartan/std", "sp-core/std", "sp-inherents/std", "sp-runtime/std", - "serde", + "sp-std/std", "sp-timestamp", - "async-trait", "subspace-core-primitives/std", ] diff --git a/crates/sp-consensus-spartan/Cargo.toml b/crates/sp-consensus-spartan/Cargo.toml index 549c4fc7bc..f10bc31be0 100644 --- a/crates/sp-consensus-spartan/Cargo.toml +++ b/crates/sp-consensus-spartan/Cargo.toml @@ -14,6 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] ring = { version = "0.16.20", optional = true } + +# Subspace subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", optional = true} [features] diff --git a/crates/spartan-farmer/Cargo.toml b/crates/spartan-farmer/Cargo.toml index b60867222c..0da0363bd3 100644 --- a/crates/spartan-farmer/Cargo.toml +++ b/crates/spartan-farmer/Cargo.toml @@ -22,17 +22,18 @@ event-listener-primitives = "2.0.1" futures = "0.3.13" hex = "0.4.3" indicatif = "0.16.2" +jsonrpsee = { version = "0.3.1", features = ["client", "types"] } log = "0.4.14" rayon = "1.5.0" ring = "0.16.20" schnorrkel = "0.10.1" +serde = { version = "1.0.125", features = ["derive"] } serde_json = "1.0.64" thiserror = "1.0.24" tokio = "1.11.0" -[dependencies.jsonrpsee] -features = ["client", "types"] -version = "0.3.1" +subspace-codec = { version = "0.1.0", path = "../subspace-codec" } +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } [dependencies.rocksdb] # This disables compression algorithms that cause issues during linking due to @@ -42,29 +43,11 @@ default-features = false features = ["snappy"] version = "0.17.0" -[dependencies.serde] -features = ["derive"] -version = "1.0.125" - -[dependencies.subspace-codec] -version = "0.1.0" -path = "../subspace-codec" - -[dependencies.subspace-core-primitives] -version = "0.1.0" -path = "../subspace-core-primitives" - [dev-dependencies] +async-std = { version = "1.9.0", features = ["attributes"] } rand = "0.8.4" tempfile = "3.2.0" - -[dev-dependencies.async-std] -features = ["attributes"] -version = "1.9.0" - -[dev-dependencies.tokio] -features = ["macros"] -version = "1.11.0" +tokio = { version = "1.11.0", features = ["macros"] } [features] default = ["cuda"] diff --git a/crates/subspace-archiving/Cargo.toml b/crates/subspace-archiving/Cargo.toml index 7f3e81bb70..a07701a9d8 100644 --- a/crates/subspace-archiving/Cargo.toml +++ b/crates/subspace-archiving/Cargo.toml @@ -14,30 +14,14 @@ include = [ [dependencies] merkletree = "0.21.0" +parity-scale-codec = { version = "2.3.0", features = ["derive"], default-features = false } +rand = { version = "0.8.4", features = ["min_const_gen"] } +reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } +sha2 = { version = "0.9.8", default-features = false } thiserror = "1.0.29" typenum = "1.14.0" -[dependencies.parity-scale-codec] -default-features = false -features = ["derive"] -version = "2.3.0" - -[dependencies.reed-solomon-erasure] -features = ["simd-accel"] -version = "4.0.2" - -[dependencies.sha2] -default-features = false -version = "0.9.8" - -[dependencies.subspace-core-primitives] -default-features = false -version = "0.1.0" -path = "../subspace-core-primitives" - -[dev-dependencies.rand] -features = ["min_const_gen"] -version = "0.8.4" +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } # TODO: Nothing is exposed in no-std environment at the moment :( [features] diff --git a/crates/subspace-codec/Cargo.toml b/crates/subspace-codec/Cargo.toml index f362e7da2c..8b7383e67c 100644 --- a/crates/subspace-codec/Cargo.toml +++ b/crates/subspace-codec/Cargo.toml @@ -15,9 +15,7 @@ include = [ [dependencies] sloth256-189 = "0.2.2" -[dependencies.subspace-core-primitives] -version = "0.1.0" -path = "../subspace-core-primitives" +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } [dev-dependencies] rand = "0.8.4" diff --git a/crates/subspace-core-primitives/Cargo.toml b/crates/subspace-core-primitives/Cargo.toml index bb3a7dee8c..7c03e13701 100644 --- a/crates/subspace-core-primitives/Cargo.toml +++ b/crates/subspace-core-primitives/Cargo.toml @@ -12,24 +12,11 @@ include = [ "/README.md" ] -[dependencies.parity-scale-codec] -default-features = false -features = ["derive"] -version = "2.3.0" - -[dependencies.scale-info] -default-features = false -features = ["derive"] -version = "1.0" - -[dependencies.serde] -default-features = false -features = ["derive"] -version = "1.0.130" - -[dependencies.sha2] -default-features = false -version = "0.9.8" +[dependencies] +parity-scale-codec = { version = "2.3.0", default-features = false, features = ["derive"] } +scale-info = { version = "1.0", default-features = false, features = ["derive"] } +serde = { version = "1.0.130", default-features = false, features = ["derive"] } +sha2 = { version = "0.9.8", default-features = false } [features] default = ["std"] diff --git a/node-template-spartan/node/Cargo.toml b/node-template-spartan/node/Cargo.toml index 584c4e2252..407ff1ddad 100644 --- a/node-template-spartan/node/Cargo.toml +++ b/node-template-spartan/node/Cargo.toml @@ -19,32 +19,36 @@ name = "node-template-spartan" structopt = "0.3.22" sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } -sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } +sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } +sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } -sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } -sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } + +sp-authorship = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } +sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-authorship = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } # These dependencies are used for the node template's RPCs jsonrpc-core = "18.0.0" + sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + +sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } + substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } diff --git a/node-template-spartan/runtime/Cargo.toml b/node-template-spartan/runtime/Cargo.toml index cf248ef86c..193cf8268c 100644 --- a/node-template-spartan/runtime/Cargo.toml +++ b/node-template-spartan/runtime/Cargo.toml @@ -12,19 +12,9 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +hex-literal = { version = "0.3.3", optional = true } scale-info = { version = "1.0", default-features = false, features = ["derive"] } -pallet-feeds = { version = "0.1.0", default-features = false, path = "../../crates/pallet-feeds" } -pallet-spartan = { version = "0.1.0", default-features = false, path = "../../crates/pallet-spartan" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-executive = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-block-builder = { git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", default-features = false, version = "4.0.0-dev"} sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../../crates/sp-consensus-poc" } @@ -37,7 +27,16 @@ sp-session = { version = "4.0.0-dev", default-features = false, git = "https://g sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-transaction-pool = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-version = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../../crates/subspace-core-primitives" } + +frame-executive = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } +pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } # Used for the node template's RPCs frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -46,7 +45,11 @@ pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", default-fe # Used for runtime benchmarking frame-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } -hex-literal = { version = "0.3.3", optional = true } + +# Subspace +pallet-feeds = { version = "0.1.0", default-features = false, path = "../../crates/pallet-feeds" } +pallet-spartan = { version = "0.1.0", default-features = false, path = "../../crates/pallet-spartan" } +subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../../crates/subspace-core-primitives" } [build-dependencies] substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -56,19 +59,6 @@ default = ["std"] std = [ "codec/std", "scale-info/std", - "frame-executive/std", - "frame-support/std", - "frame-system-rpc-runtime-api/std", - "frame-system/std", - "pallet-feeds/std", - "pallet-spartan/std", - "pallet-balances/std", - "pallet-randomness-collective-flip/std", - "pallet-sudo/std", - "pallet-offences-poc/std", - "pallet-timestamp/std", - "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-transaction-payment/std", "sp-api/std", "sp-block-builder/std", "sp-consensus-poc/std", @@ -81,15 +71,29 @@ std = [ "sp-std/std", "sp-transaction-pool/std", "sp-version/std", + "frame-executive/std", + "frame-support/std", + "frame-system/std", + "frame-system-rpc-runtime-api/std", + "pallet-balances/std", + "pallet-randomness-collective-flip/std", + "pallet-sudo/std", + "pallet-offences-poc/std", + "pallet-timestamp/std", + "pallet-transaction-payment-rpc-runtime-api/std", + "pallet-transaction-payment/std", + # Subspace + "pallet-feeds/std", + "pallet-spartan/std", "subspace-core-primitives/std", ] runtime-benchmarks = [ + "hex-literal", + "sp-runtime/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system-benchmarking", "frame-system/runtime-benchmarks", - "hex-literal", "pallet-balances/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", - "sp-runtime/runtime-benchmarks", ] From decc65fdaec73416c51c7fe8b961a86f3fd66852 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Fri, 1 Oct 2021 08:14:47 +0800 Subject: [PATCH 2/8] Add missing `sp-core/std` And some other styling nits. --- crates/pallet-feeds/Cargo.toml | 1 + crates/pallet-offences-poc/Cargo.toml | 9 +++++---- crates/pallet-spartan/Cargo.toml | 1 + crates/sc-consensus-poc-rpc/Cargo.toml | 2 +- crates/sp-consensus-poc/Cargo.toml | 11 ++++++----- crates/sp-consensus-spartan/Cargo.toml | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml index 7c9bd7ad43..301daa3943 100644 --- a/crates/pallet-feeds/Cargo.toml +++ b/crates/pallet-feeds/Cargo.toml @@ -34,6 +34,7 @@ std = [ "codec/std", "log/std", "scale-info/std", + "sp-core/std", "sp-std/std", "frame-support/std", "frame-system/std", diff --git a/crates/pallet-offences-poc/Cargo.toml b/crates/pallet-offences-poc/Cargo.toml index 43b324b0f0..cd1a5a00b2 100644 --- a/crates/pallet-offences-poc/Cargo.toml +++ b/crates/pallet-offences-poc/Cargo.toml @@ -29,18 +29,19 @@ sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp- [dev-dependencies] sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -schnorrkel = { version = "0.10.1" } +schnorrkel = "0.10.1" [features] default = ["std"] std = [ "codec/std", + "log/std", "scale-info/std", - "sp-std/std", "sp-runtime/std", - "sp-consensus-poc/std", + "sp-std/std", "frame-support/std", "frame-system/std", - "log/std", + # Subspace + "sp-consensus-poc/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-spartan/Cargo.toml b/crates/pallet-spartan/Cargo.toml index 5a3a70adf4..dc665bc5b1 100644 --- a/crates/pallet-spartan/Cargo.toml +++ b/crates/pallet-spartan/Cargo.toml @@ -54,6 +54,7 @@ std = [ "frame-support/std", "frame-system/std", "pallet-timestamp/std", + # Subspace "sp-consensus-poc/std", "sp-consensus-spartan/std", "subspace-core-primitives/std", diff --git a/crates/sc-consensus-poc-rpc/Cargo.toml b/crates/sc-consensus-poc-rpc/Cargo.toml index d5f7f34b02..62db9c74f6 100644 --- a/crates/sc-consensus-poc-rpc/Cargo.toml +++ b/crates/sc-consensus-poc-rpc/Cargo.toml @@ -34,4 +34,4 @@ sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/subst # Subspace sc-consensus-poc = { version = "0.1.0", path = "../sc-consensus-poc" } -subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } diff --git a/crates/sp-consensus-poc/Cargo.toml b/crates/sp-consensus-poc/Cargo.toml index b6fd9f02b2..6fee85dd50 100644 --- a/crates/sp-consensus-poc/Cargo.toml +++ b/crates/sp-consensus-poc/Cargo.toml @@ -22,15 +22,15 @@ sp-api = { version = "4.0.0-dev", default-features = false, git = "https://githu sp-application-crypto = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", optional = true, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan", default-features = false } sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } +sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", default-features = false } # Subspace -subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } +sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan", default-features = false } +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } [features] default = ["std"] @@ -43,11 +43,12 @@ std = [ "sp-application-crypto/std", "sp-consensus", "sp-consensus-slots/std", - "sp-consensus-spartan/std", "sp-core/std", "sp-inherents/std", "sp-runtime/std", "sp-std/std", - "sp-timestamp", + "sp-timestamp/std", + # Subspace + "sp-consensus-spartan/std", "subspace-core-primitives/std", ] diff --git a/crates/sp-consensus-spartan/Cargo.toml b/crates/sp-consensus-spartan/Cargo.toml index f10bc31be0..02a751352b 100644 --- a/crates/sp-consensus-spartan/Cargo.toml +++ b/crates/sp-consensus-spartan/Cargo.toml @@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"] ring = { version = "0.16.20", optional = true } # Subspace -subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", optional = true} +subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } [features] default = ["std"] std = [ "ring/std", - "subspace-core-primitives" + "subspace-core-primitives/std" ] From 9acbe21d968c3118209f6d6bb08dcfd695eb2bff Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Fri, 1 Oct 2021 08:18:25 +0800 Subject: [PATCH 3/8] Move subspace-related to Subspace section --- node-template-spartan/node/Cargo.toml | 7 ++++--- node-template-spartan/runtime/Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/node-template-spartan/node/Cargo.toml b/node-template-spartan/node/Cargo.toml index 407ff1ddad..8261ede628 100644 --- a/node-template-spartan/node/Cargo.toml +++ b/node-template-spartan/node/Cargo.toml @@ -21,8 +21,6 @@ structopt = "0.3.22" sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } -sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } @@ -33,7 +31,6 @@ sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/par sp-authorship = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -56,6 +53,10 @@ pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github. frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +# Subspace +sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } +sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } +sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } node-template-spartan-runtime = { version = "0.1.0", path = "../runtime" } [build-dependencies] diff --git a/node-template-spartan/runtime/Cargo.toml b/node-template-spartan/runtime/Cargo.toml index 193cf8268c..3be7199509 100644 --- a/node-template-spartan/runtime/Cargo.toml +++ b/node-template-spartan/runtime/Cargo.toml @@ -32,7 +32,6 @@ frame-executive = { version = "4.0.0-dev", default-features = false, git = "http frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -48,6 +47,7 @@ frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, g # Subspace pallet-feeds = { version = "0.1.0", default-features = false, path = "../../crates/pallet-feeds" } +pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } pallet-spartan = { version = "0.1.0", default-features = false, path = "../../crates/pallet-spartan" } subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../../crates/subspace-core-primitives" } @@ -78,12 +78,12 @@ std = [ "pallet-balances/std", "pallet-randomness-collective-flip/std", "pallet-sudo/std", - "pallet-offences-poc/std", "pallet-timestamp/std", "pallet-transaction-payment-rpc-runtime-api/std", "pallet-transaction-payment/std", # Subspace "pallet-feeds/std", + "pallet-offences-poc/std", "pallet-spartan/std", "subspace-core-primitives/std", ] From 859cb64a5b2faea88c93731d6ded12c5f3afdb6b Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Fri, 1 Oct 2021 15:22:12 +0800 Subject: [PATCH 4/8] Revert authors --- crates/pallet-feeds/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml index 301daa3943..2be09fa8e2 100644 --- a/crates/pallet-feeds/Cargo.toml +++ b/crates/pallet-feeds/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pallet-feeds" version = "0.1.0" -authors = ["Subspace Labs "] +authors = ["Serge Kovbasiuk "] edition = "2018" license = "Apache-2.0" homepage = "https://subspace.network" From 8a8ddc68908a0955dfe15b6cfe02a4f3bc731999 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Fri, 1 Oct 2021 15:37:21 +0800 Subject: [PATCH 5/8] Fix merge --- crates/subspace-archiving/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/subspace-archiving/Cargo.toml b/crates/subspace-archiving/Cargo.toml index 8e616d8da1..83f5850345 100644 --- a/crates/subspace-archiving/Cargo.toml +++ b/crates/subspace-archiving/Cargo.toml @@ -15,8 +15,6 @@ include = [ [dependencies] merkletree = "0.21.0" parity-scale-codec = { version = "2.3.0", features = ["derive"], default-features = false } -reed-solomon-erasure = { version = "4.0.2", features = ["simd-accel"] } -sha2 = { version = "0.9.8", default-features = false } thiserror = "1.0.29" typenum = "1.14.0" From 0eb906543fd4d5e4e83c43e3a06967891100ce7a Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Sun, 3 Oct 2021 16:13:50 +0800 Subject: [PATCH 6/8] One section is enough --- crates/pallet-feeds/Cargo.toml | 10 ++++----- crates/pallet-offences-poc/Cargo.toml | 17 ++++++--------- crates/pallet-spartan/Cargo.toml | 29 +++++++++++--------------- crates/sc-consensus-poc-rpc/Cargo.toml | 7 ++----- crates/sc-consensus-poc/Cargo.toml | 14 ++++--------- crates/sp-consensus-poc/Cargo.toml | 8 ++----- crates/sp-consensus-spartan/Cargo.toml | 2 -- crates/spartan-farmer/Cargo.toml | 5 ++--- crates/subspace-archiving/Cargo.toml | 1 - crates/subspace-codec/Cargo.toml | 1 - 10 files changed, 32 insertions(+), 62 deletions(-) diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml index 2be09fa8e2..5a353acbc6 100644 --- a/crates/pallet-feeds/Cargo.toml +++ b/crates/pallet-feeds/Cargo.toml @@ -14,15 +14,13 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = {package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]} +frame-support = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} +frame-system = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} log = {version = "0.4.14", default-features = false} scale-info = {version = "1.0", default-features = false, features = ["derive"]} - sp-core = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} sp-std = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -frame-support = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -frame-system = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} - [dev-dependencies] serde = "1.0.127" sp-io = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} @@ -32,11 +30,11 @@ sp-runtime = {version = "4.0.0-dev", default-features = false, git = "https://gi default = ["std"] std = [ "codec/std", + "frame-support/std", + "frame-system/std", "log/std", "scale-info/std", "sp-core/std", "sp-std/std", - "frame-support/std", - "frame-system/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-offences-poc/Cargo.toml b/crates/pallet-offences-poc/Cargo.toml index cd1a5a00b2..f679a2fd42 100644 --- a/crates/pallet-offences-poc/Cargo.toml +++ b/crates/pallet-offences-poc/Cargo.toml @@ -14,18 +14,14 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } log = { version = "0.4.14", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } - +sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# Subspace -sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } - [dev-dependencies] sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -35,13 +31,12 @@ schnorrkel = "0.10.1" default = ["std"] std = [ "codec/std", + "frame-support/std", + "frame-system/std", "log/std", "scale-info/std", + "sp-consensus-poc/std", "sp-runtime/std", "sp-std/std", - "frame-support/std", - "frame-system/std", - # Subspace - "sp-consensus-poc/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/pallet-spartan/Cargo.toml b/crates/pallet-spartan/Cargo.toml index dc665bc5b1..93e2413622 100644 --- a/crates/pallet-spartan/Cargo.toml +++ b/crates/pallet-spartan/Cargo.toml @@ -14,49 +14,44 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } log = { version = "0.4.14", default-features = false } num-traits = { version = "0.2.14", default-features = false } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } scale-info = { version = "1.0", default-features = false, features = ["derive"] } - +sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-spartan = { version = "0.1.0", default-features = false, path = "../sp-consensus-spartan" } sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# Subspace -sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../sp-consensus-poc" } -sp-consensus-spartan = { version = "0.1.0", default-features = false, path = "../sp-consensus-spartan" } subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" } [dev-dependencies] ring = "0.16" -schnorrkel = "0.9.1" -sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-balances = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } pallet-offences-poc = { version = "0.1.0", path = "../pallet-offences-poc" } +schnorrkel = "0.9.1" +sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } subspace-codec = { version = "0.1.0", path = "../subspace-codec" } [features] default = ["std"] std = [ "codec/std", + "frame-support/std", + "frame-system/std", "log/std", "num-traits/std", + "pallet-timestamp/std", "scale-info/std", + "sp-consensus-poc/std", "sp-consensus-slots/std", + "sp-consensus-spartan/std", "sp-io/std", "sp-runtime/std", "sp-std/std", - "frame-support/std", - "frame-system/std", - "pallet-timestamp/std", - # Subspace - "sp-consensus-poc/std", - "sp-consensus-spartan/std", "subspace-core-primitives/std", ] try-runtime = ["frame-support/try-runtime"] diff --git a/crates/sc-consensus-poc-rpc/Cargo.toml b/crates/sc-consensus-poc-rpc/Cargo.toml index 62db9c74f6..0651a7bba2 100644 --- a/crates/sc-consensus-poc-rpc/Cargo.toml +++ b/crates/sc-consensus-poc-rpc/Cargo.toml @@ -22,16 +22,13 @@ jsonrpc-derive = "18.0.0" jsonrpc-pubsub = "18.0.0" log = "0.4.14" parking_lot = "0.11.1" -serde = { version = "1.0.127", features = ["derive"] } - +sc-consensus-poc = { version = "0.1.0", path = "../sc-consensus-poc" } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +serde = { version = "1.0.127", features = ["derive"] } sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# Subspace -sc-consensus-poc = { version = "0.1.0", path = "../sc-consensus-poc" } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } diff --git a/crates/sc-consensus-poc/Cargo.toml b/crates/sc-consensus-poc/Cargo.toml index 4adff5f943..9037dbd853 100644 --- a/crates/sc-consensus-poc/Cargo.toml +++ b/crates/sc-consensus-poc/Cargo.toml @@ -17,27 +17,27 @@ targets = ["x86_64-unknown-linux-gnu"] async-trait = "0.1.51" codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } derive_more = "0.99.16" +fork-tree = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } futures = "0.3.16" log = "0.4.14" lru = { version = "0.6.6", default-features = false } parking_lot = "0.11.1" +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", version = "0.9.0"} rand = "0.8.4" ring = "0.16" schnorrkel = "0.9.1" -serde = { version = "1.0.127", features = ["derive"] } - -# Substrate sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus-epochs = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-utils = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - +serde = { version = "1.0.127", features = ["derive"] } sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan" } @@ -45,12 +45,6 @@ sp-inherents = { version = "4.0.0-dev", git = "https://github.com/paritytech/sub sp-io = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-version = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -fork-tree = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", version = "0.9.0"} - -# Subspace -sp-consensus-poc = { version = "0.1.0", path = "../sp-consensus-poc" } subspace-archiving = { version = "0.1.0", path = "../subspace-archiving" } subspace-codec = { version = "0.1.0", path = "../subspace-codec" } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } diff --git a/crates/sp-consensus-poc/Cargo.toml b/crates/sp-consensus-poc/Cargo.toml index 6fee85dd50..4db663d9ac 100644 --- a/crates/sp-consensus-poc/Cargo.toml +++ b/crates/sp-consensus-poc/Cargo.toml @@ -17,19 +17,16 @@ async-trait = { version = "0.1.51", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } scale-info = { version = "1.0", default-features = false, features = ["derive"] } serde = { version = "1.0.127", features = ["derive"], optional = true } - sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-application-crypto = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", optional = true, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan", default-features = false } sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", default-features = false } - -# Subspace -sp-consensus-spartan = { version = "0.1.0", path = "../sp-consensus-spartan", default-features = false } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } [features] @@ -43,12 +40,11 @@ std = [ "sp-application-crypto/std", "sp-consensus", "sp-consensus-slots/std", + "sp-consensus-spartan/std", "sp-core/std", "sp-inherents/std", "sp-runtime/std", "sp-std/std", "sp-timestamp/std", - # Subspace - "sp-consensus-spartan/std", "subspace-core-primitives/std", ] diff --git a/crates/sp-consensus-spartan/Cargo.toml b/crates/sp-consensus-spartan/Cargo.toml index 02a751352b..d824df31d2 100644 --- a/crates/sp-consensus-spartan/Cargo.toml +++ b/crates/sp-consensus-spartan/Cargo.toml @@ -14,8 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] ring = { version = "0.16.20", optional = true } - -# Subspace subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } [features] diff --git a/crates/spartan-farmer/Cargo.toml b/crates/spartan-farmer/Cargo.toml index 43376c61b8..f5d8a6c544 100644 --- a/crates/spartan-farmer/Cargo.toml +++ b/crates/spartan-farmer/Cargo.toml @@ -29,11 +29,10 @@ ring = "0.16.20" schnorrkel = "0.10.1" serde = { version = "1.0.125", features = ["derive"] } serde_json = "1.0.64" -thiserror = "1.0.24" -tokio = "1.11.0" - subspace-codec = { version = "0.1.0", path = "../subspace-codec" } subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } +thiserror = "1.0.24" +tokio = "1.11.0" [dependencies.rocksdb] # This disables compression algorithms that cause issues during linking due to diff --git a/crates/subspace-archiving/Cargo.toml b/crates/subspace-archiving/Cargo.toml index 83f5850345..c580ed6f55 100644 --- a/crates/subspace-archiving/Cargo.toml +++ b/crates/subspace-archiving/Cargo.toml @@ -17,7 +17,6 @@ merkletree = "0.21.0" parity-scale-codec = { version = "2.3.0", features = ["derive"], default-features = false } thiserror = "1.0.29" typenum = "1.14.0" - subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false } # Ugly workaround for https://github.com/rust-lang/cargo/issues/1197 diff --git a/crates/subspace-codec/Cargo.toml b/crates/subspace-codec/Cargo.toml index 8b7383e67c..fd62aff032 100644 --- a/crates/subspace-codec/Cargo.toml +++ b/crates/subspace-codec/Cargo.toml @@ -14,7 +14,6 @@ include = [ [dependencies] sloth256-189 = "0.2.2" - subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" } [dev-dependencies] From 3e484493394113aad6c8c73442f9809bdf6c5131 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Sun, 3 Oct 2021 16:18:33 +0800 Subject: [PATCH 7/8] whitespaces --- crates/pallet-feeds/Cargo.toml | 18 +++++++++--------- crates/sc-consensus-poc/Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/pallet-feeds/Cargo.toml b/crates/pallet-feeds/Cargo.toml index 5a353acbc6..3755ac170d 100644 --- a/crates/pallet-feeds/Cargo.toml +++ b/crates/pallet-feeds/Cargo.toml @@ -13,18 +13,18 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -codec = {package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"]} -frame-support = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -frame-system = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -log = {version = "0.4.14", default-features = false} -scale-info = {version = "1.0", default-features = false, features = ["derive"]} -sp-core = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -sp-std = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} +codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +log = { version = "0.4.14", default-features = false } +scale-info = { version = "1.0", default-features = false, features = ["derive"] } +sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } [dev-dependencies] serde = "1.0.127" -sp-io = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} -sp-runtime = {version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05"} +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } [features] default = ["std"] diff --git a/crates/sc-consensus-poc/Cargo.toml b/crates/sc-consensus-poc/Cargo.toml index 9037dbd853..eb0ccb46b8 100644 --- a/crates/sc-consensus-poc/Cargo.toml +++ b/crates/sc-consensus-poc/Cargo.toml @@ -22,7 +22,7 @@ futures = "0.3.16" log = "0.4.14" lru = { version = "0.6.6", default-features = false } parking_lot = "0.11.1" -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", version = "0.9.0"} +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", version = "0.9.0" } rand = "0.8.4" ring = "0.16" schnorrkel = "0.9.1" From 70a46db725af2e09fedcf9fd6b231bde565e3543 Mon Sep 17 00:00:00 2001 From: Liu-Cheng Xu Date: Sun, 3 Oct 2021 16:25:51 +0800 Subject: [PATCH 8/8] one section: note-template-spartan --- node-template-spartan/node/Cargo.toml | 41 ++++++---------- node-template-spartan/runtime/Cargo.toml | 59 +++++++++++------------- 2 files changed, 42 insertions(+), 58 deletions(-) diff --git a/node-template-spartan/node/Cargo.toml b/node-template-spartan/node/Cargo.toml index 8261ede628..1dd2276785 100644 --- a/node-template-spartan/node/Cargo.toml +++ b/node-template-spartan/node/Cargo.toml @@ -16,48 +16,37 @@ targets = ["x86_64-unknown-linux-gnu"] name = "node-template-spartan" [dependencies] -structopt = "0.3.22" - +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +jsonrpc-core = "18.0.0" +node-template-spartan-runtime = { version = "0.1.0", path = "../runtime" } +pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } +sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", features = ["wasmtime"] } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - +sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-authorship = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } sp-core = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# These dependencies are used for the node template's RPCs -jsonrpc-core = "18.0.0" - -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - +structopt = "0.3.22" substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# These dependencies are used for runtime benchmarking -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -# Subspace -sc-consensus-poc = { version = "0.1.0", path = "../../crates/sc-consensus-poc" } -sc-consensus-poc-rpc = { version = "0.1.0", path = "../../crates/sc-consensus-poc-rpc" } -sp-consensus-poc = { version = "0.1.0", path = "../../crates/sp-consensus-poc" } -node-template-spartan-runtime = { version = "0.1.0", path = "../runtime" } [build-dependencies] substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } diff --git a/node-template-spartan/runtime/Cargo.toml b/node-template-spartan/runtime/Cargo.toml index 3be7199509..717e20df39 100644 --- a/node-template-spartan/runtime/Cargo.toml +++ b/node-template-spartan/runtime/Cargo.toml @@ -12,9 +12,19 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } +frame-executive = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } hex-literal = { version = "0.3.3", optional = true } +pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-feeds = { version = "0.1.0", default-features = false, path = "../../crates/pallet-feeds" } +pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } +pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-spartan = { version = "0.1.0", default-features = false, path = "../../crates/pallet-spartan" } +pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } scale-info = { version = "1.0", default-features = false, features = ["derive"] } - sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-block-builder = { git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", default-features = false, version = "4.0.0-dev"} sp-consensus-poc = { version = "0.1.0", default-features = false, path = "../../crates/sp-consensus-poc" } @@ -27,15 +37,7 @@ sp-session = { version = "4.0.0-dev", default-features = false, git = "https://g sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-transaction-pool = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } sp-version = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } - -frame-executive = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-randomness-collective-flip = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-sudo = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } -pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } +subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../../crates/subspace-core-primitives" } # Used for the node template's RPCs frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -45,12 +47,6 @@ pallet-transaction-payment-rpc-runtime-api = { version = "4.0.0-dev", default-fe frame-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05", optional = true } -# Subspace -pallet-feeds = { version = "0.1.0", default-features = false, path = "../../crates/pallet-feeds" } -pallet-offences-poc = { version = "0.1.0", default-features = false, path = "../../crates/pallet-offences-poc" } -pallet-spartan = { version = "0.1.0", default-features = false, path = "../../crates/pallet-spartan" } -subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../../crates/subspace-core-primitives" } - [build-dependencies] substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "91b386ff07a85b3dd50ff3ed29c97e6b29d15f05" } @@ -58,6 +54,19 @@ substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/pari default = ["std"] std = [ "codec/std", + "frame-executive/std", + "frame-support/std", + "frame-system/std", + "frame-system-rpc-runtime-api/std", + "pallet-balances/std", + "pallet-feeds/std", + "pallet-offences-poc/std", + "pallet-randomness-collective-flip/std", + "pallet-spartan/std", + "pallet-sudo/std", + "pallet-timestamp/std", + "pallet-transaction-payment-rpc-runtime-api/std", + "pallet-transaction-payment/std", "scale-info/std", "sp-api/std", "sp-block-builder/std", @@ -71,29 +80,15 @@ std = [ "sp-std/std", "sp-transaction-pool/std", "sp-version/std", - "frame-executive/std", - "frame-support/std", - "frame-system/std", - "frame-system-rpc-runtime-api/std", - "pallet-balances/std", - "pallet-randomness-collective-flip/std", - "pallet-sudo/std", - "pallet-timestamp/std", - "pallet-transaction-payment-rpc-runtime-api/std", - "pallet-transaction-payment/std", - # Subspace - "pallet-feeds/std", - "pallet-offences-poc/std", - "pallet-spartan/std", "subspace-core-primitives/std", ] runtime-benchmarks = [ - "hex-literal", - "sp-runtime/runtime-benchmarks", "frame-benchmarking", "frame-support/runtime-benchmarks", "frame-system-benchmarking", "frame-system/runtime-benchmarks", + "hex-literal", "pallet-balances/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", + "sp-runtime/runtime-benchmarks", ]