diff --git a/Cargo.lock b/Cargo.lock index e318f60..32afeda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,30 +687,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bp-evochain" -version = "0.1.0" -dependencies = [ - "bp-header-chain", - "bp-messages", - "bp-runtime", - "fixed-hash", - "frame-support", - "frame-system", - "hash256-std-hasher", - "impl-codec", - "impl-serde", - "parity-util-mem", - "scale-info", - "serde", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-trie", -] - [[package]] name = "bp-header-chain" version = "0.1.0" @@ -1957,6 +1933,30 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" +[[package]] +name = "ep-core" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-runtime", + "fixed-hash", + "frame-support", + "frame-system", + "hash256-std-hasher", + "impl-codec", + "impl-serde", + "parity-util-mem", + "scale-info", + "serde", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -4575,7 +4575,7 @@ dependencies = [ name = "node-template-runtime" version = "4.0.0-dev" dependencies = [ - "bp-evochain", + "ep-core", "fp-account", "frame-benchmarking", "frame-executive", diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index b794dad..799ea61 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "bp-evochain" +name = "ep-core" description = "Primitives of Evochain runtime." version = "0.1.0" authors = ["Parity Technologies "] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index b178b7b..259922c 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -45,7 +45,7 @@ frame-system-rpc-runtime-api = { default-features = false, git = "https://github pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" } # Primitive types -bp-evochain = { path = "../primitives", default-features = false } +ep-core = { path = "../primitives", default-features = false } # Used for runtime benchmarking frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", optional = true , branch = "polkadot-v1.0.0" } @@ -61,6 +61,7 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate.git", [features] default = ["std"] std = [ + "ep-core/std", "frame-try-runtime?/std", "frame-system-benchmarking?/std", "frame-benchmarking?/std", @@ -102,8 +103,10 @@ runtime-benchmarks = [ "frame-system/runtime-benchmarks", "pallet-balances/runtime-benchmarks", "pallet-grandpa/runtime-benchmarks", + "pallet-sudo/runtime-benchmarks", "pallet-template/runtime-benchmarks", "pallet-timestamp/runtime-benchmarks", + "pallet-utility/runtime-benchmarks", "sp-runtime/runtime-benchmarks", ] try-runtime = [ @@ -118,4 +121,6 @@ try-runtime = [ "pallet-template/try-runtime", "pallet-timestamp/try-runtime", "pallet-transaction-payment/try-runtime", + "pallet-utility/try-runtime", + "sp-runtime/try-runtime", ] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 98b82a4..de34828 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -48,26 +48,26 @@ pub use sp_runtime::{Perbill, Permill}; pub use pallet_template; /// An index to a block. -pub type BlockNumber = bp_evochain::BlockNumber; +pub type BlockNumber = ep_core::BlockNumber; /// The type for storing how many extrinsics an account has signed. -pub type Nonce = bp_evochain::Nonce; +pub type Nonce = ep_core::Nonce; /// Alias to 512-bit hash when used in the context of a transaction signature on the chain. -pub type Signature = bp_evochain::Signature; +pub type Signature = ep_core::Signature; /// Some way of identifying an account on the chain. We intentionally make it equivalent /// to the public key of our transaction signing scheme. -pub type AccountId = bp_evochain::AccountId; +pub type AccountId = ep_core::AccountId; /// Balance of an account. -pub type Balance = bp_evochain::Balance; +pub type Balance = ep_core::Balance; /// A hash of some data used by the chain. -pub type Hash = bp_evochain::Hash; +pub type Hash = ep_core::Hash; /// Hashing type -pub type Hashing = bp_evochain::Hasher; +pub type Hashing = ep_core::Hasher; /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats @@ -230,7 +230,7 @@ impl pallet_timestamp::Config for Runtime { } parameter_types! { - pub const ExistentialDeposit: bp_evochain::Balance = 500; + pub const ExistentialDeposit: ep_core::Balance = 500; } impl pallet_balances::Config for Runtime { @@ -300,9 +300,9 @@ construct_runtime!( ); /// The address format for describing accounts. -pub type Address = bp_evochain::AccountId; +pub type Address = ep_core::AccountId; /// Block header type as expected by this runtime. -pub type Header = bp_evochain::Header; +pub type Header = ep_core::Header; /// Block type as expected by this runtime. pub type Block = generic::Block; /// The SignedExtension to the basic transaction logic.