From 5138feb8011605eb5f17b9ce38ea5dc716a03dff Mon Sep 17 00:00:00 2001
From: Gav <gavin@parity.io>
Date: Thu, 30 Aug 2018 09:57:09 +0200
Subject: [PATCH] Fix up polkadot runtime
---
polkadot/Cargo.lock | 702 +++++++++---------
polkadot/api/Cargo.toml | 18 +-
polkadot/api/src/full.rs | 2 +-
polkadot/availability-store/Cargo.toml | 4 +-
polkadot/cli/Cargo.toml | 2 +-
polkadot/collator/Cargo.toml | 8 +-
polkadot/consensus/Cargo.toml | 16 +-
polkadot/consensus/src/lib.rs | 4 +-
polkadot/consensus/src/service.rs | 2 +-
polkadot/executor/Cargo.toml | 4 +-
polkadot/network/Cargo.toml | 12 +-
polkadot/parachain/Cargo.toml | 4 +-
polkadot/primitives/Cargo.toml | 12 +-
polkadot/runtime/Cargo.toml | 38 +-
polkadot/runtime/src/checked_block.rs | 12 +-
polkadot/runtime/src/lib.rs | 50 +-
polkadot/runtime/src/parachains.rs | 2 +-
polkadot/runtime/src/utils.rs | 8 +-
polkadot/runtime/wasm/Cargo.toml | 30 +-
polkadot/service/Cargo.toml | 14 +-
polkadot/statement-table/Cargo.toml | 6 +-
polkadot/test-parachains/adder/Cargo.toml | 2 +-
.../test-parachains/adder/collator/Cargo.toml | 2 +-
polkadot/transaction-pool/Cargo.toml | 14 +-
24 files changed, 512 insertions(+), 456 deletions(-)
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index bb58d5fd5ed..e624fd0cd15 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -3,7 +3,7 @@ name = "adder"
version = "0.1.0"
dependencies = [
"polkadot-parachain 0.1.0",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -13,7 +13,7 @@ version = "0.1.0"
dependencies = [
"adder 0.1.0",
"ctrlc 1.1.1 (git+https://github.com/paritytech/rust-ctrlc.git)",
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -451,13 +451,13 @@ dependencies = [
[[package]]
name = "ed25519"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
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)",
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -491,7 +491,7 @@ dependencies = [
[[package]]
name = "environmental"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
[[package]]
name = "error-chain"
@@ -1708,15 +1708,15 @@ dependencies = [
"polkadot-executor 0.1.0",
"polkadot-primitives 0.1.0",
"polkadot-runtime 0.1.0",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
@@ -1729,8 +1729,8 @@ dependencies = [
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-primitives 0.1.0",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
@@ -1741,7 +1741,7 @@ dependencies = [
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-service 0.3.0",
- "substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1749,16 +1749,16 @@ dependencies = [
name = "polkadot-collator"
version = "0.1.0"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-api 0.1.0",
"polkadot-cli 0.3.0",
"polkadot-primitives 0.1.0",
"polkadot-runtime 0.1.0",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1766,7 +1766,7 @@ dependencies = [
name = "polkadot-consensus"
version = "0.1.0"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1780,13 +1780,13 @@ dependencies = [
"polkadot-statement-table 0.1.0",
"polkadot-transaction-pool 0.1.0",
"rhododendron 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1795,15 +1795,15 @@ name = "polkadot-executor"
version = "0.1.0"
dependencies = [
"polkadot-runtime 0.1.0",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "polkadot-network"
version = "0.1.0"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1812,11 +1812,11 @@ dependencies = [
"polkadot-consensus 0.1.0",
"polkadot-primitives 0.1.0",
"rhododendron 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1825,8 +1825,8 @@ name = "polkadot-parachain"
version = "0.1.0"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"wasmi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1838,12 +1838,12 @@ dependencies = [
"pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
@@ -1857,30 +1857,32 @@ dependencies = [
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-council 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "polkadot-service"
version = "0.3.0"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1895,12 +1897,12 @@ dependencies = [
"polkadot-runtime 0.1.0",
"polkadot-transaction-pool 0.1.0",
"slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate)",
- "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1909,28 +1911,28 @@ name = "polkadot-statement-table"
version = "0.1.0"
dependencies = [
"polkadot-primitives 0.1.0",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "polkadot-transaction-pool"
version = "0.1.0"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"polkadot-api 0.1.0",
"polkadot-primitives 0.1.0",
"polkadot-runtime 0.1.0",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
@@ -1979,16 +1981,16 @@ dependencies = [
[[package]]
name = "pwasm-alloc"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "pwasm-libc"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
[[package]]
name = "quick-error"
@@ -2488,26 +2490,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "substrate-bft"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rhododendron 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-cli"
version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2524,12 +2526,12 @@ dependencies = [
"names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate)",
- "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"sysinfo 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2538,9 +2540,9 @@ dependencies = [
[[package]]
name = "substrate-client"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2552,23 +2554,23 @@ dependencies = [
"patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
"rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
"slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"triehash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-client-db"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
"kvdb 0.1.0 (git+https://github.com/paritytech/parity-common.git)",
@@ -2576,21 +2578,21 @@ dependencies = [
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-codec"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"arrayvec 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -2598,7 +2600,7 @@ dependencies = [
[[package]]
name = "substrate-codec-derive"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"proc-macro2 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2608,23 +2610,23 @@ dependencies = [
[[package]]
name = "substrate-executor"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"triehash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"twox-hash 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2634,7 +2636,7 @@ dependencies = [
[[package]]
name = "substrate-extrinsic-pool"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2642,16 +2644,16 @@ dependencies = [
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "transaction-pool 1.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "transaction-pool 1.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-keyring"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -2659,9 +2661,9 @@ dependencies = [
[[package]]
name = "substrate-keystore"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"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.1.0 (git+https://github.com/paritytech/parity-common.git)",
@@ -2675,10 +2677,10 @@ dependencies = [
[[package]]
name = "substrate-network"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-io 1.12.0 (git+https://github.com/paritytech/parity.git)",
"futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2686,18 +2688,18 @@ dependencies = [
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-network-libp2p"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2720,7 +2722,7 @@ dependencies = [
[[package]]
name = "substrate-primitives"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2734,9 +2736,9 @@ dependencies = [
"rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"twox-hash 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uint 0.3.0 (git+https://github.com/paritytech/parity-common.git)",
@@ -2746,7 +2748,7 @@ dependencies = [
[[package]]
name = "substrate-rpc"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.2 (git+https://github.com/paritytech/jsonrpc.git)",
@@ -2754,21 +2756,21 @@ dependencies = [
"jsonrpc-pubsub 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-rpc-servers"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"jsonrpc-core 8.0.2 (git+https://github.com/paritytech/jsonrpc.git)",
"jsonrpc-http-server 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)",
@@ -2776,256 +2778,283 @@ dependencies = [
"jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+]
+
+[[package]]
+name = "substrate-runtime-balances"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
+dependencies = [
+ "hex-literal 0.1.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.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-sandbox 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-consensus"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-council"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-democracy"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.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.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-executive"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-io"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
- "environmental 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "environmental 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"triehash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-runtime-primitives"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-sandbox"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"wasmi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-runtime-session"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.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.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-staking"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.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.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-sandbox 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-sandbox 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-std"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "pwasm-alloc 0.1.0 (git+https://github.com/paritytech/substrate)",
- "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "pwasm-alloc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "substrate-runtime-support"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
- "ed25519 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-system"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.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.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-timestamp"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-runtime-version"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-serializer"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"serde 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3034,7 +3063,7 @@ dependencies = [
[[package]]
name = "substrate-service"
version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3046,19 +3075,19 @@ dependencies = [
"serde_derive 1.0.71 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
"slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -3066,19 +3095,19 @@ dependencies = [
[[package]]
name = "substrate-state-db"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
]
[[package]]
name = "substrate-state-machine"
version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"byteorder 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
@@ -3089,14 +3118,14 @@ dependencies = [
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia-trie 0.2.1 (git+https://github.com/paritytech/parity-common.git)",
"rlp 0.2.2 (git+https://github.com/paritytech/parity-common.git)",
- "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)",
+ "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)",
"triehash 0.2.0 (git+https://github.com/paritytech/parity-common.git)",
]
[[package]]
name = "substrate-telemetry"
version = "0.3.0"
-source = "git+https://github.com/paritytech/substrate#fa1392a80371818f2ca6069f9c1e6445d42ea467"
+source = "git+https://github.com/paritytech/substrate?branch=polkadot#7c8f8dfdbdc2d837cf0bc6740b186b0376806d3b"
dependencies = [
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3440,7 +3469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "transaction-pool"
-version = "1.12.3"
+version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3812,12 +3841,12 @@ dependencies = [
"checksum datastore 0.1.0 (git+https://github.com/tomaka/libp2p-rs?rev=6aa139a12dbea3d75d898ce0b2af7fcec129e294)" = "<none>"
"checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8"
"checksum digest 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b29c278aa8fd30796bd977169e8004b4aa88cdcd2f32a6eb22bc2d5d38df94a"
-"checksum ed25519 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum ed25519 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
"checksum edit-distance 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3bd26878c3d921f89797a4e1a1711919f999a9f6946bb6f5a4ffda126d297b7e"
"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
"checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb"
"checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
-"checksum environmental 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum environmental 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
"checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
@@ -3942,8 +3971,8 @@ dependencies = [
"checksum proc-macro2 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "7a17a4d77bc20d344179de803a34694c0ac7a0b3fb4384bee99783215a8e0410"
"checksum protobuf 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "128a4f37a2df739a567a8685b17f54aa19b9c3c4a6a5b8731e97a419b3db451c"
"checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07"
-"checksum pwasm-alloc 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum pwasm-alloc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum pwasm-libc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
"checksum quick-error 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb6ccf8db7bbcb9c2eae558db5ab4f3da1c2a87e4e597ed394726bc8ea6ca1d"
"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
"checksum quote 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ed7d650913520df631972f21e104a4fa2f9c82a14afc65d17b388a2e29731e7c"
@@ -4007,40 +4036,41 @@ dependencies = [
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
"checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-client 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-network 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-council 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-sandbox 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-service 0.3.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate)" = "<none>"
-"checksum substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate)" = "<none>"
+"checksum substrate-bft 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-codec 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-codec-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-extrinsic-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-sandbox 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-runtime-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
+"checksum substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=polkadot)" = "<none>"
"checksum subtle 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc7f6353c2ee5407358d063a14cccc1630804527090a6fb5a9489ce4924280fb"
"checksum syn 0.14.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b7bfcbb0c068d0f642a0ffbd5c604965a360a61f99e8add013cef23a838614f3"
"checksum sysinfo 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "394abcf30852ac00878ab01642b13668db48d166d945f250c7bdbb9e12d75ad0"
@@ -4074,7 +4104,7 @@ dependencies = [
"checksum tokio-udp 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43eb534af6e8f37d43ab1b612660df14755c42bd003c5f8d2475ee78cc4600c0"
"checksum trace-time 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5aea07da6582e957c6e737eeb63a5af79e648eeeaaaba8fd9a417f1124bafa41"
"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-"checksum transaction-pool 1.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0f1fc049d9f039d3e9264f97f978309b94b5a5c56a5c18d28f91f469cef2b367"
+"checksum transaction-pool 1.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fdb8870eea404a57e2f62056ac45067a53a6207fd31866122356481d3c2e1a30"
"checksum triehash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2033893a813c70e7d8a739ca6c36dc0a7a2c913ec718d7cbf84a3837bbe3c7ce"
"checksum triehash 0.2.0 (git+https://github.com/paritytech/parity-common.git)" = "<none>"
"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2"
diff --git a/polkadot/api/Cargo.toml b/polkadot/api/Cargo.toml
index 019b2339acb..e8ba327280d 100644
--- a/polkadot/api/Cargo.toml
+++ b/polkadot/api/Cargo.toml
@@ -8,14 +8,14 @@ error-chain = "0.12"
polkadot-executor = { path = "../executor" }
polkadot-runtime = { path = "../runtime" }
polkadot-primitives = { path = "../primitives" }
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-io = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-executive = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-client = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-executor = { git = "https://github.com/paritytech/substrate" }
-substrate-state-machine = { git = "https://github.com/paritytech/substrate" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
[dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/substrate" }
+substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
diff --git a/polkadot/api/src/full.rs b/polkadot/api/src/full.rs
index 7ccffecd1d7..ffead5f26cc 100644
--- a/polkadot/api/src/full.rs
+++ b/polkadot/api/src/full.rs
@@ -121,7 +121,7 @@ impl<B: LocalBackend<Block, KeccakHasher, RlpCodec>> PolkadotApi for Client<B, L
}
fn lookup(&self, at: &BlockId, address: Address) -> Result<Option<AccountId>> {
- with_runtime!(self, at, || <::runtime::Staking as AuxLookup>::lookup(address).ok())
+ with_runtime!(self, at, || <::runtime::Balances as AuxLookup>::lookup(address).ok())
}
fn active_parachains(&self, at: &BlockId) -> Result<Vec<ParaId>> {
diff --git a/polkadot/availability-store/Cargo.toml b/polkadot/availability-store/Cargo.toml
index 66dc3e78f62..e26f946547f 100644
--- a/polkadot/availability-store/Cargo.toml
+++ b/polkadot/availability-store/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
polkadot-primitives = { path = "../primitives" }
parking_lot = "0.4"
log = "0.3"
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
kvdb = { git = "https://github.com/paritytech/parity-common.git" }
kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common.git" }
kvdb-memorydb = { git = "https://github.com/paritytech/parity-common.git" }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index a3ab18f0f57..47fa33182a3 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -9,5 +9,5 @@ log = "0.3"
tokio = "0.1.7"
futures = "0.1.17"
exit-future = "0.1"
-substrate-cli = { git = "https://github.com/paritytech/substrate" }
+substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
polkadot-service = { path = "../service" }
diff --git a/polkadot/collator/Cargo.toml b/polkadot/collator/Cargo.toml
index 568e4a13db3..c4a923c94da 100644
--- a/polkadot/collator/Cargo.toml
+++ b/polkadot/collator/Cargo.toml
@@ -6,13 +6,13 @@ description = "Collator node implementation"
[dependencies]
futures = "0.1.17"
-substrate-client = { git = "https://github.com/paritytech/substrate" }
-substrate-codec = { git = "https://github.com/paritytech/substrate", version = "0.1" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", version = "0.1" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
polkadot-api = { path = "../api" }
polkadot-runtime = { path = "../runtime", version = "0.1" }
polkadot-primitives = { path = "../primitives", version = "0.1" }
polkadot-cli = { path = "../cli" }
log = "0.4"
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
tokio = "0.1.7"
diff --git a/polkadot/consensus/Cargo.toml b/polkadot/consensus/Cargo.toml
index d2565a772f9..0fb66c831a4 100644
--- a/polkadot/consensus/Cargo.toml
+++ b/polkadot/consensus/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
futures = "0.1.17"
parking_lot = "0.4"
tokio = "0.1.7"
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
@@ -19,12 +19,12 @@ polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" }
polkadot-statement-table = { path = "../statement-table" }
polkadot-transaction-pool = { path = "../transaction-pool" }
-substrate-bft = { git = "https://github.com/paritytech/substrate" }
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-support = { git = "https://github.com/paritytech/substrate" }
-substrate-client = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate" }
+substrate-bft = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
[dev-dependencies]
-substrate-keyring = { git = "https://github.com/paritytech/substrate" }
+substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
diff --git a/polkadot/consensus/src/lib.rs b/polkadot/consensus/src/lib.rs
index 944f3f85d5d..4a848c4241b 100644
--- a/polkadot/consensus/src/lib.rs
+++ b/polkadot/consensus/src/lib.rs
@@ -549,8 +549,8 @@ impl<C> bft::Proposer<Block> for Proposer<C>
// refuse to vote if this block says a validator is offline that we
// think isn't.
- let offline = proposal.noted_offline();
- if !self.offline.read().check_consistency(&self.validators[..], offline) {
+ let missed_proposal = proposal.noted_missed_proposal();
+ if !self.offline.read().check_consistency(&self.validators[..], missed_proposal) {
return Box::new(futures::empty());
}
diff --git a/polkadot/consensus/src/service.rs b/polkadot/consensus/src/service.rs
index b2880a57522..088ba10dbfc 100644
--- a/polkadot/consensus/src/service.rs
+++ b/polkadot/consensus/src/service.rs
@@ -212,7 +212,7 @@ impl Service {
let mut prev_best = match client.best_block_header() {
Ok(header) => header.hash(),
Err(e) => {
- warn!("Cant's start consensus service. Error reading best block header: {:?}", e);
+ warn!("Can't start consensus service. Error reading best block header: {:?}", e);
return;
}
};
diff --git a/polkadot/executor/Cargo.toml b/polkadot/executor/Cargo.toml
index 5c45e4431ac..86e80f05c30 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" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
+substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
polkadot-runtime = { path = "../runtime" }
diff --git a/polkadot/network/Cargo.toml b/polkadot/network/Cargo.toml
index 7d6e0dd16a2..419de013131 100644
--- a/polkadot/network/Cargo.toml
+++ b/polkadot/network/Cargo.toml
@@ -10,12 +10,12 @@ polkadot-api = { path = "../api" }
polkadot-availability-store = { path = "../availability-store" }
polkadot-consensus = { path = "../consensus" }
polkadot-primitives = { path = "../primitives" }
-substrate-bft = { git = "https://github.com/paritytech/substrate" }
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate" }
-substrate-network = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+substrate-bft = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index e9d2d2160c8..5ae7f5f6428 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains"
[dependencies]
-substrate-codec = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate", default-features = false }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
wasmi = { version = "0.4", optional = true }
error-chain = { version = "0.12", optional = true }
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index 503f84d26e8..e6798b0fbb9 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -6,14 +6,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
serde = { version = "1.0", default_features = false }
serde_derive = { version = "1.0", optional = true }
-substrate-codec = { git = "https://github.com/paritytech/substrate", default_features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate", default_features = false }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", default_features = false }
-substrate-runtime-std = { git = "https://github.com/paritytech/substrate", default_features = false }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", default_features = false }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default_features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default_features = false }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default_features = false }
+substrate-runtime-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default_features = false }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default_features = false }
[dev-dependencies]
-substrate-serializer = { git = "https://github.com/paritytech/substrate" }
+substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
pretty_assertions = "0.4"
[features]
diff --git a/polkadot/runtime/Cargo.toml b/polkadot/runtime/Cargo.toml
index 2f2f237492c..17845f60c66 100644
--- a/polkadot/runtime/Cargo.toml
+++ b/polkadot/runtime/Cargo.toml
@@ -10,23 +10,25 @@ serde = { version = "1.0", default_features = false }
serde_derive = { version = "1.0", optional = true }
safe-mix = { version = "1.0", default_features = false}
polkadot-primitives = { path = "../primitives", default_features = false }
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-serializer = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-std = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-io = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-support = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-keyring = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-consensus = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-council = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-democracy = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-executive = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-session = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-staking = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-system = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-timestamp = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-version = { git = "https://github.com/paritytech/substrate" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-council = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
[dev-dependencies]
hex-literal = "0.1.0"
@@ -36,10 +38,12 @@ default = ["std"]
std = [
"polkadot-primitives/std",
"substrate-codec/std",
+ "substrate-codec-derive/std",
"substrate-primitives/std",
"substrate-runtime-std/std",
"substrate-runtime-io/std",
"substrate-runtime-support/std",
+ "substrate-runtime-balances/std",
"substrate-runtime-consensus/std",
"substrate-runtime-council/std",
"substrate-runtime-democracy/std",
diff --git a/polkadot/runtime/src/checked_block.rs b/polkadot/runtime/src/checked_block.rs
index d193d26963f..5965264db57 100644
--- a/polkadot/runtime/src/checked_block.rs
+++ b/polkadot/runtime/src/checked_block.rs
@@ -16,10 +16,10 @@
//! Typesafe block interaction.
-use super::{Call, Block, TIMESTAMP_SET_POSITION, PARACHAINS_SET_POSITION, NOTE_OFFLINE_POSITION};
+use super::{Call, Block, TIMESTAMP_SET_POSITION, PARACHAINS_SET_POSITION, NOTE_MISSED_PROPOSAL_POSITION};
use timestamp::Call as TimestampCall;
use parachains::Call as ParachainsCall;
-use session::Call as SessionCall;
+use staking::Call as StakingCall;
use primitives::parachain::CandidateReceipt;
/// Provides a type-safe wrapper around a structurally valid block.
@@ -90,10 +90,10 @@ impl CheckedBlock {
}
}
- /// Extract the noted offline validator indices (if any) from the block.
- pub fn noted_offline(&self) -> &[u32] {
- self.inner.extrinsics.get(NOTE_OFFLINE_POSITION as usize).and_then(|xt| match xt.extrinsic.function {
- Call::Session(SessionCall::note_offline(ref x)) => Some(&x[..]),
+ /// Extract the noted missed proposal validator indices (if any) from the block.
+ pub fn noted_missed_proposal(&self) -> &[u32] {
+ self.inner.extrinsics.get(NOTE_MISSED_PROPOSAL_POSITION as usize).and_then(|xt| match xt.extrinsic.function {
+ Call::Staking(StakingCall::note_missed_proposal(ref x)) => Some(&x[..]),
_ => None,
}).unwrap_or(&[])
}
diff --git a/polkadot/runtime/src/lib.rs b/polkadot/runtime/src/lib.rs
index 6239b10bef7..9404bd7022b 100644
--- a/polkadot/runtime/src/lib.rs
+++ b/polkadot/runtime/src/lib.rs
@@ -45,9 +45,12 @@ extern crate substrate_primitives;
#[macro_use]
extern crate substrate_runtime_std as rstd;
+#[macro_use]
+extern crate substrate_codec_derive;
extern crate polkadot_primitives as primitives;
extern crate substrate_codec as codec;
+extern crate substrate_runtime_balances as balances;
extern crate substrate_runtime_consensus as consensus;
extern crate substrate_runtime_council as council;
extern crate substrate_runtime_democracy as democracy;
@@ -67,7 +70,7 @@ mod utils;
#[cfg(feature = "std")]
pub use checked_block::CheckedBlock;
pub use utils::{inherent_extrinsics, check_extrinsic};
-pub use staking::address::Address as RawAddress;
+pub use balances::address::Address as RawAddress;
use primitives::{AccountId, AccountIndex, Balance, BlockNumber, Hash, Index, Log, SessionKey, Signature};
use runtime_primitives::{generic, traits::{HasPublicAux, BlakeTwo256, Convert}};
@@ -85,11 +88,11 @@ pub use primitives::Header;
pub const TIMESTAMP_SET_POSITION: u32 = 0;
/// The position of the parachains set extrinsic.
pub const PARACHAINS_SET_POSITION: u32 = 1;
-/// The position of the offline nodes noting extrinsic.
-pub const NOTE_OFFLINE_POSITION: u32 = 2;
+/// The position of the note_missed_proposal extrinsic in the block, if it exists.
+pub const NOTE_MISSED_PROPOSAL_POSITION: u32 = 2;
/// The address format for describing accounts.
-pub type Address = staking::Address<Concrete>;
+pub type Address = balances::Address<Concrete>;
/// Block Id type for this block.
pub type BlockId = generic::BlockId<Block>;
/// Unchecked extrinsic type as expected by this runtime.
@@ -136,10 +139,21 @@ impl system::Trait for Concrete {
type Digest = generic::Digest<Log>;
type AccountId = AccountId;
type Header = Header;
+ type Event = Event;
}
/// System module for this concrete runtime.
pub type System = system::Module<Concrete>;
+impl balances::Trait for Concrete {
+ type Balance = Balance;
+ type AccountIndex = AccountIndex;
+ type OnFreeBalanceZero = Staking;
+ type IsAccountLiquid = Staking;
+ type Event = Event;
+}
+/// Staking module for this concrete runtime.
+pub type Balances = balances::Module<Concrete>;
+
impl consensus::Trait for Concrete {
type SessionKey = SessionKey;
}
@@ -162,17 +176,16 @@ impl Convert<AccountId, SessionKey> for SessionKeyConversion {
}
impl session::Trait for Concrete {
- const NOTE_OFFLINE_POSITION: u32 = NOTE_OFFLINE_POSITION;
type ConvertAccountIdToSessionKey = SessionKeyConversion;
type OnSessionChange = Staking;
+ type Event = Event;
}
/// Session module for this concrete runtime.
pub type Session = session::Module<Concrete>;
impl staking::Trait for Concrete {
- type Balance = Balance;
- type AccountIndex = AccountIndex;
- type OnAccountKill = ();
+ const NOTE_MISSED_PROPOSAL_POSITION: u32 = NOTE_MISSED_PROPOSAL_POSITION;
+ type Event = Event;
}
/// Staking module for this concrete runtime.
pub type Staking = staking::Module<Concrete>;
@@ -196,15 +209,22 @@ impl parachains::Trait for Concrete {
}
pub type Parachains = parachains::Module<Concrete>;
+impl_outer_event! {
+ pub enum Event for Concrete {
+ balances, session, staking
+ }
+}
+
impl_outer_dispatch! {
/// Call type for polkadot transactions.
#[derive(Clone, PartialEq, Eq)]
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub enum Call where aux: <Concrete as HasPublicAux>::PublicAux {
Consensus = 0,
- Session = 1,
- Staking = 2,
- Timestamp = 3,
+ Balances = 1,
+ Session = 2,
+ Staking = 3,
+ Timestamp = 4,
Democracy = 5,
Council = 6,
CouncilVoting = 7,
@@ -216,8 +236,9 @@ impl_outer_dispatch! {
#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
pub enum PrivCall {
Consensus = 0,
- Session = 1,
- Staking = 2,
+ Balances = 1,
+ Session = 2,
+ Staking = 3,
Democracy = 5,
Council = 6,
CouncilVoting = 7,
@@ -226,13 +247,14 @@ impl_outer_dispatch! {
}
/// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<Concrete, Block, Staking, Staking,
+pub type Executive = executive::Executive<Concrete, Block, Balances, Balances,
(((((((), Parachains), Council), Democracy), Staking), Session), Timestamp)>;
impl_outer_config! {
pub struct GenesisConfig for Concrete {
ConsensusConfig => consensus,
SystemConfig => system,
+ BaalncesConfig => balances,
SessionConfig => session,
StakingConfig => staking,
DemocracyConfig => democracy,
diff --git a/polkadot/runtime/src/parachains.rs b/polkadot/runtime/src/parachains.rs
index 19c9613835c..528b85b01e1 100644
--- a/polkadot/runtime/src/parachains.rs
+++ b/polkadot/runtime/src/parachains.rs
@@ -158,7 +158,7 @@ impl<T: Trait> Module<T> {
ensure!(aux.is_empty(), "set_heads must not be signed");
ensure!(!<DidUpdate<T>>::exists(), "Parachain heads must be updated only once in the block");
ensure!(
- <system::Module<T>>::extrinsic_index() == T::SET_POSITION,
+ <system::Module<T>>::extrinsic_index() == Some(T::SET_POSITION),
"Parachain heads update extrinsic must be at position {} in the block"
// , T::SET_POSITION
);
diff --git a/polkadot/runtime/src/utils.rs b/polkadot/runtime/src/utils.rs
index efeb17e883e..93f55928a76 100644
--- a/polkadot/runtime/src/utils.rs
+++ b/polkadot/runtime/src/utils.rs
@@ -17,11 +17,11 @@
//! Utils for block interaction.
use rstd::prelude::*;
-use super::{Call, UncheckedExtrinsic, Extrinsic, Staking};
+use super::{Call, UncheckedExtrinsic, Extrinsic, Balances};
use runtime_primitives::traits::{Checkable, AuxLookup};
use timestamp::Call as TimestampCall;
use parachains::Call as ParachainsCall;
-use session::Call as SessionCall;
+use staking::Call as StakingCall;
/// Produces the list of inherent extrinsics.
pub fn inherent_extrinsics(data: ::primitives::InherentData) -> Vec<UncheckedExtrinsic> {
@@ -41,7 +41,7 @@ pub fn inherent_extrinsics(data: ::primitives::InherentData) -> Vec<UncheckedExt
if !data.offline_indices.is_empty() {
inherent.push(make_inherent(
- Call::Session(SessionCall::note_offline(data.offline_indices))
+ Call::Staking(StakingCall::note_missed_proposal(data.offline_indices))
));
}
@@ -50,5 +50,5 @@ pub fn inherent_extrinsics(data: ::primitives::InherentData) -> Vec<UncheckedExt
/// Checks an unchecked extrinsic for validity.
pub fn check_extrinsic(xt: UncheckedExtrinsic) -> bool {
- xt.check_with(Staking::lookup).is_ok()
+ xt.check_with(Balances::lookup).is_ok()
}
diff --git a/polkadot/runtime/wasm/Cargo.toml b/polkadot/runtime/wasm/Cargo.toml
index bc108822c5a..e583b12e21d 100644
--- a/polkadot/runtime/wasm/Cargo.toml
+++ b/polkadot/runtime/wasm/Cargo.toml
@@ -10,21 +10,21 @@ crate-type = ["cdylib"]
integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" }
polkadot-primitives = { path = "../../primitives", default-features = false }
safe-mix = { version = "1.0", default-features = false }
-substrate-codec = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-std = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-io = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-support = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-consensus = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-council = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-democracy = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-executive = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-session = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-staking = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-system = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false }
-substrate-runtime-version = { git = "https://github.com/paritytech/substrate", default-features = false }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-council = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
+substrate-runtime-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
[features]
default = []
diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
index 2de430603a3..fd7e65e70c5 100644
--- a/polkadot/service/Cargo.toml
+++ b/polkadot/service/Cargo.toml
@@ -11,7 +11,7 @@ log = "0.3"
slog = "^2"
tokio = "0.1.7"
hex-literal = "0.1"
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
polkadot-availability-store = { path = "../availability-store" }
polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" }
@@ -20,9 +20,9 @@ polkadot-executor = { path = "../executor" }
polkadot-api = { path = "../api" }
polkadot-transaction-pool = { path = "../transaction-pool" }
polkadot-network = { path = "../network" }
-substrate-runtime-io = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-network = { git = "https://github.com/paritytech/substrate" }
-substrate-client = { git = "https://github.com/paritytech/substrate" }
-substrate-service = { git = "https://github.com/paritytech/substrate" }
-substrate-telemetry = { git = "https://github.com/paritytech/substrate" }
+substrate-runtime-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index 25522ce6f31..0f33495e149 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
polkadot-primitives = { path = "../primitives" }
diff --git a/polkadot/test-parachains/adder/Cargo.toml b/polkadot/test-parachains/adder/Cargo.toml
index 98da71517fd..cde37e9e7cb 100644
--- a/polkadot/test-parachains/adder/Cargo.toml
+++ b/polkadot/test-parachains/adder/Cargo.toml
@@ -6,5 +6,5 @@ description = "Test parachain which adds to a number as its state transition"
[dependencies]
polkadot-parachain = { path = "../../parachain/", default-features = false }
-substrate-codec-derive = { git = "https://github.com/paritytech/substrate", default-features = false }
+substrate-codec-derive = { git = "https://github.com/paritytech/substrate", branch = "polkadot", default-features = false }
tiny-keccak = "1.4"
diff --git a/polkadot/test-parachains/adder/collator/Cargo.toml b/polkadot/test-parachains/adder/collator/Cargo.toml
index ed735ae310e..6a2179b7660 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" }
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
parking_lot = "0.4"
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
futures = "0.1"
diff --git a/polkadot/transaction-pool/Cargo.toml b/polkadot/transaction-pool/Cargo.toml
index d27480cd285..524a4136cae 100644
--- a/polkadot/transaction-pool/Cargo.toml
+++ b/polkadot/transaction-pool/Cargo.toml
@@ -10,10 +10,10 @@ parking_lot = "0.4"
polkadot-api = { path = "../api" }
polkadot-primitives = { path = "../primitives" }
polkadot-runtime = { path = "../runtime" }
-substrate-client = { git = "https://github.com/paritytech/substrate" }
-substrate-codec = { git = "https://github.com/paritytech/substrate" }
-substrate-keyring = { git = "https://github.com/paritytech/substrate" }
-substrate-extrinsic-pool = { git = "https://github.com/paritytech/substrate" }
-substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate" }
-ed25519 = { git = "https://github.com/paritytech/substrate" }
+substrate-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-codec = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-extrinsic-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+substrate-runtime-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
+ed25519 = { git = "https://github.com/paritytech/substrate", branch = "polkadot" }
--
GitLab