Skip to content
GitLab
Commit 987da512 authored by asynchronous rob's avatar asynchronous rob Committed by Gavin Wood
Browse files

update substrate reference (#249) 

* update substrate reference

* bump wasm
parent 3832fc23
Pipeline #37093 passed with stages
in 13 minutes and 42 seconds
Hide whitespace changes
Inline Side-by-side
Cargo.lock
View file @ 987da512
......@@ -813,7 +813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "fork-tree"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -3105,7 +3105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "sr-api-macros"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3117,7 +3117,7 @@ dependencies = [
[[package]]
name = "sr-io"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"environmental 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3134,7 +3134,7 @@ dependencies = [
[[package]]
name = "sr-primitives"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3149,7 +3149,7 @@ dependencies = [
[[package]]
name = "sr-std"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
......@@ -3157,7 +3157,7 @@ dependencies = [
[[package]]
name = "sr-version"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3169,7 +3169,7 @@ dependencies = [
[[package]]
name = "srml-aura"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3186,7 +3186,7 @@ dependencies = [
[[package]]
name = "srml-balances"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3201,7 +3201,7 @@ dependencies = [
[[package]]
name = "srml-consensus"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3216,7 +3216,7 @@ dependencies = [
[[package]]
name = "srml-council"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3233,7 +3233,7 @@ dependencies = [
[[package]]
name = "srml-democracy"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3248,7 +3248,7 @@ dependencies = [
[[package]]
name = "srml-executive"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3262,7 +3262,7 @@ dependencies = [
[[package]]
name = "srml-finality-tracker"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3276,7 +3276,7 @@ dependencies = [
[[package]]
name = "srml-grandpa"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3294,7 +3294,7 @@ dependencies = [
[[package]]
name = "srml-indices"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3311,7 +3311,7 @@ dependencies = [
[[package]]
name = "srml-metadata"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3322,7 +3322,7 @@ dependencies = [
[[package]]
name = "srml-session"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3338,7 +3338,7 @@ dependencies = [
[[package]]
name = "srml-staking"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3356,7 +3356,7 @@ dependencies = [
[[package]]
name = "srml-sudo"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3370,7 +3370,7 @@ dependencies = [
[[package]]
name = "srml-support"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3388,7 +3388,7 @@ dependencies = [
[[package]]
name = "srml-support-procedural"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3400,7 +3400,7 @@ dependencies = [
[[package]]
name = "srml-support-procedural-tools"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3412,7 +3412,7 @@ dependencies = [
[[package]]
name = "srml-support-procedural-tools-derive"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3422,7 +3422,7 @@ dependencies = [
[[package]]
name = "srml-system"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3437,7 +3437,7 @@ dependencies = [
[[package]]
name = "srml-timestamp"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3451,7 +3451,7 @@ dependencies = [
[[package]]
name = "srml-treasury"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3589,7 +3589,7 @@ dependencies = [
[[package]]
name = "substrate-cli"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3623,13 +3623,12 @@ dependencies = [
[[package]]
name = "substrate-client"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-literal 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3652,7 +3651,7 @@ dependencies = [
[[package]]
name = "substrate-client-db"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)",
......@@ -3674,7 +3673,7 @@ dependencies = [
[[package]]
name = "substrate-consensus-aura"
version = "1.1.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3701,7 +3700,7 @@ dependencies = [
[[package]]
name = "substrate-consensus-aura-primitives"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3710,7 +3709,7 @@ dependencies = [
[[package]]
name = "substrate-consensus-authorities"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3725,7 +3724,7 @@ dependencies = [
[[package]]
name = "substrate-consensus-common"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3743,7 +3742,7 @@ dependencies = [
[[package]]
name = "substrate-consensus-slots"
version = "1.1.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3761,7 +3760,7 @@ dependencies = [
[[package]]
name = "substrate-executor"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3784,7 +3783,7 @@ dependencies = [
[[package]]
name = "substrate-finality-grandpa"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"finality-grandpa 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"fork-tree 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3810,7 +3809,7 @@ dependencies = [
[[package]]
name = "substrate-finality-grandpa-primitives"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3822,7 +3821,7 @@ dependencies = [
[[package]]
name = "substrate-inherents"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3833,7 +3832,7 @@ dependencies = [
[[package]]
name = "substrate-keyring"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3845,7 +3844,7 @@ dependencies = [
[[package]]
name = "substrate-keystore"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3859,7 +3858,7 @@ dependencies = [
[[package]]
name = "substrate-network"
version = "0.1.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3886,7 +3885,7 @@ dependencies = [
[[package]]
name = "substrate-network-libp2p"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3914,7 +3913,7 @@ dependencies = [
[[package]]
name = "substrate-offchain"
version = "0.1.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3932,7 +3931,7 @@ dependencies = [
[[package]]
name = "substrate-offchain-primitives"
version = "0.1.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"sr-primitives 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
"substrate-client 1.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
......@@ -3941,7 +3940,7 @@ dependencies = [
[[package]]
name = "substrate-panic-handler"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3950,7 +3949,7 @@ dependencies = [
[[package]]
name = "substrate-peerset"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"libp2p 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -3963,7 +3962,7 @@ dependencies = [
[[package]]
name = "substrate-primitives"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
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)",
......@@ -3992,7 +3991,7 @@ dependencies = [
[[package]]
name = "substrate-rpc"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4017,7 +4016,7 @@ dependencies = [
[[package]]
name = "substrate-rpc-servers"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"jsonrpc-http-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-pubsub 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4031,7 +4030,7 @@ dependencies = [
[[package]]
name = "substrate-serializer"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4040,7 +4039,7 @@ dependencies = [
[[package]]
name = "substrate-service"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"exit-future 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4073,7 +4072,7 @@ dependencies = [
[[package]]
name = "substrate-state-db"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4084,10 +4083,9 @@ dependencies = [
[[package]]
name = "substrate-state-machine"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 3.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4101,7 +4099,7 @@ dependencies = [
[[package]]
name = "substrate-telemetry"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4119,7 +4117,7 @@ dependencies = [
[[package]]
name = "substrate-transaction-graph"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4133,7 +4131,7 @@ dependencies = [
[[package]]
name = "substrate-transaction-pool"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -4149,7 +4147,7 @@ dependencies = [
[[package]]
name = "substrate-trie"
version = "1.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#ae350506053b186a15fe5ffe2c1e85088b13a619"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#14bc1b40b66ee66beb53efa65cbb25c89e90fc31"
dependencies = [
"hash-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
"memory-db 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
......
network/src/lib.rs
View file @ 987da512
......@@ -60,7 +60,7 @@ use polkadot_primitives::parachain::{
Id as ParaId, BlockData, CollatorId, CandidateReceipt, Collation, PoVBlock,
ConsolidatedIngressRoots,
};
use substrate_network::{PeerId, RequestId, Context, Severity};
use substrate_network::{PeerId, RequestId, Context};
use substrate_network::{message, generic_message};
use substrate_network::specialization::NetworkSpecialization as Specialization;
use substrate_network::StatusMessage as GenericFullStatus;
......@@ -73,6 +73,15 @@ use std::collections::{HashMap, HashSet};
#[cfg(test)]
mod tests;
mod cost {
pub(super) const UNEXPECTED_MESSAGE: i32 = -200;
pub(super) const INVALID_FORMAT: i32 = -200;
pub(super) const UNKNOWN_PEER: i32 = -50;
pub(super) const COLLATOR_ALREADY_KNOWN: i32 = -100;
pub(super) const BAD_COLLATION: i32 = -1000;
}
type FullStatus = GenericFullStatus<Block>;
/// Specialization of the network service for the polkadot protocol.
......@@ -352,7 +361,7 @@ impl PolkadotProtocol {
Message::PovBlock(req_id, data) => self.on_pov_block(ctx, who, req_id, data),
Message::BlockData(_req_id, _data) => {
// current block data is never requested bare by the node.
ctx.report_peer(who, Severity::Bad("Peer sent un-requested block data".to_string()));
ctx.report_peer(who, cost::UNEXPECTED_MESSAGE);
}
Message::Collation(relay_parent, collation) => self.on_collation(ctx, who, relay_parent, collation),
Message::CollatorRole(role) => self.on_new_role(ctx, who, role),
......@@ -370,7 +379,7 @@ impl PolkadotProtocol {
};
if !info.claimed_validator {
ctx.report_peer(who, Severity::Bad("Session key broadcasted without setting authority role".to_string()));
ctx.report_peer(who, cost::UNEXPECTED_MESSAGE);
return;
}
......@@ -419,7 +428,7 @@ impl PolkadotProtocol {
self.pending.push(req);
self.dispatch_pending_requests(ctx);
}
None => ctx.report_peer(who, Severity::Bad("Unexpected block data response".to_string())),
None => ctx.report_peer(who, cost::UNEXPECTED_MESSAGE),
}
}
......@@ -436,10 +445,7 @@ impl PolkadotProtocol {
debug!(target: "p_net", "New collator role {:?} from {}", role, who);
if info.validator_keys.as_slice().is_empty() {
ctx.report_peer(
who,
Severity::Bad("Sent collator role without registering first as validator".to_string()),
);
ctx.report_peer(who, cost::UNEXPECTED_MESSAGE);
} else {
// update role for all saved session keys for this validator.
let local_collations = &mut self.local_collations;
......@@ -484,7 +490,7 @@ impl Specialization<Block> for PolkadotProtocol {
if let Some((ref acc_id, ref para_id)) = local_status.collating_for {
if self.collator_peer(acc_id.clone()).is_some() {
ctx.report_peer(who, Severity::Useless("Unknown Polkadot-specific reason".to_string()));
ctx.report_peer(who, cost::COLLATOR_ALREADY_KNOWN);
return
}
......@@ -563,7 +569,7 @@ impl Specialization<Block> for PolkadotProtocol {
Some(msg) => self.on_polkadot_message(ctx, who, msg),
None => {
trace!(target: "p_net", "Bad message from {}", who);
ctx.report_peer(who, Severity::Bad("Invalid polkadot protocol message format".to_string()));
ctx.report_peer(who, cost::INVALID_FORMAT);
*message = Some(generic_message::Message::ChainSpecific(raw));
}
}
......@@ -607,16 +613,16 @@ impl PolkadotProtocol {
let collated_acc = collation.receipt.collator.clone();
match self.peers.get(&from) {
None => ctx.report_peer(from, Severity::Useless("Unknown Polkadot specific reason".to_string())),
None => ctx.report_peer(from, cost::UNKNOWN_PEER),
Some(peer_info) => match peer_info.collating_for {
None => ctx.report_peer(from, Severity::Bad("Sent collation without registering collator intent".to_string())),
None => ctx.report_peer(from, cost::UNEXPECTED_MESSAGE),
Some((ref acc_id, ref para_id)) => {
let structurally_valid = para_id == &collation_para && acc_id == &collated_acc;
if structurally_valid && collation.receipt.check_signature().is_ok() {
debug!(target: "p_net", "Received collation for parachain {:?} from peer {}", para_id, from);
self.collators.on_collation(acc_id.clone(), relay_parent, collation)
} else {
ctx.report_peer(from, Severity::Bad("Sent malformed collation".to_string()))
ctx.report_peer(from, cost::INVALID_FORMAT)
};
}
},
......@@ -647,7 +653,7 @@ impl PolkadotProtocol {
// disconnect a collator by account-id.
fn disconnect_bad_collator(&mut self, ctx: &mut Context<Block>, collator_id: CollatorId) {
if let Some((who, _)) = self.collator_peer(collator_id) {
ctx.report_peer(who, Severity::Bad("Consensus layer determined the given collator misbehaved".to_string()))
ctx.report_peer(who, cost::BAD_COLLATION)
}
}
}
......
network/src/tests/mod.rs
View file @ 987da512
......@@ -28,7 +28,7 @@ use polkadot_primitives::parachain::{
use substrate_primitives::crypto::UncheckedInto;
use codec::Encode;
use substrate_network::{
Severity, PeerId, PeerInfo, ClientHandle, Context, config::Roles,
PeerId, PeerInfo, ClientHandle, Context, config::Roles,
message::{BlockRequest, generic::ConsensusMessage},
specialization::NetworkSpecialization, generic_message::Message as GenericMessage
};
......@@ -49,10 +49,11 @@ impl Context<Block> for TestContext {
unimplemented!()
}
fn report_peer(&mut self, peer: PeerId, reason: Severity) {
match reason {
Severity::Bad(_) => self.disabled.push(peer),
_ => self.disconnected.push(peer),
fn report_peer(&mut self, peer: PeerId, reputation: i32) {
match reputation {
i if i < -100 => self.disabled.push(peer),
i if i < 0 => self.disconnected.push(peer),
_ => {}
}
}
......@@ -68,9 +69,11 @@ impl Context<Block> for TestContext {
unimplemented!()
}
fn send_chain_specific(&mut self, who: PeerId, message: Vec<u8>){
fn send_chain_specific(&mut self, who: PeerId, message: Vec<u8>) {
self.messages.push((who, message))
}
fn disconnect_peer(&mut self, _who: PeerId) { }
}
impl TestContext {
......
runtime/src/curated_grandpa.rs
View file @ 987da512
......@@ -47,15 +47,29 @@ decl_module! {
if shuffle_period == 0 { return }
if block_number.as_() % shuffle_period == 0 {
let mut seed = system::Module::<T>::random_seed().as_ref().to_vec();
seed.extend(b"grandpa_shuffling");
let mut seed = BlakeTwo256::hash(&seed);
let mut voters = grandpa::Module::<T>::grandpa_authorities();
let voter_count = voters.len();
if voter_count == 0 { return }
let mut seed = {
let phrase = b"grandpa_shuffling";
let seed = system::Module::<T>::random(&phrase[..]);