diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 8cb03aa94b4452d664587e6a42ead7f4869d181e..014adaebc8bf751d50df35978ef1fd790d17f2af 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -30,7 +30,7 @@ dependencies = [ "polkadot-collator 0.1.0", "polkadot-parachain 0.1.0", "polkadot-primitives 0.1.0", - "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]] @@ -812,8 +812,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fork-tree" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2245,7 +2245,7 @@ dependencies = [ "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)", "polkadot-primitives 0.1.0", - "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]] @@ -2256,7 +2256,7 @@ dependencies = [ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-service 0.4.0", - "substrate-cli 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-cli 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2272,10 +2272,11 @@ dependencies = [ "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", "polkadot-validation 0.1.0", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2286,8 +2287,8 @@ dependencies = [ "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-primitives 0.1.0", "reed-solomon-erasure 4.0.0 (git+https://github.com/paritytech/reed-solomon-erasure)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -2295,8 +2296,8 @@ name = "polkadot-executor" version = "0.1.0" dependencies = [ "polkadot-runtime 0.1.0", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -2314,11 +2315,11 @@ dependencies = [ "polkadot-primitives 0.1.0", "polkadot-validation 0.1.0", "slice-group-by 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2345,12 +2346,12 @@ dependencies = [ "pretty_assertions 0.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_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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-serializer 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -2368,34 +2369,34 @@ dependencies = [ "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_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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-treasury 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", "trie-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2416,17 +2417,18 @@ dependencies = [ "polkadot-runtime 0.1.0", "polkadot-validation 0.1.0", "slog 2.4.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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura 1.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-finality-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keystore 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-service 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-pool 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2437,7 +2439,7 @@ dependencies = [ "parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-primitives 0.1.0", - "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]] @@ -2455,19 +2457,19 @@ dependencies = [ "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", "polkadot-statement-table 0.1.0", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura 1.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-finality-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-pool 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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)", + "srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3104,8 +3106,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3116,303 +3118,303 @@ dependencies = [ [[package]] name = "sr-io" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", ] [[package]] name = "sr-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "sr-std" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sr-version" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-aura" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-balances" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-consensus" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-council" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-democracy" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-executive" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-finality-tracker" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-grandpa" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-finality-grandpa-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-indices" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-metadata" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-session" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-staking" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-sudo" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-support" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-support-procedural" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural-tools 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 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)", ] [[package]] name = "srml-support-procedural-tools" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", ] [[package]] name = "srml-support-procedural-tools-derive" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3421,45 +3423,45 @@ dependencies = [ [[package]] name = "srml-system" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-timestamp" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-treasury" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -3588,8 +3590,8 @@ dependencies = [ [[package]] name = "substrate-cli" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3605,16 +3607,16 @@ dependencies = [ "names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (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)", "structopt 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-service 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 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-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "sysinfo 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3622,8 +3624,8 @@ dependencies = [ [[package]] name = "substrate-client" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3634,24 +3636,24 @@ dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-client-db" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", @@ -3660,71 +3662,71 @@ dependencies = [ "lru-cache 0.1.2 (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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-db 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-aura" -version = "1.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.26 (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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-slots 1.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-slots 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-consensus-aura-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-authorities" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3732,35 +3734,35 @@ dependencies = [ "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)", "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-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", ] [[package]] name = "substrate-consensus-slots" -version = "1.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.26 (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)", "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)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-executor" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3769,101 +3771,101 @@ dependencies = [ "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)", "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-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", "wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-finality-grandpa" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "finality-grandpa 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "fork-tree 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "futures 0.1.26 (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)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-service 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 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)", + "srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-finality-grandpa-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-finality-grandpa-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-inherents" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-keyring" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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_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]] name = "substrate-keystore" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (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)", "subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-network" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "bitflags 1.0.4 (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)", - "fork-tree 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "linked_hash_set 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3873,19 +3875,20 @@ dependencies = [ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network-libp2p 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-peerset 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network-libp2p 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-network-libp2p" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3903,7 +3906,7 @@ dependencies = [ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "slog_derive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-peerset 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", + "substrate-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3912,35 +3915,35 @@ dependencies = [ [[package]] name = "substrate-offchain" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "futures 0.1.26 (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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-pool 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-offchain-primitives" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-panic-handler" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -3948,8 +3951,8 @@ dependencies = [ [[package]] name = "substrate-peerset" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "libp2p 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3961,12 +3964,13 @@ dependencies = [ [[package]] name = "substrate-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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)", @@ -3975,23 +3979,21 @@ dependencies = [ "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)", "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)", "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)", "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)", "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)", - "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)", ] [[package]] name = "substrate-rpc" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4002,35 +4004,35 @@ dependencies = [ "parking_lot 0.7.1 (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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-pool 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-rpc-servers" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "jsonrpc-http-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-pubsub 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "jsonrpc-ws-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (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)", - "substrate-rpc 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-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-serializer" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -4038,8 +4040,8 @@ dependencies = [ [[package]] name = "substrate-service" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4051,55 +4053,55 @@ dependencies = [ "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)", "slog 2.4.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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client-db 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keystore 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-offchain 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-rpc-servers 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-pool 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-rpc-servers 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-state-db" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "parking_lot 0.7.1 (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]] name = "substrate-state-machine" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", - "substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-telemetry" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -4116,44 +4118,44 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (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)", - "substrate-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-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-transaction-pool" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.26 (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)", "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)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-transaction-graph 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-trie" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", - "substrate-primitives 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 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-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5032,7 +5034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum fork-tree 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" +"checksum fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" "checksum fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "921d332c89b3b61a826de38c61ee5b6e02c56806cade1b0e5d81bd71f57a71bb" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" @@ -5241,31 +5243,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 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 sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=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-derive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-treasury 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 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" @@ -5281,37 +5283,37 @@ 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_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-cli 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-client-db 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-aura 1.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-slots 1.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-finality-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-keystore 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-network-libp2p 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-offchain 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-peerset 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-rpc 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-rpc-servers 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-service 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-state-db 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-transaction-graph 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-transaction-pool 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-trie 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" +"checksum substrate-cli 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-client-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-consensus-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-consensus-slots 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-network 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-network-libp2p 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-rpc-servers 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-state-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 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" diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml index 30dcb72067f259de6aace10539a580359c1dda77..3eacc1101624bbd05ba10181236f43234e804341 100644 --- a/polkadot/availability-store/Cargo.toml +++ b/polkadot/availability-store/Cargo.toml @@ -9,7 +9,7 @@ polkadot-primitives = { path = "../primitives" } parking_lot = "0.7.1" log = "0.4.6" 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-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml index 33c42519a8e126a8aa43848951c3c8ad1f51371d..0f90dd136fbdfec7a996842881bdead16f5c458b 100644 --- a/polkadot/cli/Cargo.toml +++ b/polkadot/cli/Cargo.toml @@ -9,5 +9,5 @@ log = "0.4.6" tokio = "0.1.7" futures = "0.1.17" 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" } diff --git a/polkadot/collator/Cargo.toml b/polkadot/collator/Cargo.toml index 0cfb99a19a29f7cf97c5d6329c19f74b103b25be..3cae9c3f53ff4c4ae8a3ed50ea87adae97498d83 100644 --- a/polkadot/collator/Cargo.toml +++ b/polkadot/collator/Cargo.toml @@ -6,10 +6,11 @@ description = "Collator node implementation" [dependencies] 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" -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-consensus-authorities = { 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 = "gui-polkadot-master" } +substrate-consensus-common= { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } polkadot-runtime = { path = "../runtime", version = "0.1" } polkadot-primitives = { path = "../primitives", version = "0.1" } polkadot-cli = { path = "../cli" } @@ -19,4 +20,4 @@ log = "0.4" tokio = "0.1.7" [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" } diff --git a/polkadot/collator/src/lib.rs b/polkadot/collator/src/lib.rs index 9462d45198c2a9b36ce72fcd7d448564bca2afc9..4afb9c6c9e245b3ff95284161245e8f463694b56 100644 --- a/polkadot/collator/src/lib.rs +++ b/polkadot/collator/src/lib.rs @@ -49,6 +49,7 @@ extern crate substrate_client as client; extern crate parity_codec as codec; extern crate substrate_primitives as primitives; extern crate substrate_consensus_authorities as consensus_authorities; +extern crate substrate_consensus_common as consensus_common; extern crate tokio; extern crate polkadot_cli; @@ -82,6 +83,7 @@ use polkadot_network::validation::{ValidationNetwork, SessionParams}; use polkadot_network::NetworkService; use tokio::timer::Timeout; use consensus_authorities::AuthoritiesApi; +use consensus_common::SelectChain; pub use polkadot_cli::VersionInfo; pub use polkadot_network::validation::Incoming; @@ -256,18 +258,24 @@ impl<P, E> Worker for CollationNode<P, E> where let client = service.client(); let network = service.network(); 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( &*network, move |block_hash: &Hash| { - use client::{BlockStatus, ChainHead}; + use client::BlockStatus; use polkadot_network::gossip::Known; match known_oracle.block_status(&BlockId::hash(*block_hash)) { Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, Ok(BlockStatus::KnownBad) => Some(Known::Bad), Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => - match known_oracle.leaves() { + match select_chain.leaves() { Err(_) => None, Ok(leaves) => if leaves.contains(block_hash) { Some(Known::Leaf) diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml index 054adbbcfe1da93dad6e5ada3b8733bd8ce44373..d102baebefe665b89205c9ae0e10993815c08700 100644 --- a/polkadot/erasure-coding/Cargo.toml +++ b/polkadot/erasure-coding/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" polkadot-primitives = { path = "../primitives" } reed-solomon-erasure = { git = "https://github.com/paritytech/reed-solomon-erasure" } parity-codec = "3.0" -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-trie = { 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 = "gui-polkadot-master" } diff --git a/polkadot/executor/Cargo.toml b/polkadot/executor/Cargo.toml index 85ce6f709c3ad2f230b52bc2be87afedb8cafd15..c67f518b954ddb4f6d6714bf951245812367f1a1 100644 --- a/polkadot/executor/Cargo.toml +++ b/polkadot/executor/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Parity Technologies <admin@parity.io>"] description = "Polkadot node implementation in Rust." [dependencies] -substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-primitives = { 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 = "gui-polkadot-master" } polkadot-runtime = { path = "../runtime" } diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml index 2a8b58154ef7fd9001be8a211b34f77cf2f1e9a8..2cc706d2412e2dd13b15319896c0618e4595ab84 100644 --- a/polkadot/network/Cargo.toml +++ b/polkadot/network/Cargo.toml @@ -12,9 +12,9 @@ polkadot-validation = { path = "../validation" } polkadot-primitives = { path = "../primitives" } parity-codec = "3.0" parity-codec-derive = "3.0" -substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -sr-primitives = { 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 = "gui-polkadot-master" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } futures = "0.1" tokio = "0.1.7" log = "0.4" @@ -22,5 +22,5 @@ slice-group-by = "0.2.2" exit-future = "0.1.4" [dev-dependencies] -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-keyring = { 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 = "gui-polkadot-master" } diff --git a/polkadot/network/src/tests/mod.rs b/polkadot/network/src/tests/mod.rs index 0304c63a10aeadff85a9ce01968d1e5c34247307..a9d7be3423a2bb40d2a5630989591c712c2e9605 100644 --- a/polkadot/network/src/tests/mod.rs +++ b/polkadot/network/src/tests/mod.rs @@ -27,10 +27,11 @@ use polkadot_primitives::parachain::{ ConsolidatedIngressRoots, }; use substrate_primitives::crypto::UncheckedInto; +use sr_primitives::traits::Block as BlockT; use codec::Encode; use substrate_network::{ PeerId, PeerInfo, ClientHandle, Context, config::Roles, - message::{BlockRequest, generic::ConsensusMessage}, + message::{BlockRequest, generic::{ConsensusMessage, FinalityProofRequest}}, specialization::NetworkSpecialization, generic_message::Message as GenericMessage }; @@ -47,10 +48,6 @@ struct TestContext { } impl Context<Block> for TestContext { - fn client(&self) -> &ClientHandle<Block> { - unimplemented!() - } - fn report_peer(&mut self, peer: PeerId, reputation: i32) { let reputation = self.reputations.get(&peer).map_or(reputation, |v| v + 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) { unimplemented!() } diff --git a/polkadot/network/src/validation.rs b/polkadot/network/src/validation.rs index 5b48e0e02fd6fdb45f28cf22aaa1b4c03719e652..fffbf88c1ac5daeb967fd7ab67894ec4c3510758 100644 --- a/polkadot/network/src/validation.rs +++ b/polkadot/network/src/validation.rs @@ -360,12 +360,12 @@ impl Knowledge { // generated by valid execution. match *statement { 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_extrinsic.push(from); } 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_extrinsic.push(from); } diff --git a/polkadot/parachain/tests/res/adder.wasm b/polkadot/parachain/tests/res/adder.wasm index d7fc5ecf5ee3a35b54da24c5900dad4969bca5e6..0e1aee6a82d899f28618eb76ab6fe2d093764a0a 100644 Binary files a/polkadot/parachain/tests/res/adder.wasm and b/polkadot/parachain/tests/res/adder.wasm differ diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml index 33b0c02ecd8c3a369fef22d6485aa4aabf8455af..d12992e4a36b7c777c8b02a319228638574552d8 100644 --- a/polkadot/primitives/Cargo.toml +++ b/polkadot/primitives/Cargo.toml @@ -8,15 +8,15 @@ serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } parity-codec = { 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-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-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 = "gui-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 = "gui-polkadot-master" } +sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "gui-polkadot-master" } polkadot-parachain = { path = "../parachain", default-features = false } [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" [features] diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml index c9e62a1ea678a017c2e26feba8434ce1edeeb52d..276e4a373efb7f8e485606178f197a7c7105f8ac 100644 --- a/polkadot/runtime/Cargo.toml +++ b/polkadot/runtime/Cargo.toml @@ -13,39 +13,39 @@ safe-mix = { version = "1.0", default-features = false} polkadot-primitives = { path = "../primitives", default-features = false } parity-codec = { 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" } -sr-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -substrate-client = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -substrate-inherents = { 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 = "polkadot-master" } -substrate-offchain-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-consensus = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-council = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-grandpa = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-indices = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-primitives = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -srml-treasury = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" } -sr-version = { 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 = "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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-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 = "gui-polkadot-master" } [dev-dependencies] hex-literal = "0.1.0" libsecp256k1 = "0.2.1" tiny-keccak = "1.4.2" -substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-trie = { 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 = "gui-polkadot-master" } trie-db = "0.12" [features] diff --git a/polkadot/runtime/src/lib.rs b/polkadot/runtime/src/lib.rs index a671f40f27dcf7f399cb1610c51688affaadd299..0f0013652bebca657b8e4f281cfed4a3f930241b 100644 --- a/polkadot/runtime/src/lib.rs +++ b/polkadot/runtime/src/lib.rs @@ -302,7 +302,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>; /// 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 client_api::Core<Block> for Runtime { diff --git a/polkadot/runtime/src/parachains.rs b/polkadot/runtime/src/parachains.rs index a390566bd65f0aaf88555631e9ac1a3b13446f7c..30181ae222ae497bf76443f73e184976dceebf41 100644 --- a/polkadot/runtime/src/parachains.rs +++ b/polkadot/runtime/src/parachains.rs @@ -36,7 +36,7 @@ use sr_primitives::{StorageOverlay, ChildrenStorageOverlay}; #[cfg(any(feature = "std", test))] use rstd::marker::PhantomData; -use system::ensure_inherent; +use system::ensure_none; pub trait Trait: session::Trait {} @@ -88,7 +88,7 @@ decl_module! { pub struct Module<T: Trait> for enum Call where origin: T::Origin { /// Provide candidate receipts for parachains, in ascending order by id. 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"); 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( Call::set_heads(vec![candidate_b.clone(), candidate_a.clone()]), - Origin::INHERENT, + Origin::NONE, ).is_err()); assert!(Parachains::dispatch( Call::set_heads(vec![candidate_a.clone(), candidate_b.clone()]), - Origin::INHERENT, + Origin::NONE, ).is_ok()); }); } @@ -794,7 +794,7 @@ mod tests { assert!(Parachains::dispatch( Call::set_heads(vec![double_validity]), - Origin::INHERENT, + Origin::NONE, ).is_err()); }); } @@ -846,7 +846,7 @@ mod tests { assert!(Parachains::dispatch( Call::set_heads(vec![candidate_a, candidate_b]), - Origin::INHERENT, + Origin::NONE, ).is_ok()); assert_eq!( @@ -885,7 +885,7 @@ mod tests { let result = Parachains::dispatch( Call::set_heads(vec![candidate.clone()]), - Origin::INHERENT, + Origin::NONE, ); assert_eq!(Err("Routing to non-existent parachain"), result); @@ -909,7 +909,7 @@ mod tests { let result = Parachains::dispatch( Call::set_heads(vec![candidate.clone()]), - Origin::INHERENT, + Origin::NONE, ); assert_eq!(Err("Parachain routing to self"), result); @@ -933,7 +933,7 @@ mod tests { let result = Parachains::dispatch( Call::set_heads(vec![candidate.clone()]), - Origin::INHERENT, + Origin::NONE, ); assert_eq!(Err("Egress routes out of order by ID"), result); @@ -957,7 +957,7 @@ mod tests { let result = Parachains::dispatch( Call::set_heads(vec![candidate.clone()]), - Origin::INHERENT, + Origin::NONE, ); assert_eq!(Err("Empty trie root included"), result); diff --git a/polkadot/runtime/wasm/Cargo.lock b/polkadot/runtime/wasm/Cargo.lock index f2ff6c26a238ddf2d352c7668b6321a4f3b2cfe5..5625d536a2f4d403ed27b42cae61d4a3e9cedbb6 100644 --- a/polkadot/runtime/wasm/Cargo.lock +++ b/polkadot/runtime/wasm/Cargo.lock @@ -1649,11 +1649,11 @@ dependencies = [ "polkadot-parachain 0.1.0", "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -1669,32 +1669,32 @@ dependencies = [ "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_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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-treasury 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-serializer 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-aura-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-authorities 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-offchain-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -2218,8 +2218,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2230,302 +2230,302 @@ dependencies = [ [[package]] name = "sr-io" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", ] [[package]] name = "sr-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "sr-std" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sr-version" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-aura" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-balances" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-consensus" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-council" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-democracy" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-executive" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-finality-tracker" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-grandpa" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-finality-grandpa-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-indices" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-metadata" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-session" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-timestamp 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-staking" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-sudo" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-support" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-support-procedural" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support-procedural-tools 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 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)", ] [[package]] name = "srml-support-procedural-tools" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", ] [[package]] name = "srml-support-procedural-tools-derive" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2534,45 +2534,45 @@ dependencies = [ [[package]] name = "srml-system" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-timestamp" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "srml-treasury" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-system 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] @@ -2671,8 +2671,8 @@ dependencies = [ [[package]] name = "substrate-client" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2683,48 +2683,48 @@ dependencies = [ "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)", "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-consensus-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-aura-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-authorities" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-consensus-common" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2732,17 +2732,17 @@ dependencies = [ "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)", "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-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", ] [[package]] name = "substrate-executor" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2751,65 +2751,65 @@ dependencies = [ "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)", "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-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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)", "wasmi 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-finality-grandpa-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", + "substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-inherents" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "sr-std 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-keyring" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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_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]] name = "substrate-offchain-primitives" -version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ - "sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-client 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)", ] [[package]] name = "substrate-panic-handler" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2817,12 +2817,13 @@ dependencies = [ [[package]] name = "substrate-primitives" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", "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)", @@ -2831,23 +2832,21 @@ dependencies = [ "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)", "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)", "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)", "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)", "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)", - "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)", ] [[package]] name = "substrate-serializer" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2855,24 +2854,24 @@ dependencies = [ [[package]] name = "substrate-state-machine" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", - "substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)", - "substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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-root 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-telemetry" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", @@ -2889,14 +2888,14 @@ dependencies = [ [[package]] name = "substrate-trie" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31" +version = "2.0.0" +source = "git+https://github.com/paritytech/substrate?branch=gui-polkadot-master#173c19518539643ddef85761bd6b22252fa5c238" dependencies = [ "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)", "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)", - "substrate-primitives 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 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-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 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 sr-api-macros 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-std 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum sr-version 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-aura 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-balances 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-consensus 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-council 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-democracy 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-executive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-finality-tracker 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-grandpa 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-indices 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-metadata 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-session 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-staking 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-sudo 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-support 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-support-procedural 1.0.0 (git+https://github.com/paritytech/substrate?branch=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-derive 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-system 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-timestamp 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum srml-treasury 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum sr-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-aura 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-consensus 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-council 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-sudo 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum srml-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 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" @@ -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_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-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-aura-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-authorities 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-consensus-common 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-executor 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-finality-grandpa-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-inherents 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-keyring 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-offchain-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-panic-handler 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-serializer 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-state-machine 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-telemetry 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>" -"checksum substrate-trie 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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-primitives 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-polkadot-master)" = "<none>" +"checksum substrate-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=gui-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 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" diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm index 962eab0c40b6e4793b2cc07dbe8ec27d66e276be..53cd46c918319cc05cbc99a3e1d10dbfdf0e3b35 100644 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm differ diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm index 5ec344c5af0e2550ed3f8346c2a0c691c4751b5e..c1b7aef225b508c1754524d338bfe6536b515b78 100755 Binary files a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm and b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm differ diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml index b89f3ee87a8db34babb296d769116d3938cb8ccf..d02282bdd5b23e838520c64b69d2487140244c7d 100644 --- a/polkadot/service/Cargo.toml +++ b/polkadot/service/Cargo.toml @@ -17,14 +17,15 @@ polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime" } polkadot-executor = { path = "../executor" } polkadot-network = { path = "../network" } -sr-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-keystore = { 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 = "gui-polkadot-master" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-service = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "gui-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" } diff --git a/polkadot/service/src/lib.rs b/polkadot/service/src/lib.rs index 7c1413a4f8b6da39cc67c3a31f22cbfbaa24d24a..84d4f31e931353dbff4679d23a306e7953be6b82 100644 --- a/polkadot/service/src/lib.rs +++ b/polkadot/service/src/lib.rs @@ -28,6 +28,7 @@ extern crate substrate_client as client; #[macro_use] extern crate substrate_service as service; 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_transaction_pool as transaction_pool; extern crate substrate_telemetry as telemetry; @@ -41,6 +42,8 @@ extern crate hex_literal; pub mod chain_spec; +use client::LongestChain; +use consensus_common::SelectChain; use std::sync::Arc; use std::time::Duration; use polkadot_primitives::{parachain, Block, Hash, BlockId}; @@ -111,6 +114,8 @@ pub trait PolkadotService { /// Get a handle to the client. 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. 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>> { Service::client(self) } + + fn select_chain(&self) -> Option<client::LongestChain<Self::Backend, Block>> { + Service::select_chain(self) + } + fn network(&self) -> Arc<NetworkService> { Service::network(self) } @@ -142,6 +152,10 @@ impl PolkadotService for Service<LightComponents<Factory>> { Service::client(self) } + fn select_chain(&self) -> Option<client::LongestChain<Self::Backend, Block>> { + None + } + fn network(&self) -> Arc<NetworkService> { Service::network(self) } @@ -249,22 +263,31 @@ construct_service_factory! { let client = service.client(); 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( &*service.network(), move |block_hash: &Hash| { - use client::{BlockStatus, ChainHead}; + use client::BlockStatus; match known_oracle.block_status(&BlockId::hash(*block_hash)) { Err(_) | Ok(BlockStatus::Unknown) | Ok(BlockStatus::Queued) => None, Ok(BlockStatus::KnownBad) => Some(Known::Bad), - Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => match known_oracle.leaves() { - Err(_) => None, - Ok(leaves) => if leaves.contains(block_hash) { - Some(Known::Leaf) - } else { - Some(Known::Old) - }, + Ok(BlockStatus::InChainWithState) | Ok(BlockStatus::InChainPruned) => { + match gossip_validator_select_chain.leaves() { + Err(_) => None, + Ok(leaves) => if leaves.contains(block_hash) { + Some(Known::Leaf) + } else { + Some(Known::Old) + }, + } } } }, @@ -280,6 +303,7 @@ construct_service_factory! { ); let proposer_factory = ::consensus::ProposerFactory::new( client.clone(), + select_chain.clone(), validation_network.clone(), validation_network, service.transaction_pool(), @@ -294,6 +318,7 @@ construct_service_factory! { SlotDuration::get_or_compute(&*client)?, key, client.clone(), + select_chain, block_import, Arc::new(proposer_factory), service.network(), @@ -310,10 +335,13 @@ construct_service_factory! { FullImportQueue = AuraImportQueue< 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 (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 justification_import = block_import.clone(); @@ -322,6 +350,8 @@ construct_service_factory! { slot_duration, block_import, Some(justification_import), + None, + None, client, NothingExtra, config.custom.inherent_data_providers.clone(), @@ -331,16 +361,38 @@ construct_service_factory! { Self::Block, > { |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>( - slot_duration, - client.clone(), + SlotDuration::get_or_compute(&*client)?, + block_import, None, + Some(finality_proof_import), + Some(finality_proof_request_builder), client, NothingExtra, config.custom.inherent_data_providers.clone(), ).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 _)) + }}, } } diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml index b6a80c1eebe8a9dc8897ca131689a061380a6f94..9487128f96c0da55f02824dadd9b69b707a29489 100644 --- a/polkadot/statement-table/Cargo.toml +++ b/polkadot/statement-table/Cargo.toml @@ -6,5 +6,5 @@ authors = ["Parity Technologies <admin@parity.io>"] [dependencies] parity-codec = "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" } diff --git a/polkadot/test-parachains/adder/collator/Cargo.toml b/polkadot/test-parachains/adder/collator/Cargo.toml index 5596580948564fe5a0eca40a5ae40ba772288456..bc2fa30d31d787b337d8c5818091582f4edfe6b8 100644 --- a/polkadot/test-parachains/adder/collator/Cargo.toml +++ b/polkadot/test-parachains/adder/collator/Cargo.toml @@ -8,7 +8,7 @@ adder = { path = ".." } polkadot-parachain = { path = "../../../parachain" } polkadot-collator = { path = "../../../collator" } 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" ctrlc = { version = "3.0", features = ["termination"] } futures = "0.1" diff --git a/polkadot/validation/Cargo.toml b/polkadot/validation/Cargo.toml index 1145e2742c0df5cd6f52d17288308fac2be0de3a..6ce925acfca01b0ebefdc8a08eb8a93ab1e3de04 100644 --- a/polkadot/validation/Cargo.toml +++ b/polkadot/validation/Cargo.toml @@ -16,18 +16,18 @@ polkadot-parachain = { path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime" } polkadot-statement-table = { path = "../statement-table" } -substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -srml-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" } -substrate-consensus-authorities = { 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 = "gui-polkadot-master" } +substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +srml-aura = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-trie = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } +substrate-consensus-authorities = { git = "https://github.com/paritytech/substrate", branch = "gui-polkadot-master" } [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" } diff --git a/polkadot/validation/src/attestation_service.rs b/polkadot/validation/src/attestation_service.rs index 0819b5cbc1e0a71a43648a7fa0642c3cdcc1937d..76a0fce1cba2d93fe2c595f4914e2920149f6ab0 100644 --- a/polkadot/validation/src/attestation_service.rs +++ b/polkadot/validation/src/attestation_service.rs @@ -27,16 +27,17 @@ use std::thread; use std::time::{Duration, Instant}; 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::blockchain::HeaderBackend; -use primitives::ed25519; +use consensus::SelectChain; +use consensus_authorities::AuthoritiesApi; +use extrinsic_store::Store as ExtrinsicStore; use futures::prelude::*; +use primitives::ed25519; use polkadot_primitives::{Block, BlockId}; use polkadot_primitives::parachain::{CandidateReceipt, ParachainHost}; -use extrinsic_store::Store as ExtrinsicStore; use runtime_primitives::traits::{ProvideRuntimeApi, Header as HeaderT}; -use consensus_authorities::AuthoritiesApi; use tokio::runtime::TaskExecutor; 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. -pub(crate) fn start<C, N, P>( +pub(crate) fn start<C, N, P, SC>( client: Arc<P>, + select_chain: SC, parachain_validation: Arc<::ParachainValidation<C, N, P>>, thread_pool: TaskExecutor, key: Arc<ed25519::Pair>, @@ -112,12 +114,13 @@ pub(crate) fn start<C, N, P>( where C: Collators + Send + Sync + '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::Api: ParachainHost<Block> + BlockBuilder<Block> + AuthoritiesApi<Block>, N: Network + Send + Sync + 'static, N::TableRouter: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static, + SC: SelectChain<Block> + 'static, { const TIMER_DELAY: Duration = Duration::from_secs(5); const TIMER_INTERVAL: Duration = Duration::from_secs(30); @@ -159,14 +162,14 @@ pub(crate) fn start<C, N, P>( }; let prune_old_sessions = { - let client = client.clone(); + let select_chain = select_chain.clone(); let interval = Interval::new( Instant::now() + TIMER_DELAY, TIMER_INTERVAL, ); interval - .for_each(move |_| match client.leaves() { + .for_each(move |_| match select_chain.leaves() { Ok(leaves) => { parachain_validation.retain(|h| leaves.contains(h)); Ok(()) diff --git a/polkadot/validation/src/lib.rs b/polkadot/validation/src/lib.rs index 64753e5e2b52f8c125dfcfae768163981bb6337c..e24f226728d029d32785726175468e5be1b6d061 100644 --- a/polkadot/validation/src/lib.rs +++ b/polkadot/validation/src/lib.rs @@ -70,10 +70,11 @@ use std::sync::Arc; use std::time::{self, Duration, Instant}; use aura::SlotDuration; -use client::{BlockchainEvents, ChainHead, BlockBody}; +use client::{BlockchainEvents, BlockBody}; use client::blockchain::HeaderBackend; use client::block_builder::api::BlockBuilder as BlockBuilderApi; use codec::Encode; +use consensus::SelectChain; use extrinsic_store::Store as ExtrinsicStore; use parking_lot::Mutex; use polkadot_primitives::{Hash, Block, BlockId, BlockNumber, Header, SessionKey}; @@ -456,28 +457,31 @@ struct AttestationTracker { } /// 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>>, transaction_pool: Arc<Pool<TxApi>>, key: Arc<ed25519::Pair>, _service_handle: ServiceHandle, 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::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::Api: ParachainHost<Block> + BlockBuilderApi<Block> + AuthoritiesApi<Block>, N: Network + Send + Sync + 'static, N::TableRouter: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static, TxApi: PoolChainApi, + SC: SelectChain<Block> + 'static, { /// Create a new proposer factory. pub fn new( client: Arc<P>, + select_chain: SC, network: N, collators: C, 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( client, + select_chain.clone(), parachain_validation.clone(), thread_pool, key.clone(), @@ -509,11 +514,12 @@ impl<C, N, P, TxApi> ProposerFactory<C, N, P, TxApi> where key, _service_handle: service_handle, 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, N: Network, 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, N::TableRouter: Send + 'static, <N::BuildTableRouter as IntoFuture>::Future: Send + 'static, + SC: SelectChain<Block>, { type Proposer = Proposer<P, TxApi>; type Error = Error;