Unverified Commit a81a23a9 authored by Gav Wood's avatar Gav Wood Committed by GitHub
Browse files

Fixes for substrate#1404 (#76)

* Fixes for substrate#1404

* Updates for latest Substrate

* Update lock file

* Update runtime.
parent 89f6c0c6
Pipeline #28448 passed with stages
in 14 minutes and 57 seconds
This diff is collapsed.
...@@ -27,6 +27,7 @@ srml-council = { git = "https://github.com/paritytech/substrate" } ...@@ -27,6 +27,7 @@ srml-council = { git = "https://github.com/paritytech/substrate" }
srml-democracy = { git = "https://github.com/paritytech/substrate" } srml-democracy = { git = "https://github.com/paritytech/substrate" }
srml-executive = { git = "https://github.com/paritytech/substrate" } srml-executive = { git = "https://github.com/paritytech/substrate" }
srml-grandpa = { git = "https://github.com/paritytech/substrate" } srml-grandpa = { git = "https://github.com/paritytech/substrate" }
srml-indices = { git = "https://github.com/paritytech/substrate" }
sr-primitives = { git = "https://github.com/paritytech/substrate" } sr-primitives = { git = "https://github.com/paritytech/substrate" }
srml-session = { git = "https://github.com/paritytech/substrate" } srml-session = { git = "https://github.com/paritytech/substrate" }
srml-staking = { git = "https://github.com/paritytech/substrate" } srml-staking = { git = "https://github.com/paritytech/substrate" }
...@@ -58,6 +59,7 @@ std = [ ...@@ -58,6 +59,7 @@ std = [
"srml-democracy/std", "srml-democracy/std",
"srml-executive/std", "srml-executive/std",
"srml-grandpa/std", "srml-grandpa/std",
"srml-indices/std",
"sr-primitives/std", "sr-primitives/std",
"srml-session/std", "srml-session/std",
"srml-staking/std", "srml-staking/std",
......
...@@ -49,6 +49,7 @@ extern crate srml_council as council; ...@@ -49,6 +49,7 @@ extern crate srml_council as council;
extern crate srml_democracy as democracy; extern crate srml_democracy as democracy;
extern crate srml_executive as executive; extern crate srml_executive as executive;
extern crate srml_grandpa as grandpa; extern crate srml_grandpa as grandpa;
extern crate srml_indices as indices;
extern crate srml_session as session; extern crate srml_session as session;
extern crate srml_staking as staking; extern crate srml_staking as staking;
extern crate srml_sudo as sudo; extern crate srml_sudo as sudo;
...@@ -75,10 +76,10 @@ use client::{ ...@@ -75,10 +76,10 @@ use client::{
runtime_api as client_api, runtime_api as client_api,
}; };
use consensus_aura::api as aura_api; use consensus_aura::api as aura_api;
use sr_primitives::{ApplyResult, CheckInherentError}; use sr_primitives::{
use sr_primitives::transaction_validity::TransactionValidity; ApplyResult, CheckInherentError, generic, transaction_validity::TransactionValidity,
use sr_primitives::generic; traits::{Convert, BlakeTwo256, Block as BlockT, DigestFor, StaticLookup}
use sr_primitives::traits::{Convert, BlakeTwo256, Block as BlockT, DigestFor}; };
use version::RuntimeVersion; use version::RuntimeVersion;
use grandpa::fg_primitives::{self, ScheduledChange}; use grandpa::fg_primitives::{self, ScheduledChange};
use council::{motions as council_motions, voting as council_voting}; use council::{motions as council_motions, voting as council_voting};
...@@ -107,7 +108,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { ...@@ -107,7 +108,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("polkadot"), spec_name: create_runtime_str!("polkadot"),
impl_name: create_runtime_str!("parity-polkadot"), impl_name: create_runtime_str!("parity-polkadot"),
authoring_version: 1, authoring_version: 1,
spec_version: 102, spec_version: 103,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
}; };
...@@ -129,6 +130,7 @@ impl system::Trait for Runtime { ...@@ -129,6 +130,7 @@ impl system::Trait for Runtime {
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type Digest = generic::Digest<Log>; type Digest = generic::Digest<Log>;
type AccountId = AccountId; type AccountId = AccountId;
type Lookup = Indices;
type Header = generic::Header<BlockNumber, BlakeTwo256, Log>; type Header = generic::Header<BlockNumber, BlakeTwo256, Log>;
type Event = Event; type Event = Event;
type Log = Log; type Log = Log;
...@@ -138,10 +140,17 @@ impl aura::Trait for Runtime { ...@@ -138,10 +140,17 @@ impl aura::Trait for Runtime {
type HandleReport = aura::StakingSlasher<Runtime>; type HandleReport = aura::StakingSlasher<Runtime>;
} }
impl indices::Trait for Runtime {
type IsDeadAccount = Balances;
type AccountIndex = AccountIndex;
type ResolveHint = indices::SimpleResolveHint<Self::AccountId, Self::AccountIndex>;
type Event = Event;
}
impl balances::Trait for Runtime { impl balances::Trait for Runtime {
type Balance = Balance; type Balance = Balance;
type AccountIndex = AccountIndex;
type OnFreeBalanceZero = Staking; type OnFreeBalanceZero = Staking;
type OnNewAccount = Indices;
type EnsureAccountLiquid = Staking; type EnsureAccountLiquid = Staking;
type Event = Event; type Event = Event;
} }
...@@ -236,6 +245,7 @@ construct_runtime!( ...@@ -236,6 +245,7 @@ construct_runtime!(
Timestamp: timestamp::{Module, Call, Storage, Config<T>, Inherent}, Timestamp: timestamp::{Module, Call, Storage, Config<T>, Inherent},
// consensus' Inherent is not provided because it assumes instant-finality blocks. // consensus' Inherent is not provided because it assumes instant-finality blocks.
Consensus: consensus::{Module, Call, Storage, Config<T>, Log(AuthoritiesChange) }, Consensus: consensus::{Module, Call, Storage, Config<T>, Log(AuthoritiesChange) },
Indices: indices,
Balances: balances, Balances: balances,
Session: session, Session: session,
Staking: staking, Staking: staking,
...@@ -253,9 +263,7 @@ construct_runtime!( ...@@ -253,9 +263,7 @@ construct_runtime!(
); );
/// The address format for describing accounts. /// The address format for describing accounts.
pub use balances::address::Address as RawAddress; pub type Address = <Indices as StaticLookup>::Source;
/// The address format for describing accounts.
pub type Address = balances::Address<Runtime>;
/// Block header type as expected by this runtime. /// Block header type as expected by this runtime.
pub type Header = generic::Header<BlockNumber, BlakeTwo256, Log>; pub type Header = generic::Header<BlockNumber, BlakeTwo256, Log>;
/// Block type as expected by this runtime. /// Block type as expected by this runtime.
...@@ -269,7 +277,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, ...@@ -269,7 +277,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address,
/// Extrinsic type that has already been checked. /// Extrinsic type that has already been checked.
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>; pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>;
/// Executive: handles dispatch to the various modules. /// Executive: handles dispatch to the various modules.
pub type Executive = executive::Executive<Runtime, Block, balances::ChainContext<Runtime>, Balances, AllModules>; pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Balances, AllModules>;
impl_runtime_apis! { impl_runtime_apis! {
impl client_api::Core<Block> for Runtime { impl client_api::Core<Block> for Runtime {
......
...@@ -457,7 +457,7 @@ mod tests { ...@@ -457,7 +457,7 @@ mod tests {
use sr_io::{TestExternalities, with_externalities}; use sr_io::{TestExternalities, with_externalities};
use substrate_primitives::{H256, Blake2Hasher}; use substrate_primitives::{H256, Blake2Hasher};
use sr_primitives::{generic, BuildStorage}; use sr_primitives::{generic, BuildStorage};
use sr_primitives::traits::BlakeTwo256; use sr_primitives::traits::{BlakeTwo256, IdentityLookup};
use primitives::{parachain::{CandidateReceipt, HeadData, ValidityAttestation}, SessionKey}; use primitives::{parachain::{CandidateReceipt, HeadData, ValidityAttestation}, SessionKey};
use keyring::Keyring; use keyring::Keyring;
use {consensus, timestamp}; use {consensus, timestamp};
...@@ -482,6 +482,7 @@ mod tests { ...@@ -482,6 +482,7 @@ mod tests {
type Hashing = BlakeTwo256; type Hashing = BlakeTwo256;
type Digest = generic::Digest<::Log>; type Digest = generic::Digest<::Log>;
type AccountId = ::AccountId; type AccountId = ::AccountId;
type Lookup = IdentityLookup<::AccountId>;
type Header = ::Header; type Header = ::Header;
type Event = (); type Event = ();
type Log = ::Log; type Log = ::Log;
......
...@@ -177,6 +177,7 @@ dependencies = [ ...@@ -177,6 +177,7 @@ dependencies = [
"srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-session 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-session 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-staking 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-staking 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate)", "srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate)",
...@@ -272,7 +273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -272,7 +273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "sr-api-macros" name = "sr-api-macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -283,7 +284,7 @@ dependencies = [ ...@@ -283,7 +284,7 @@ dependencies = [
[[package]] [[package]]
name = "sr-io" name = "sr-io"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -295,7 +296,7 @@ dependencies = [ ...@@ -295,7 +296,7 @@ dependencies = [
[[package]] [[package]]
name = "sr-primitives" name = "sr-primitives"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -309,7 +310,7 @@ dependencies = [ ...@@ -309,7 +310,7 @@ dependencies = [
[[package]] [[package]]
name = "sr-std" name = "sr-std"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
...@@ -317,7 +318,7 @@ dependencies = [ ...@@ -317,7 +318,7 @@ dependencies = [
[[package]] [[package]]
name = "sr-version" name = "sr-version"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -329,7 +330,7 @@ dependencies = [ ...@@ -329,7 +330,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-aura" name = "srml-aura"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -349,7 +350,7 @@ dependencies = [ ...@@ -349,7 +350,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-balances" name = "srml-balances"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -367,7 +368,7 @@ dependencies = [ ...@@ -367,7 +368,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-consensus" name = "srml-consensus"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -384,7 +385,7 @@ dependencies = [ ...@@ -384,7 +385,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-council" name = "srml-council"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -404,7 +405,7 @@ dependencies = [ ...@@ -404,7 +405,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-democracy" name = "srml-democracy"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -423,7 +424,7 @@ dependencies = [ ...@@ -423,7 +424,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-executive" name = "srml-executive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -439,7 +440,7 @@ dependencies = [ ...@@ -439,7 +440,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-grandpa" name = "srml-grandpa"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -455,10 +456,28 @@ dependencies = [ ...@@ -455,10 +456,28 @@ dependencies = [
"substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)", "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
] ]
[[package]]
name = "srml-indices"
version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 0.1.0 (git+https://github.com/paritytech/substrate)",
"sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
"sr-std 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-support 0.1.0 (git+https://github.com/paritytech/substrate)",
"srml-system 0.1.0 (git+https://github.com/paritytech/substrate)",
"substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
]
[[package]] [[package]]
name = "srml-metadata" name = "srml-metadata"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -469,7 +488,7 @@ dependencies = [ ...@@ -469,7 +488,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-session" name = "srml-session"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -489,7 +508,7 @@ dependencies = [ ...@@ -489,7 +508,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-staking" name = "srml-staking"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -511,7 +530,7 @@ dependencies = [ ...@@ -511,7 +530,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-sudo" name = "srml-sudo"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -530,7 +549,7 @@ dependencies = [ ...@@ -530,7 +549,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-support" name = "srml-support"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -545,7 +564,7 @@ dependencies = [ ...@@ -545,7 +564,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-support-procedural" name = "srml-support-procedural"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -557,7 +576,7 @@ dependencies = [ ...@@ -557,7 +576,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-support-procedural-tools" name = "srml-support-procedural-tools"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -568,7 +587,7 @@ dependencies = [ ...@@ -568,7 +587,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-support-procedural-tools-derive" name = "srml-support-procedural-tools-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -578,7 +597,7 @@ dependencies = [ ...@@ -578,7 +597,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-system" name = "srml-system"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -595,7 +614,7 @@ dependencies = [ ...@@ -595,7 +614,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-timestamp" name = "srml-timestamp"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -612,7 +631,7 @@ dependencies = [ ...@@ -612,7 +631,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-treasury" name = "srml-treasury"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -630,7 +649,7 @@ dependencies = [ ...@@ -630,7 +649,7 @@ dependencies = [
[[package]] [[package]]
name = "srml-upgrade-key" name = "srml-upgrade-key"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -654,7 +673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -654,7 +673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "substrate-client" name = "substrate-client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate)", "sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate)",
...@@ -667,7 +686,7 @@ dependencies = [ ...@@ -667,7 +686,7 @@ dependencies = [
[[package]] [[package]]
name = "substrate-consensus-aura-primitives" name = "substrate-consensus-aura-primitives"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 0.1.0 (git+https://github.com/paritytech/substrate)", "sr-io 0.1.0 (git+https://github.com/paritytech/substrate)",
...@@ -681,7 +700,7 @@ dependencies = [ ...@@ -681,7 +700,7 @@ dependencies = [
[[package]] [[package]]
name = "substrate-finality-grandpa-primitives" name = "substrate-finality-grandpa-primitives"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
...@@ -694,7 +713,7 @@ dependencies = [ ...@@ -694,7 +713,7 @@ dependencies = [
[[package]] [[package]]
name = "substrate-primitives" name = "substrate-primitives"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/paritytech/substrate#a456f8f116f4999a5c0d6aac12a52d3a22abdc82" source = "git+https://github.com/paritytech/substrate#553e78d0fe7f3dc29d56454de3b71f6893a16a1a"
dependencies = [ dependencies = [
"byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)",
...@@ -787,6 +806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -787,6 +806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-indices 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-session 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-session 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
"checksum srml-staking 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>" "checksum srml-staking 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
......
...@@ -26,6 +26,7 @@ srml-council = { git = "https://github.com/paritytech/substrate", default-featur ...@@ -26,6 +26,7 @@ srml-council = { git = "https://github.com/paritytech/substrate", default-featur
srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false } srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false } srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false } srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-indices = { git = "https://github.com/paritytech/substrate", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false } sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-session = { git = "https://github.com/paritytech/substrate", default-features = false } srml-session = { git = "https://github.com/paritytech/substrate", default-features = false }
srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false } srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false }
......
...@@ -20,7 +20,8 @@ use primitives::{H256, Ed25519AuthorityId as AuthorityId, ed25519}; ...@@ -20,7 +20,8 @@ use primitives::{H256, Ed25519AuthorityId as AuthorityId, ed25519};
use polkadot_runtime::{ use polkadot_runtime::{
GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig, TreasuryConfig, GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig, TreasuryConfig,
SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill, SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill,
CouncilVotingConfig, GrandpaConfig, UpgradeKeyConfig, SudoConfig, Permill CouncilVotingConfig, GrandpaConfig, UpgradeKeyConfig, SudoConfig, IndicesConfig,
Permill
}; };
const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/"; const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
...@@ -57,6 +58,9 @@ fn staging_testnet_config_genesis() -> GenesisConfig { ...@@ -57,6 +58,9 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
authorities: initial_authorities.clone(), authorities: initial_authorities.clone(),
}), }),
system: None,