diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 99556b9af5..08ac226c0f 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -1317,22 +1317,6 @@ dependencies = [ "substrate-executor 0.1.0", ] -[[package]] -name = "polkadot-keystore" -version = "0.1.0" -dependencies = [ - "ed25519 0.1.0", - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-crypto 0.1.0 (git+https://github.com/paritytech/parity.git)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "polkadot-parachain" version = "0.1.0" @@ -1400,7 +1384,6 @@ dependencies = [ "polkadot-api 0.1.0", "polkadot-consensus 0.1.0", "polkadot-executor 0.1.0", - "polkadot-keystore 0.1.0", "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", "polkadot-transaction-pool 0.1.0", @@ -1408,6 +1391,7 @@ dependencies = [ "substrate-client-db 0.1.0", "substrate-codec 0.1.0", "substrate-executor 0.1.0", + "substrate-keystore 0.1.0", "substrate-network 0.1.0", "substrate-primitives 0.1.0", "substrate-runtime-io 0.1.0", @@ -1972,6 +1956,22 @@ dependencies = [ "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "substrate-keystore" +version = "0.1.0" +dependencies = [ + "ed25519 0.1.0", + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethcore-crypto 0.1.0 (git+https://github.com/paritytech/parity.git)", + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.64 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "substrate-misbehavior-check" version = "0.1.0" diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index b3042535e5..69a67c3a0a 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -18,7 +18,6 @@ members = [ "polkadot/collator", "polkadot/consensus", "polkadot/executor", - "polkadot/keystore", "polkadot/parachain", "polkadot/primitives", "polkadot/runtime", @@ -55,6 +54,7 @@ members = [ "substrate/serializer", "substrate/state-machine", "substrate/test-runtime", + "substrate/keystore", "demo/cli", "demo/executor", diff --git a/substrate/polkadot/service/Cargo.toml b/substrate/polkadot/service/Cargo.toml index bb9fb170bd..4bc62b271a 100644 --- a/substrate/polkadot/service/Cargo.toml +++ b/substrate/polkadot/service/Cargo.toml @@ -19,7 +19,7 @@ polkadot-consensus = { path = "../consensus" } polkadot-executor = { path = "../executor" } polkadot-api = { path = "../api" } polkadot-transaction-pool = { path = "../transaction-pool" } -polkadot-keystore = { path = "../keystore" } +substrate-keystore = { path = "../../substrate/keystore" } substrate-runtime-io = { path = "../../substrate/runtime-io" } substrate-primitives = { path = "../../substrate/primitives" } substrate-network = { path = "../../substrate/network" } diff --git a/substrate/polkadot/service/src/lib.rs b/substrate/polkadot/service/src/lib.rs index a22e62d342..35b72cd5d3 100644 --- a/substrate/polkadot/service/src/lib.rs +++ b/substrate/polkadot/service/src/lib.rs @@ -28,7 +28,7 @@ extern crate polkadot_executor; extern crate polkadot_api; extern crate polkadot_consensus as consensus; extern crate polkadot_transaction_pool as transaction_pool; -extern crate polkadot_keystore as keystore; +extern crate substrate_keystore as keystore; extern crate substrate_runtime_io as runtime_io; extern crate substrate_primitives as primitives; extern crate substrate_network as network; diff --git a/substrate/polkadot/keystore/Cargo.toml b/substrate/substrate/keystore/Cargo.toml similarity index 69% rename from substrate/polkadot/keystore/Cargo.toml rename to substrate/substrate/keystore/Cargo.toml index d5d5ec8afe..18b0f3a33e 100644 --- a/substrate/polkadot/keystore/Cargo.toml +++ b/substrate/substrate/keystore/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "polkadot-keystore" +name = "substrate-keystore" version = "0.1.0" -authors = ["Parity Technologies "] +authors = ["Parity Technologies "] [dependencies] ethcore-crypto = { git = "https://github.com/paritytech/parity.git", default_features = false } -ed25519 = { path = "../../substrate/ed25519" } +ed25519 = { path = "../ed25519" } error-chain = "0.11" hex = "0.3" rand = "0.4" diff --git a/substrate/polkadot/keystore/src/lib.rs b/substrate/substrate/keystore/src/lib.rs similarity index 95% rename from substrate/polkadot/keystore/src/lib.rs rename to substrate/substrate/keystore/src/lib.rs index 0518875e74..77aeb16ae1 100644 --- a/substrate/polkadot/keystore/src/lib.rs +++ b/substrate/substrate/keystore/src/lib.rs @@ -1,20 +1,20 @@ -// Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// Copyright 2017-2018 Parity Technologies (UK) Ltd. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Keystore (and session key management) for polkadot. +//! Keystore (and session key management) for ed25519 based chains like Polkadot. extern crate ethcore_crypto as crypto; extern crate subtle;