pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 09:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

update substrate (#259)

Browse Source 
* WIP

* merging select_chain

* WIP

* update to point to gui-polkadot-master

* Fix collator

* update gui-polkadot-master and fix

* fix unwraps

* better returning an error
This commit is contained in:
thiolliere
2019-05-15 20:35:27 +02:00
committed by Robert Habermeier
parent ac2b9168ac
commit 6d778c99d2
25 changed files with 1005 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+503 -501
View File
File diff suppressed because it is too large Load Diff
polkadot/availability-store/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ polkadot-primitives = { path = "../primitives" }
parking_lot = "0.7.1" parking_lot = "0.7.1"
log = "0.4.6" log = "0.4.6"
parity-codec = "3.0" parity-codec = "3.0"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" }
polkadot/cli/Cargo.toml
+1 -1
View File
@@ -9,5 +9,5 @@ log = "0.4.6"
tokio = "0.1.7" tokio = "0.1.7"
futures = "0.1.17" futures = "0.1.17"
exit-future = "0.1" exit-future = "0.1"
substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot-service = { path = "../service" } polkadot-service = { path = "../service" }
polkadot/collator/Cargo.toml
+5 -4
View File
@@ -6,10 +6,11 @@ description = "Collator node implementation"
[dependencies] [dependencies]
futures = "0.1.17" futures = "0.1.17"
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
parity-codec = "3.0" parity-codec = "3.0"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-common= { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot-runtime = { path = "../runtime", version = "0.1" } polkadot-runtime = { path = "../runtime", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" } polkadot-primitives = { path = "../primitives", version = "0.1" }
polkadot-cli = { path = "../cli" } polkadot-cli = { path = "../cli" }
@@ -19,4 +20,4 @@ log = "0.4"
tokio = "0.1.7" tokio = "0.1.7"
[dev-dependencies] [dev-dependencies]
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot/collator/src/lib.rs
+10 -2
View File
@@ -49,6 +49,7 @@ extern crate substrate_client as client;
extern crate parity_codec as codec; extern crate parity_codec as codec;
extern crate substrate_primitives as primitives; extern crate substrate_primitives as primitives;
extern crate substrate_consensus_authorities as consensus_authorities; extern crate substrate_consensus_authorities as consensus_authorities;
extern crate substrate_consensus_common as consensus_common;
extern crate tokio; extern crate tokio;
extern crate polkadot_cli; extern crate polkadot_cli;
@@ -82,6 +83,7 @@ use polkadot_network::validation::{ValidationNetwork, SessionParams};
use polkadot_network::NetworkService; use polkadot_network::NetworkService;
use tokio::timer::Timeout; use tokio::timer::Timeout;
use consensus_authorities::AuthoritiesApi; use consensus_authorities::AuthoritiesApi;
use consensus_common::SelectChain;
pub use polkadot_cli::VersionInfo; pub use polkadot_cli::VersionInfo;
pub use polkadot_network::validation::Incoming; pub use polkadot_network::validation::Incoming;
@@ -256,18 +258,24 @@ impl<P, E> Worker for CollationNode<P, E> where
let client = service.client(); let client = service.client();
let network = service.network(); let network = service.network();
let known_oracle = client.clone(); let known_oracle = client.clone();
let select_chain = if let Some(select_chain) = service.select_chain() {
select_chain
} else {
info!("The node cannot work because it can't select chain.");
return Box::new(future::err(()));
};
let message_validator = polkadot_network::gossip::register_validator( let message_validator = polkadot_network::gossip::register_validator(
&*network, &*network,
move |block_hash: &Hash| { move |block_hash: &Hash| {
use client::{BlockStatus, ChainHead}; use client::BlockStatus;
use polkadot_network::gossip::Known; use polkadot_network::gossip::Known;
match known_oracle.block_status(&BlockId::hash(*block_hash)) { match known_oracle.block_status(&BlockId::hash(*block_hash)) {
Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None,
Ok(BlockStatus::KnownBad) => Some(Known::Bad), Ok(BlockStatus::KnownBad) => Some(Known::Bad),
Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) =>
match known_oracle.leaves() { match select_chain.leaves() {
Err(_) => None, Err(_) => None,
Ok(leaves) => if leaves.contains(block_hash) { Ok(leaves) => if leaves.contains(block_hash) {
Some(Known::Leaf) Some(Known::Leaf)
polkadot/erasure-coding/Cargo.toml
+2 -2
View File
@@ -8,5 +8,5 @@ edition = "2018"
polkadot-primitives = { path = "../primitives" } polkadot-primitives = { path = "../primitives" }
reed-solomon-erasure = { git = "https://github.com/paritytech/reed-solomon-erasure" } reed-solomon-erasure = { git = "https://github.com/paritytech/reed-solomon-erasure" }
parity-codec = "3.0" parity-codec = "3.0"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot/executor/Cargo.toml
+2 -2
View File
@@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust." description = "Polkadot node implementation in Rust."
[dependencies] [dependencies]
substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot-runtime = { path = "../runtime" } polkadot-runtime = { path = "../runtime" }
polkadot/network/Cargo.toml
+5 -5
View File
@@ -12,9 +12,9 @@ polkadot-validation = { path = "../validation" }
polkadot-primitives = { path = "../primitives" } polkadot-primitives = { path = "../primitives" }
parity-codec = "3.0" parity-codec = "3.0"
parity-codec-derive = "3.0" parity-codec-derive = "3.0"
substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-network = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
futures = "0.1" futures = "0.1"
tokio = "0.1.7" tokio = "0.1.7"
log = "0.4" log = "0.4"
@@ -22,5 +22,5 @@ slice-group-by = "0.2.2"
exit-future = "0.1.4" exit-future = "0.1.4"
[dev-dependencies] [dev-dependencies]
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot/network/src/tests/mod.rs
+2 -13
View File
@@ -27,10 +27,11 @@ use polkadot_primitives::parachain::{
ConsolidatedIngressRoots, ConsolidatedIngressRoots,
}; };
use substrate_primitives::crypto::UncheckedInto; use substrate_primitives::crypto::UncheckedInto;
use sr_primitives::traits::Block as BlockT;
use codec::Encode; use codec::Encode;
use substrate_network::{ use substrate_network::{
PeerId, PeerInfo, ClientHandle, Context, config::Roles, PeerId, PeerInfo, ClientHandle, Context, config::Roles,
message::{BlockRequest, generic::ConsensusMessage}, message::{BlockRequest, generic::{ConsensusMessage, FinalityProofRequest}},
specialization::NetworkSpecialization, generic_message::Message as GenericMessage specialization::NetworkSpecialization, generic_message::Message as GenericMessage
}; };
@@ -47,10 +48,6 @@ struct TestContext {
} }
impl Context<Block> for TestContext { impl Context<Block> for TestContext {
fn client(&self) -> &ClientHandle<Block> {
unimplemented!()
}
fn report_peer(&mut self, peer: PeerId, reputation: i32) { fn report_peer(&mut self, peer: PeerId, reputation: i32) {
let reputation = self.reputations.get(&peer).map_or(reputation, |v| v + reputation); let reputation = self.reputations.get(&peer).map_or(reputation, |v| v + reputation);
self.reputations.insert(peer.clone(), reputation); self.reputations.insert(peer.clone(), reputation);
@@ -62,14 +59,6 @@ impl Context<Block> for TestContext {
} }
} }
fn peer_info(&self, _peer: &PeerId) -> Option<PeerInfo<Block>> {
unimplemented!()
}
fn send_block_request(&mut self, _who: PeerId, _request: BlockRequest<Block>) {
unimplemented!()
}
fn send_consensus(&mut self, _who: PeerId, _consensus: ConsensusMessage) { fn send_consensus(&mut self, _who: PeerId, _consensus: ConsensusMessage) {
unimplemented!() unimplemented!()
} }
polkadot/network/src/validation.rs
+2 -2
View File
@@ -360,12 +360,12 @@ impl Knowledge {
// generated by valid execution. // generated by valid execution.
match *statement { match *statement {
GenericStatement::Candidate(ref c) => { GenericStatement::Candidate(ref c) => {
let mut entry = self.candidates.entry(c.hash()).or_insert_with(Default::default); let entry = self.candidates.entry(c.hash()).or_insert_with(Default::default);
entry.knows_block_data.push(from.clone()); entry.knows_block_data.push(from.clone());
entry.knows_extrinsic.push(from); entry.knows_extrinsic.push(from);
} }
GenericStatement::Valid(ref hash) => { GenericStatement::Valid(ref hash) => {
let mut entry = self.candidates.entry(*hash).or_insert_with(Default::default); let entry = self.candidates.entry(*hash).or_insert_with(Default::default);
entry.knows_block_data.push(from.clone()); entry.knows_block_data.push(from.clone());
entry.knows_extrinsic.push(from); entry.knows_extrinsic.push(from);
} }
polkadot/parachain/tests/res/adder.wasm
BIN
View File
Binary file not shown.
polkadot/primitives/Cargo.toml
+6 -6
View File
@@ -8,15 +8,15 @@ serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true }
parity-codec = { version = "3.0", default-features = false } parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false } parity-codec-derive = { version = "3.0", default-features = false }
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
polkadot-parachain = { path = "../parachain", default-features = false } polkadot-parachain = { path = "../parachain", default-features = false }
[dev-dependencies] [dev-dependencies]
substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
pretty_assertions = "0.5.1" pretty_assertions = "0.5.1"
[features] [features]
polkadot/runtime/Cargo.toml
+28 -28
View File
@@ -13,39 +13,39 @@ safe-mix = { version = "1.0", default-features = false}
polkadot-primitives = { path = "../primitives", default-features = false } polkadot-primitives = { path = "../primitives", default-features = false }
parity-codec = { version = "3.0", default-features = false } parity-codec = { version = "3.0", default-features = false }
parity-codec-derive = { version = "3.0", default-features = false } parity-codec-derive = { version = "3.0", default-features = false }
substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-serializer = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-offchain-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-offchain-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-consensus = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-consensus = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-council = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-council = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-indices = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-indices = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
srml-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } srml-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" }
[dev-dependencies] [dev-dependencies]
hex-literal = "0.1.0" hex-literal = "0.1.0"
libsecp256k1 = "0.2.1" libsecp256k1 = "0.2.1"
tiny-keccak = "1.4.2" tiny-keccak = "1.4.2"
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
trie-db = "0.12" trie-db = "0.12"
[features] [features]
polkadot/runtime/src/lib.rs
+1 -1
View File
@@ -302,7 +302,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, system::ChainContext<Runtime>, Balances, AllModules>; pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Balances, Runtime, AllModules>;
impl_runtime_apis! { impl_runtime_apis! {
impl client_api::Core<Block> for Runtime { impl client_api::Core<Block> for Runtime {
polkadot/runtime/src/parachains.rs
+11 -11
View File
@@ -36,7 +36,7 @@ use sr_primitives::{StorageOverlay, ChildrenStorageOverlay};
#[cfg(any(feature = "std", test))] #[cfg(any(feature = "std", test))]
use rstd::marker::PhantomData; use rstd::marker::PhantomData;
use system::ensure_inherent; use system::ensure_none;
pub trait Trait: session::Trait {} pub trait Trait: session::Trait {}
@@ -88,7 +88,7 @@ decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin { pub struct Module<T: Trait> for enum Call where origin: T::Origin {
/// Provide candidate receipts for parachains, in ascending order by id. /// Provide candidate receipts for parachains, in ascending order by id.
fn set_heads(origin, heads: Vec<AttestedCandidate>) -> Result { fn set_heads(origin, heads: Vec<AttestedCandidate>) -> Result {
ensure_inherent(origin)?; ensure_none(origin)?;
ensure!(!<DidUpdate<T>>::exists(), "Parachain heads must be updated only once in the block"); ensure!(!<DidUpdate<T>>::exists(), "Parachain heads must be updated only once in the block");
let active_parachains = Self::active_parachains(); let active_parachains = Self::active_parachains();
@@ -710,7 +710,7 @@ mod tests {
}; };
assert!(Parachains::dispatch(Call::set_heads(vec![candidate]), Origin::INHERENT).is_err()); assert!(Parachains::dispatch(Call::set_heads(vec![candidate]), Origin::NONE).is_err());
}) })
} }
@@ -755,12 +755,12 @@ mod tests {
assert!(Parachains::dispatch( assert!(Parachains::dispatch(
Call::set_heads(vec![candidate_b.clone(), candidate_a.clone()]), Call::set_heads(vec![candidate_b.clone(), candidate_a.clone()]),
Origin::INHERENT, Origin::NONE,
).is_err()); ).is_err());
assert!(Parachains::dispatch( assert!(Parachains::dispatch(
Call::set_heads(vec![candidate_a.clone(), candidate_b.clone()]), Call::set_heads(vec![candidate_a.clone(), candidate_b.clone()]),
Origin::INHERENT, Origin::NONE,
).is_ok()); ).is_ok());
}); });
} }
@@ -794,7 +794,7 @@ mod tests {
assert!(Parachains::dispatch( assert!(Parachains::dispatch(
Call::set_heads(vec![double_validity]), Call::set_heads(vec![double_validity]),
Origin::INHERENT, Origin::NONE,
).is_err()); ).is_err());
}); });
} }
@@ -846,7 +846,7 @@ mod tests {
assert!(Parachains::dispatch( assert!(Parachains::dispatch(
Call::set_heads(vec![candidate_a, candidate_b]), Call::set_heads(vec![candidate_a, candidate_b]),
Origin::INHERENT, Origin::NONE,
).is_ok()); ).is_ok());
assert_eq!( assert_eq!(
@@ -885,7 +885,7 @@ mod tests {
let result = Parachains::dispatch( let result = Parachains::dispatch(
Call::set_heads(vec![candidate.clone()]), Call::set_heads(vec![candidate.clone()]),
Origin::INHERENT, Origin::NONE,
); );
assert_eq!(Err("Routing to non-existent parachain"), result); assert_eq!(Err("Routing to non-existent parachain"), result);
@@ -909,7 +909,7 @@ mod tests {
let result = Parachains::dispatch( let result = Parachains::dispatch(
Call::set_heads(vec![candidate.clone()]), Call::set_heads(vec![candidate.clone()]),
Origin::INHERENT, Origin::NONE,
); );
assert_eq!(Err("Parachain routing to self"), result); assert_eq!(Err("Parachain routing to self"), result);
@@ -933,7 +933,7 @@ mod tests {
let result = Parachains::dispatch( let result = Parachains::dispatch(
Call::set_heads(vec![candidate.clone()]), Call::set_heads(vec![candidate.clone()]),
Origin::INHERENT, Origin::NONE,
); );
assert_eq!(Err("Egress routes out of order by ID"), result); assert_eq!(Err("Egress routes out of order by ID"), result);
@@ -957,7 +957,7 @@ mod tests {
let result = Parachains::dispatch( let result = Parachains::dispatch(
Call::set_heads(vec![candidate.clone()]), Call::set_heads(vec![candidate.clone()]),
Origin::INHERENT, Origin::NONE,
); );
assert_eq!(Err("Empty trie root included"), result); assert_eq!(Err("Empty trie root included"), result);
polkadot/runtime/wasm/Cargo.lock
Generated
+311 -312
View File
@@ -1649,11 +1649,11 @@ dependencies = [
"polkadot-parachain 0.1.0", "polkadot-parachain 0.1.0",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
@@ -1669,32 +1669,32 @@ dependencies = [
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-treasury 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
@@ -2218,8 +2218,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "sr-api-macros" name = "sr-api-macros"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
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-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2230,302 +2230,302 @@ dependencies = [
[[package]] [[package]]
name = "sr-io" name = "sr-io"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "sr-primitives" name = "sr-primitives"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
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)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (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)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "sr-std" name = "sr-std"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
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)",
] ]
[[package]] [[package]]
name = "sr-version" name = "sr-version"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-aura" name = "srml-aura"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-balances" name = "srml-balances"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-consensus" name = "srml-consensus"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-council" name = "srml-council"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-democracy" name = "srml-democracy"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-executive" name = "srml-executive"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-finality-tracker" name = "srml-finality-tracker"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-grandpa" name = "srml-grandpa"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-finality-grandpa-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-indices" name = "srml-indices"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-metadata" name = "srml-metadata"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-session" name = "srml-session"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-staking" name = "srml-staking"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-sudo" name = "srml-sudo"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-support" name = "srml-support"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"paste 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "paste 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-support-procedural" name = "srml-support-procedural"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-api-macros 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support-procedural-tools 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "srml-support-procedural-tools" name = "srml-support-procedural-tools"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
"srml-support-procedural-tools-derive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "srml-support-procedural-tools-derive" name = "srml-support-procedural-tools-derive"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2534,45 +2534,45 @@ dependencies = [
[[package]] [[package]]
name = "srml-system" name = "srml-system"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.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.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-timestamp" name = "srml-timestamp"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "srml-treasury" name = "srml-treasury"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
@@ -2671,8 +2671,8 @@ dependencies = [
[[package]] [[package]]
name = "substrate-client" name = "substrate-client"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2683,48 +2683,48 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-api-macros 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-consensus-aura-primitives" name = "substrate-consensus-aura-primitives"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-consensus-authorities" name = "substrate-consensus-authorities"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-consensus-common" name = "substrate-consensus-common"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2732,17 +2732,17 @@ dependencies = [
"libp2p 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "substrate-executor" name = "substrate-executor"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2751,65 +2751,65 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "substrate-finality-grandpa-primitives" name = "substrate-finality-grandpa-primitives"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-inherents" name = "substrate-inherents"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-keyring" name = "substrate-keyring"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"strum 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"strum_macros 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "strum_macros 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-offchain-primitives" name = "substrate-offchain-primitives"
version = "0.1.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
] ]
[[package]] [[package]]
name = "substrate-panic-handler" name = "substrate-panic-handler"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2817,12 +2817,13 @@ dependencies = [
[[package]] [[package]]
name = "substrate-primitives" name = "substrate-primitives"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"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)",
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hash256-std-hasher 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash256-std-hasher 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2831,23 +2832,21 @@ dependencies = [
"primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"schnorrkel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "schnorrkel 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-bip39 0.2.1 (git+https://github.com/paritytech/substrate-bip39)", "substrate-bip39 0.2.1 (git+https://github.com/paritytech/substrate-bip39)",
"tiny-bip39 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-bip39 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"twox-hash 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "twox-hash 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "substrate-serializer" name = "substrate-serializer"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2855,24 +2854,24 @@ dependencies = [
[[package]] [[package]]
name = "substrate-state-machine" name = "substrate-state-machine"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "substrate-telemetry" name = "substrate-telemetry"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2889,14 +2888,14 @@ dependencies = [
[[package]] [[package]]
name = "substrate-trie" name = "substrate-trie"
version = "1.0.0" version = "2.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238"
dependencies = [ dependencies = [
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)",
"trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "trie-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@@ -3776,31 +3775,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum snow 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a64f02fd208ef15bd2d1a65861df4707e416151e1272d02c8faafad1c138100" "checksum snow 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a64f02fd208ef15bd2d1a65861df4707e416151e1272d02c8faafad1c138100"
"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
"checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55" "checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55"
"checksum sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum sr-api-macros 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum sr-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-support-procedural-tools 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-support-procedural-tools-derive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum srml-treasury 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
"checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
"checksum static_slice 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "92a7e0c5e3dfb52e8fbe0e63a1b947bbb17b4036408b151353c4491374931362" "checksum static_slice 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "92a7e0c5e3dfb52e8fbe0e63a1b947bbb17b4036408b151353c4491374931362"
@@ -3812,21 +3811,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum strum 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1810e25f576e7ffce1ff5243b37066da5ded0310b3274c20baaeccb1145b2806" "checksum strum 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1810e25f576e7ffce1ff5243b37066da5ded0310b3274c20baaeccb1145b2806"
"checksum strum_macros 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "572a2f4e53dd4c3483fd79e5cc10ddd773a3acb1169bbfe8762365e107110579" "checksum strum_macros 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "572a2f4e53dd4c3483fd79e5cc10ddd773a3acb1169bbfe8762365e107110579"
"checksum substrate-bip39 0.2.1 (git+https://github.com/paritytech/substrate-bip39)" = "<none>" "checksum substrate-bip39 0.2.1 (git+https://github.com/paritytech/substrate-bip39)" = "<none>"
"checksum substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-finality-grandpa-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" "checksum substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>"
"checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
"checksum subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "702662512f3ddeb74a64ce2fbbf3707ee1b6bb663d28bb054e0779bbc720d926" "checksum subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "702662512f3ddeb74a64ce2fbbf3707ee1b6bb663d28bb054e0779bbc720d926"
"checksum syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)" = "ec52cd796e5f01d0067225a5392e70084acc4c0013fa71d55166d38a8b307836" "checksum syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)" = "ec52cd796e5f01d0067225a5392e70084acc4c0013fa71d55166d38a8b307836"
polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
BIN
View File
Binary file not shown.
polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
BIN
View File
Binary file not shown.
polkadot/service/Cargo.toml
+12 -11
View File
@@ -17,14 +17,15 @@ polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" } polkadot-runtime = { path = "../runtime" }
polkadot-executor = { path = "../executor" } polkadot-executor = { path = "../executor" }
polkadot-network = { path = "../network" } polkadot-network = { path = "../network" }
sr-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sr-io = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-service = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-keystore = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot/service/src/lib.rs
+65 -13
View File
@@ -28,6 +28,7 @@ extern crate substrate_client as client;
#[macro_use] #[macro_use]
extern crate substrate_service as service; extern crate substrate_service as service;
extern crate substrate_consensus_aura as aura; extern crate substrate_consensus_aura as aura;
extern crate substrate_consensus_common as consensus_common;
extern crate substrate_finality_grandpa as grandpa; extern crate substrate_finality_grandpa as grandpa;
extern crate substrate_transaction_pool as transaction_pool; extern crate substrate_transaction_pool as transaction_pool;
extern crate substrate_telemetry as telemetry; extern crate substrate_telemetry as telemetry;
@@ -41,6 +42,8 @@ extern crate hex_literal;
pub mod chain_spec; pub mod chain_spec;
use client::LongestChain;
use consensus_common::SelectChain;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use polkadot_primitives::{parachain, Block, Hash, BlockId}; use polkadot_primitives::{parachain, Block, Hash, BlockId};
@@ -111,6 +114,8 @@ pub trait PolkadotService {
/// Get a handle to the client. /// Get a handle to the client.
fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>>; fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>>;
fn select_chain(&self) -> Option<client::LongestChain<Self::Backend, Block>>;
/// Get a handle to the network. /// Get a handle to the network.
fn network(&self) -> Arc<NetworkService>; fn network(&self) -> Arc<NetworkService>;
@@ -125,6 +130,11 @@ impl PolkadotService for Service<FullComponents<Factory>> {
fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>> { fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>> {
Service::client(self) Service::client(self)
} }
fn select_chain(&self) -> Option<client::LongestChain<Self::Backend, Block>> {
Service::select_chain(self)
}
fn network(&self) -> Arc<NetworkService> { fn network(&self) -> Arc<NetworkService> {
Service::network(self) Service::network(self)
} }
@@ -142,6 +152,10 @@ impl PolkadotService for Service<LightComponents<Factory>> {
Service::client(self) Service::client(self)
} }
fn select_chain(&self) -> Option<client::LongestChain<Self::Backend, Block>> {
None
}
fn network(&self) -> Arc<NetworkService> { fn network(&self) -> Arc<NetworkService> {
Service::network(self) Service::network(self)
} }
@@ -249,22 +263,31 @@ construct_service_factory! {
let client = service.client(); let client = service.client();
let known_oracle = client.clone(); let known_oracle = client.clone();
let select_chain = if let Some(select_chain) = service.select_chain() {
select_chain
} else {
info!("The node cannot start as an authority because it can't select chain.");
return Ok(service);
};
let gossip_validator_select_chain = select_chain.clone();
let gossip_validator = network_gossip::register_validator( let gossip_validator = network_gossip::register_validator(
&*service.network(), &*service.network(),
move |block_hash: &Hash| { move |block_hash: &Hash| {
use client::{BlockStatus, ChainHead}; use client::BlockStatus;
match known_oracle.block_status(&BlockId::hash(*block_hash)) { match known_oracle.block_status(&BlockId::hash(*block_hash)) {
Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None,
Ok(BlockStatus::KnownBad) => Some(Known::Bad), Ok(BlockStatus::KnownBad) => Some(Known::Bad),
Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => match known_oracle.leaves() { Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => {
Err(_) => None, match gossip_validator_select_chain.leaves() {
Ok(leaves) => if leaves.contains(block_hash) { Err(_) => None,
Some(Known::Leaf) Ok(leaves) => if leaves.contains(block_hash) {
} else { Some(Known::Leaf)
Some(Known::Old) } else {
}, Some(Known::Old)
},
}
} }
} }
}, },
@@ -280,6 +303,7 @@ construct_service_factory! {
); );
let proposer_factory = ::consensus::ProposerFactory::new( let proposer_factory = ::consensus::ProposerFactory::new(
client.clone(), client.clone(),
select_chain.clone(),
validation_network.clone(), validation_network.clone(),
validation_network, validation_network,
service.transaction_pool(), service.transaction_pool(),
@@ -294,6 +318,7 @@ construct_service_factory! {
SlotDuration::get_or_compute(&*client)?, SlotDuration::get_or_compute(&*client)?,
key, key,
client.clone(), client.clone(),
select_chain,
block_import, block_import,
Arc::new(proposer_factory), Arc::new(proposer_factory),
service.network(), service.network(),
@@ -310,10 +335,13 @@ construct_service_factory! {
FullImportQueue = AuraImportQueue< FullImportQueue = AuraImportQueue<
Self::Block, Self::Block,
> >
{ |config: &mut FactoryFullConfiguration<Self>, client: Arc<FullClient<Self>>| { { |config: &mut FactoryFullConfiguration<Self>, client: Arc<FullClient<Self>>, select_chain: Self::SelectChain| {
let slot_duration = SlotDuration::get_or_compute(&*client)?; let slot_duration = SlotDuration::get_or_compute(&*client)?;
let (block_import, link_half) = grandpa::block_import::<_, _, _, RuntimeApi, FullClient<Self>>(client.clone(), client.clone())?; let (block_import, link_half) =
grandpa::block_import::<_, _, _, RuntimeApi, FullClient<Self>, _>(
client.clone(), client.clone(), select_chain
)?;
let block_import = Arc::new(block_import); let block_import = Arc::new(block_import);
let justification_import = block_import.clone(); let justification_import = block_import.clone();
@@ -322,6 +350,8 @@ construct_service_factory! {
slot_duration, slot_duration,
block_import, block_import,
Some(justification_import), Some(justification_import),
None,
None,
client, client,
NothingExtra, NothingExtra,
config.custom.inherent_data_providers.clone(), config.custom.inherent_data_providers.clone(),
@@ -331,16 +361,38 @@ construct_service_factory! {
Self::Block, Self::Block,
> >
{ |config: &mut FactoryFullConfiguration<Self>, client: Arc<LightClient<Self>>| { { |config: &mut FactoryFullConfiguration<Self>, client: Arc<LightClient<Self>>| {
let slot_duration = SlotDuration::get_or_compute(&*client)?; let fetch_checker = client.backend().blockchain().fetcher()
.upgrade()
.map(|fetcher| fetcher.checker().clone())
.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
let block_import = grandpa::light_block_import::<_, _, _, RuntimeApi, LightClient<Self>>(
client.clone(), Arc::new(fetch_checker), client.clone()
)?;
let block_import = Arc::new(block_import);
let finality_proof_import = block_import.clone();
let finality_proof_request_builder = finality_proof_import.create_finality_proof_request_builder();
import_queue::<_, _, _, ed25519::Pair>( import_queue::<_, _, _, ed25519::Pair>(
slot_duration, SlotDuration::get_or_compute(&*client)?,
client.clone(), block_import,
None, None,
Some(finality_proof_import),
Some(finality_proof_request_builder),
client, client,
NothingExtra, NothingExtra,
config.custom.inherent_data_providers.clone(), config.custom.inherent_data_providers.clone(),
).map_err(Into::into) ).map_err(Into::into)
}}, }},
SelectChain = LongestChain<FullBackend<Self>, Self::Block>
{ |config: &FactoryFullConfiguration<Self>, client: Arc<FullClient<Self>>| {
Ok(LongestChain::new(
client.backend().clone(),
client.import_lock()
))
}
},
FinalityProofProvider = { |client: Arc<FullClient<Self>>| {
Ok(Some(Arc::new(grandpa::FinalityProofProvider::new(client.clone(), client)) as _))
}},
} }
} }
polkadot/statement-table/Cargo.toml
+1 -1
View File
@@ -6,5 +6,5 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
parity-codec = "3.0" parity-codec = "3.0"
parity-codec-derive = "3.0" parity-codec-derive = "3.0"
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot-primitives = { path = "../primitives" } polkadot-primitives = { path = "../primitives" }
polkadot/test-parachains/adder/collator/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ adder = { path = ".." }
polkadot-parachain = { path = "../../../parachain" } polkadot-parachain = { path = "../../../parachain" }
polkadot-collator = { path = "../../../collator" } polkadot-collator = { path = "../../../collator" }
polkadot-primitives = { path = "../../../primitives" } polkadot-primitives = { path = "../../../primitives" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
parking_lot = "0.7.1" parking_lot = "0.7.1"
ctrlc = { version = "3.0", features = ["termination"] } ctrlc = { version = "3.0", features = ["termination"] }
futures = "0.1" futures = "0.1"
polkadot/validation/Cargo.toml
+13 -13
View File
@@ -16,18 +16,18 @@ polkadot-parachain = { path = "../parachain" }
polkadot-primitives = { path = "../primitives" } polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" } polkadot-runtime = { path = "../runtime" }
polkadot-statement-table = { path = "../statement-table" } polkadot-statement-table = { path = "../statement-table" }
substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
srml-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } srml-aura = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
[dev-dependencies] [dev-dependencies]
substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" }
polkadot/validation/src/attestation_service.rs
+11 -8
View File
@@ -27,16 +27,17 @@ use std::thread;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use std::sync::Arc; use std::sync::Arc;
use client::{error::Result as ClientResult, BlockchainEvents, ChainHead, BlockBody}; use client::{error::Result as ClientResult, BlockchainEvents, BlockBody};
use client::block_builder::api::BlockBuilder; use client::block_builder::api::BlockBuilder;
use client::blockchain::HeaderBackend; use client::blockchain::HeaderBackend;
use primitives::ed25519; use consensus::SelectChain;
use consensus_authorities::AuthoritiesApi;
use extrinsic_store::Store as ExtrinsicStore;
use futures::prelude::*; use futures::prelude::*;
use primitives::ed25519;
use polkadot_primitives::{Block, BlockId}; use polkadot_primitives::{Block, BlockId};
use polkadot_primitives::parachain::{CandidateReceipt, ParachainHost}; use polkadot_primitives::parachain::{CandidateReceipt, ParachainHost};
use extrinsic_store::Store as ExtrinsicStore;
use runtime_primitives::traits::{ProvideRuntimeApi, Header as HeaderT}; use runtime_primitives::traits::{ProvideRuntimeApi, Header as HeaderT};
use consensus_authorities::AuthoritiesApi;
use tokio::runtime::TaskExecutor; use tokio::runtime::TaskExecutor;
use tokio::runtime::current_thread::Runtime as LocalRuntime; use tokio::runtime::current_thread::Runtime as LocalRuntime;
@@ -102,8 +103,9 @@ pub(crate) struct ServiceHandle {
} }
/// Create and start a new instance of the attestation service. /// Create and start a new instance of the attestation service.
pub(crate) fn start<C, N, P>( pub(crate) fn start<C, N, P, SC>(
client: Arc<P>, client: Arc<P>,
select_chain: SC,
parachain_validation: Arc<::ParachainValidation<C, N, P>>, parachain_validation: Arc<::ParachainValidation<C, N, P>>,
thread_pool: TaskExecutor, thread_pool: TaskExecutor,
key: Arc<ed25519::Pair>, key: Arc<ed25519::Pair>,
@@ -112,12 +114,13 @@ pub(crate) fn start<C, N, P>(
where where
C: Collators + Send + Sync + 'static, C: Collators + Send + Sync + 'static,
<C::Collation as IntoFuture>::Future: Send + 'static, <C::Collation as IntoFuture>::Future: Send + 'static,
P: BlockchainEvents<Block> + ChainHead<Block> + BlockBody<Block>, P: BlockchainEvents<Block> + BlockBody<Block>,
P: ProvideRuntimeApi + HeaderBackend<Block> + Send + Sync + 'static, P: ProvideRuntimeApi + HeaderBackend<Block> + Send + Sync + 'static,
P::Api: ParachainHost<Block> + BlockBuilder<Block> + AuthoritiesApi<Block>, P::Api: ParachainHost<Block> + BlockBuilder<Block> + AuthoritiesApi<Block>,
N: Network + Send + Sync + 'static, N: Network + Send + Sync + 'static,
N::TableRouter: Send + 'static, N::TableRouter: Send + 'static,
<N::BuildTableRouter as IntoFuture>::Future: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static,
SC: SelectChain<Block> + 'static,
{ {
const TIMER_DELAY: Duration = Duration::from_secs(5); const TIMER_DELAY: Duration = Duration::from_secs(5);
const TIMER_INTERVAL: Duration = Duration::from_secs(30); const TIMER_INTERVAL: Duration = Duration::from_secs(30);
@@ -159,14 +162,14 @@ pub(crate) fn start<C, N, P>(
}; };
let prune_old_sessions = { let prune_old_sessions = {
let client = client.clone(); let select_chain = select_chain.clone();
let interval = Interval::new( let interval = Interval::new(
Instant::now() + TIMER_DELAY, Instant::now() + TIMER_DELAY,
TIMER_INTERVAL, TIMER_INTERVAL,
); );
interval interval
.for_each(move |_| match client.leaves() { .for_each(move |_| match select_chain.leaves() {
Ok(leaves) => { Ok(leaves) => {
parachain_validation.retain(|h| leaves.contains(h)); parachain_validation.retain(|h| leaves.contains(h));
Ok(()) Ok(())
polkadot/validation/src/lib.rs
+12 -5
View File
@@ -70,10 +70,11 @@ use std::sync::Arc;
use std::time::{self, Duration, Instant}; use std::time::{self, Duration, Instant};
use aura::SlotDuration; use aura::SlotDuration;
use client::{BlockchainEvents, ChainHead, BlockBody}; use client::{BlockchainEvents, BlockBody};
use client::blockchain::HeaderBackend; use client::blockchain::HeaderBackend;
use client::block_builder::api::BlockBuilder as BlockBuilderApi; use client::block_builder::api::BlockBuilder as BlockBuilderApi;
use codec::Encode; use codec::Encode;
use consensus::SelectChain;
use extrinsic_store::Store as ExtrinsicStore; use extrinsic_store::Store as ExtrinsicStore;
use parking_lot::Mutex; use parking_lot::Mutex;
use polkadot_primitives::{Hash, Block, BlockId, BlockNumber, Header, SessionKey}; use polkadot_primitives::{Hash, Block, BlockId, BlockNumber, Header, SessionKey};
@@ -456,28 +457,31 @@ struct AttestationTracker {
} }
/// Polkadot proposer factory. /// Polkadot proposer factory.
pub struct ProposerFactory<C, N, P, TxApi: PoolChainApi> { pub struct ProposerFactory<C, N, P, SC, TxApi: PoolChainApi> {
parachain_validation: Arc<ParachainValidation<C, N, P>>, parachain_validation: Arc<ParachainValidation<C, N, P>>,
transaction_pool: Arc<Pool<TxApi>>, transaction_pool: Arc<Pool<TxApi>>,
key: Arc<ed25519::Pair>, key: Arc<ed25519::Pair>,
_service_handle: ServiceHandle, _service_handle: ServiceHandle,
aura_slot_duration: SlotDuration, aura_slot_duration: SlotDuration,
select_chain: SC,
} }
impl<C, N, P, TxApi> ProposerFactory<C, N, P, TxApi> where impl<C, N, P, SC, TxApi> ProposerFactory<C, N, P, SC, TxApi> where
C: Collators + Send + Sync + 'static, C: Collators + Send + Sync + 'static,
<C::Collation as IntoFuture>::Future: Send + 'static, <C::Collation as IntoFuture>::Future: Send + 'static,
P: BlockchainEvents<Block> + ChainHead<Block> + BlockBody<Block>, P: BlockchainEvents<Block> + BlockBody<Block>,
P: ProvideRuntimeApi + HeaderBackend<Block> + Send + Sync + 'static, P: ProvideRuntimeApi + HeaderBackend<Block> + Send + Sync + 'static,
P::Api: ParachainHost<Block> + BlockBuilderApi<Block> + AuthoritiesApi<Block>, P::Api: ParachainHost<Block> + BlockBuilderApi<Block> + AuthoritiesApi<Block>,
N: Network + Send + Sync + 'static, N: Network + Send + Sync + 'static,
N::TableRouter: Send + 'static, N::TableRouter: Send + 'static,
<N::BuildTableRouter as IntoFuture>::Future: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static,
TxApi: PoolChainApi, TxApi: PoolChainApi,
SC: SelectChain<Block> + 'static,
{ {
/// Create a new proposer factory. /// Create a new proposer factory.
pub fn new( pub fn new(
client: Arc<P>, client: Arc<P>,
select_chain: SC,
network: N, network: N,
collators: C, collators: C,
transaction_pool: Arc<Pool<TxApi>>, transaction_pool: Arc<Pool<TxApi>>,
@@ -497,6 +501,7 @@ impl<C, N, P, TxApi> ProposerFactory<C, N, P, TxApi> where
let service_handle = ::attestation_service::start( let service_handle = ::attestation_service::start(
client, client,
select_chain.clone(),
parachain_validation.clone(), parachain_validation.clone(),
thread_pool, thread_pool,
key.clone(), key.clone(),
@@ -509,11 +514,12 @@ impl<C, N, P, TxApi> ProposerFactory<C, N, P, TxApi> where
key, key,
_service_handle: service_handle, _service_handle: service_handle,
aura_slot_duration, aura_slot_duration,
select_chain
} }
} }
} }
impl<C, N, P, TxApi> consensus::Environment<Block> for ProposerFactory<C, N, P, TxApi> where impl<C, N, P, SC, TxApi> consensus::Environment<Block> for ProposerFactory<C, N, P, SC, TxApi> where
C: Collators + Send + 'static, C: Collators + Send + 'static,
N: Network, N: Network,
TxApi: PoolChainApi<Block=Block>, TxApi: PoolChainApi<Block=Block>,
@@ -522,6 +528,7 @@ impl<C, N, P, TxApi> consensus::Environment<Block> for ProposerFactory<C, N, P,
<C::Collation as IntoFuture>::Future: Send + 'static, <C::Collation as IntoFuture>::Future: Send + 'static,
N::TableRouter: Send + 'static, N::TableRouter: Send + 'static,
<N::BuildTableRouter as IntoFuture>::Future: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static,
SC: SelectChain<Block>,
{ {
type Proposer = Proposer<P, TxApi>; type Proposer = Proposer<P, TxApi>;
type Error = Error; type Error = Error;