diff --git a/Cargo.lock b/Cargo.lock index 6b8f52a8d8cf..50da5b08fdc9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "MacTypes-sys" version = "2.1.0" @@ -28,7 +30,7 @@ dependencies = [ "polkadot-collator 0.1.0", "polkadot-parachain 0.1.0", "polkadot-primitives 0.1.0", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -262,6 +264,15 @@ dependencies = [ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "block-buffer" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "block-buffer" version = "0.3.3" @@ -273,7 +284,7 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -526,6 +537,15 @@ name = "crunchy" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "crypto-mac" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crypto-mac" version = "0.6.2" @@ -607,6 +627,14 @@ name = "difference" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "digest" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "digest" version = "0.7.6" @@ -650,6 +678,18 @@ dependencies = [ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "ed25519-dalek" +version = "1.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "either" version = "1.5.0" @@ -663,18 +703,6 @@ dependencies = [ "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "env_logger" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "env_logger" version = "0.6.0" @@ -744,15 +772,15 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -835,6 +863,15 @@ name = "gcc" version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "generic-array" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "generic-array" version = "0.9.0" @@ -887,12 +924,12 @@ dependencies = [ [[package]] name = "hash-db" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "hash256-std-hasher" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crunchy 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -936,6 +973,16 @@ dependencies = [ "proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hmac" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crypto-mac 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "hmac" version = "0.6.3" @@ -945,6 +992,16 @@ dependencies = [ "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hmac-drbg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "hmac 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "http" version = "0.1.15" @@ -1024,10 +1081,10 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1070,8 +1127,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "jsonrpc-core" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1080,35 +1137,35 @@ dependencies = [ "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "jsonrpc-derive" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "jsonrpc-http-server" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "hyper 0.12.23 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-server-utils 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-server-utils 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "jsonrpc-macros" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" -dependencies = [ - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-pubsub 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "jsonrpc-pubsub" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1116,12 +1173,12 @@ dependencies = [ [[package]] name = "jsonrpc-server-utils" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1132,18 +1189,23 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "10.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git#c519eeb4975fa4868ec42877c735c3c6d61fa749" +version = "10.1.0" +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)", - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-server-utils 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-server-utils 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-ws 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "keccak" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "kernel32-sys" version = "0.2.2" @@ -1574,6 +1636,19 @@ dependencies = [ "make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libsecp256k1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "linked-hash-map" version = "0.4.2" @@ -1622,24 +1697,6 @@ name = "make-cmd" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "mashup" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "mashup-impl 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "mashup-impl" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "matches" version = "0.1.8" @@ -1661,10 +1718,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memory-db" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1673,6 +1730,17 @@ name = "memory_units" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "merlin" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "mime" version = "0.2.6" @@ -1903,6 +1971,15 @@ dependencies = [ "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parity-codec" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parity-codec-derive" version = "2.2.0" @@ -1913,6 +1990,16 @@ dependencies = [ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parity-codec-derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parity-crypto" version = "0.3.0" @@ -2047,6 +2134,26 @@ dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "paste" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "paste-impl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-hack 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "paste-impl" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -2081,10 +2188,11 @@ dependencies = [ "kvdb-memorydb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)", "kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (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-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -2095,8 +2203,7 @@ dependencies = [ "futures 0.1.25 (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.14", - "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2110,8 +2217,8 @@ dependencies = [ "polkadot-cli 0.3.14", "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2123,22 +2230,25 @@ dependencies = [ "exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-availability-store 0.1.0", "polkadot-parachain 0.1.0", "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", "polkadot-statement-table 0.1.0", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2147,8 +2257,8 @@ name = "polkadot-executor" version = "0.1.0" dependencies = [ "polkadot-runtime 0.1.0", - "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -2158,16 +2268,16 @@ dependencies = [ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-availability-store 0.1.0", "polkadot-consensus 0.1.0", "polkadot-primitives 0.1.0", "rhododendron 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2186,17 +2296,17 @@ dependencies = [ name = "polkadot-primitives" version = "0.1.0" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -2206,38 +2316,39 @@ dependencies = [ "bitvec 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-primitives 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-indices 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-treasury 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-upgrade-key 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-indices 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-treasury 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-upgrade-key 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -2256,15 +2367,16 @@ dependencies = [ "polkadot-primitives 0.1.0", "polkadot-runtime 0.1.0", "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2272,10 +2384,10 @@ dependencies = [ name = "polkadot-statement-table" version = "0.1.0" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-primitives 0.1.0", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -2289,15 +2401,23 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.1.6" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fixed-hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "impl-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "impl-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "uint 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "proc-macro-crate" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "proc-macro-hack" version = "0.4.1" @@ -2306,6 +2426,16 @@ dependencies = [ "proc-macro-hack-impl 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "proc-macro-hack-impl" version = "0.4.1" @@ -2674,6 +2804,22 @@ dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "schnorrkel" +version = "0.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clear_on_drop 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "curve25519-dalek 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "merlin 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sha3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "scoped-tls" version = "0.1.2" @@ -2757,6 +2903,18 @@ name = "sha1" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "sha2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sha2" version = "0.7.1" @@ -2773,12 +2931,24 @@ name = "sha2" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "block-buffer 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "sha3" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "shell32-sys" version = "0.1.2" @@ -2861,9 +3031,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "sr-api-macros" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" 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)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2872,39 +3043,41 @@ dependencies = [ [[package]] name = "sr-io" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sr-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "sr-std" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2912,286 +3085,271 @@ dependencies = [ [[package]] name = "sr-version" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-balances" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-consensus" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-council" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-democracy" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-executive" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-indices" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-metadata" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-session" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-staking" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-sudo" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-support" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-support-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support-procedural-tools 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support-procedural-tools 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "srml-support-procedural-tools" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ + "proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", - "srml-support-procedural-tools-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "srml-support-procedural-tools-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "srml-support-procedural-tools-derive" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3201,72 +3359,67 @@ dependencies = [ [[package]] name = "srml-system" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-treasury" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "srml-upgrade-key" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] @@ -3369,14 +3522,13 @@ dependencies = [ [[package]] name = "substrate-cli" version = "0.3.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" 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)", "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3385,15 +3537,16 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sysinfo 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-panic-handler 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sysinfo 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3401,218 +3554,252 @@ dependencies = [ [[package]] name = "substrate-client" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "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.25 (registry+https://github.com/rust-lang/crates.io-index)", - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (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.2 (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)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-client-db" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "kvdb-rocksdb 0.1.4 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura-slots 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-consensus-aura-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", +] + +[[package]] +name = "substrate-consensus-aura-slots" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" +dependencies = [ + "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.25 (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.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-executor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" 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)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libsecp256k1 0.2.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 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-panic-handler 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-finality-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "finality-grandpa 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "finality-grandpa 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-finality-grandpa-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", +] + +[[package]] +name = "substrate-inherents" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" +dependencies = [ + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-keyring" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-keystore" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-crypto 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-network" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-network-libp2p" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3622,7 +3809,7 @@ dependencies = [ "libp2p 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3634,26 +3821,38 @@ dependencies = [ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "substrate-panic-handler" +version = "0.1.0" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" +dependencies = [ + "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "substrate-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hash256-std-hasher 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash256-std-hasher 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "primitive-types 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "schnorrkel 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "twox-hash 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3662,46 +3861,47 @@ dependencies = [ [[package]] name = "substrate-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-macros 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-pubsub 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-derive 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)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "tokio 0.1.15 (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?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "jsonrpc-http-server 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-pubsub 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", - "jsonrpc-ws-server 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)", + "jsonrpc-http-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-pubsub 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "jsonrpc-ws-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-serializer" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3710,31 +3910,31 @@ dependencies = [ [[package]] name = "substrate-service" version = "0.3.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "exit-future 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3742,36 +3942,37 @@ dependencies = [ [[package]] name = "substrate-state-db" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-state-machine" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (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.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 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "trie-db 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-root 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-panic-handler 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "trie-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-root 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "substrate-telemetry" version = "0.3.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3786,7 +3987,7 @@ dependencies = [ [[package]] name = "substrate-transaction-graph" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3794,35 +3995,35 @@ dependencies = [ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-transaction-pool" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", - "substrate-transaction-graph 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)", + "sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", + "substrate-transaction-graph 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)", ] [[package]] name = "substrate-trie" version = "0.4.0" -source = "git+https://github.com/paritytech/substrate?branch=alexander-backports#dcf5a916de642f003dcdafb3d3abd832539b8944" +source = "git+https://github.com/paritytech/substrate?branch=v0.10#71fb444830ad8bebb0fb7fd0bbaa9ac9c67092bb" dependencies = [ - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-db 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-root 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memory-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "trie-root 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3858,7 +4059,7 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4160,6 +4361,14 @@ dependencies = [ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "toml" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "traitobject" version = "0.1.0" @@ -4167,21 +4376,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "trie-db" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "trie-root" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4518,8 +4727,9 @@ dependencies = [ "checksum bitvec 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e37e2176261200377c7cde4c6de020394174df556c356f965e4bc239f5ce1c5a" "checksum blake2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91721a6330935673395a0607df4d49a9cb90ae12d259f1b3e0a3f6e1d486872e" "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +"checksum block-buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1339a1042f5d9f295737ad4d9a6ab6bf81c84a933dba110b9200cd6d1448b814" "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" -"checksum block-buffer 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "509de513cca6d92b6aacf9c61acfe7eaa160837323a81068d690cc1f8e5740da" +"checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d" "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" "checksum block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d75255892aeb580d3c566f213a2b6fdc1c66667839f45719ee1d30ebf2aea591" "checksum bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0de79cfb98e7aa9988188784d8664b4b5dad6eaaa0863b91d9a4ed871d4f7a42" @@ -4550,6 +4760,7 @@ dependencies = [ "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" "checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda" "checksum crunchy 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c240f247c278fa08a6d4820a6a222bfc6e0d999e51ba67be94f44c905b2161f2" +"checksum crypto-mac 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "779015233ac67d65098614aec748ac1c756ab6677fa2e14cf8b37c08dfed1198" "checksum crypto-mac 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7afa06d05a046c7a47c3a849907ec303504608c927f4e85f7bfff22b7180d971" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "044f882973b245404e90c90e7e42e8ee8d7a64edfd7adf83d684fb97e8e2c1b6" @@ -4559,14 +4770,15 @@ dependencies = [ "checksum curve25519-dalek 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dae47cc3529cdab597dbc8b606e565707209b506e55848f3c15679214a56c956" "checksum data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f47ca1860a761136924ddd2422ba77b2ea54fe8cc75b9040804a0d9d32ad97" "checksum difference 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" +"checksum digest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5b29bf156f3f4b3c4f610a25ff69370616ae6e0657d416de22645483e72af0a" "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" "checksum digest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f47366984d3ad862010e22c7ce81a7dbcaebbdfb37241a620f8b6596ee135c" "checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" "checksum dns-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" "checksum ed25519-dalek 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cd66d8a16ef71c23cf5eeb2140d8d3cd293457c6c7fd6804b593397a933fcf1e" +"checksum ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81956bcf7ef761fb4e1d88de3fa181358a0d26cbcb9755b587a08f9119824b86" "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.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" "checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e" "checksum environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db746025e3ea695bfa0ae744dbacd5fcfc8db51b9760cf8bd0ab69708bb93c49" "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" @@ -4575,7 +4787,7 @@ dependencies = [ "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" "checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa" -"checksum finality-grandpa 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a1dffe3c9d4c59d964f25cea31880e56c20414cdae7efe2269411238f850ad39" +"checksum finality-grandpa 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d415e902db2b87bd5a7df7a2b2de97a4566727a23b95ff39e1bfec25a66d4d1c" "checksum fixed-hash 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a557e80084b05c32b455963ff565a9de6f2866da023d6671705c6aff6f65e01c" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -4588,37 +4800,41 @@ dependencies = [ "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum generic-array 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c0f28c2f5bfb5960175af447a2da7c18900693738343dc896ffbcabd9839592" +"checksum generic-array 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fceb69994e330afed50c93524be68c42fa898c2d9fd4ee8da03bd7363acd26f2" "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865" "checksum h2 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb2b25a33e231484694267af28fec74ac63b5ccf51ee2065a5e313b834d836e" -"checksum hash-db 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc5ec43724866bbc8337e09cab4d4b5f9fdbbe589f04bdc8bfda906a639ad338" -"checksum hash256-std-hasher 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5fc2d94c8e127b205b3caf6fd3013fb5e5b314234bb0b9bea6588c52fddbb82b" +"checksum hash-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b03501f6e1a2a97f1618879aba3156f14ca2847faa530c4e28859638bd11483" +"checksum hash256-std-hasher 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5c13dbac3cc50684760f54af18545c9e80fb75e93a3e586d71ebdc13138f6a4" "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461" "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae0e5c30fb65e661a0e39860e37100dfbe4d39aff865e9357a6a4ed0b5bbf303" "checksum hex-literal-impl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d340b6514f232f6db1bd16db65302a5278a04fef9ce867cb932e7e5fa21130a" +"checksum hmac 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7a13f4163aa0c5ca1be584aace0e2212b2e41be5478218d4f657f5f778b2ae2a" "checksum hmac 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "733e1b3ac906631ca01ebb577e9bb0f5e37a454032b9036b5eaea4013ed6f99a" +"checksum hmac-drbg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4fe727d41d2eec0a6574d887914347e5ff96a3b87177817e2a9820c5c87fecc2" "checksum http 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "1a10e5b573b9a0146545010f50772b9e8b1dd0a256564cc4307694c68832a2f5" "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c" "checksum hyper 0.12.23 (registry+https://github.com/rust-lang/crates.io-index)" = "860faf61a9957c9cb0e23e69f1c8290e92f6eb660fcdd1f2d6777043a2ae1a46" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum impl-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c88568d828291c50eed30cd7fb9f8e688ad0013620186fa3e777b9f206c79f2" +"checksum impl-codec 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2050d823639fbeae26b2b5ba09aca8907793117324858070ade0673c49f793b" "checksum impl-serde 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5158079de9d4158e0ce1de3ae0bd7be03904efc40b3d7dd8b8c301cbf6b52b56" "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d" "checksum integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ea155abb3ba6f382a75f1418988c05fe82959ed9ce727de427f9cfd425b0c903" "checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" -"checksum jsonrpc-core 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" -"checksum jsonrpc-http-server 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" -"checksum jsonrpc-macros 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" -"checksum jsonrpc-pubsub 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" -"checksum jsonrpc-server-utils 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" -"checksum jsonrpc-ws-server 10.0.1 (git+https://github.com/paritytech/jsonrpc.git)" = "" +"checksum jsonrpc-core 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc15eef5f8b6bef5ac5f7440a957ff95d036e2f98706947741bfc93d1976db4c" +"checksum jsonrpc-derive 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c2dae61ca8a3b047fb11309b00661bc56837085bd07e46f907b9c562c0b03e68" +"checksum jsonrpc-http-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11d2a00824306155b8ef57fe957f31b8cd8ad24262f15cf911d84dcf9a3f206d" +"checksum jsonrpc-pubsub 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37fce55133ee264d0ab42bd862efcd45ae1d062cda599f4cc12ccc4be3195f2a" +"checksum jsonrpc-server-utils 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c9527f01ef25f251d64082cbefc0c6d6f367349afe6848ef908a674e06b2bdd3" +"checksum jsonrpc-ws-server 10.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3889012aa638a2f18eb1a879f46fc8b34e7e1423cbff3247cd1531de0d51084b" +"checksum keccak 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)" = "" "checksum kvdb 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" @@ -4649,6 +4865,7 @@ dependencies = [ "checksum libp2p-websocket 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80602e23cf58b92d47142a32560c19417f8e9113017eb105f5e580f3bbeb8bc" "checksum libp2p-yamux 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de9a2ed873051c7a85ec7dece746d425564c366b87752e83056c33d8ae758dcf" "checksum librocksdb-sys 5.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b9024327233e7fac7982440f73301c00046d438c5b1011e8f4e394226ce19007" +"checksum libsecp256k1 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "688e8d65e495567c2c35ea0001b26b9debf0b4ea11f8cccc954233b75fc3428a" "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939" "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -4656,13 +4873,12 @@ dependencies = [ "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21" "checksum make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3" -"checksum mashup 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f2d82b34c7fb11bb41719465c060589e291d505ca4735ea30016a91f6fc79c3b" -"checksum mashup-impl 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "aa607bfb674b4efb310512527d64266b065de3f894fc52f84efcbf7eaa5965fb" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" -"checksum memory-db 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0c940ff365f921ac747e7a009d8f9688105acf956f3fbb7fd967920737e935d" +"checksum memory-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94da53143d45f6bad3753f532e56ad57a6a26c0ca6881794583310c7cb4c885f" "checksum memory_units 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +"checksum merlin 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "83c2dda19c01176e8e7148f7bdb88bbdf215a8db0641f89fc40e4b81736aeda5" "checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40" @@ -4689,7 +4905,9 @@ dependencies = [ "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=616b40150ded71f57f650067fcbc5c99d7c343e6)" = "" "checksum parity-bytes 0.1.0 (git+https://github.com/paritytech/parity-common?rev=b0317f649ab2c665b7987b8475878fc4d2e1f81d)" = "" "checksum parity-codec 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e7b6a1290fe78aa6bbb5f3338ecede3062687a98b9e40cd1dbcaa47261d44097" +"checksum parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88f69984317b736dceac3baa86600fc089856f69b44b07231f39b5648b02bcd4" "checksum parity-codec-derive 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2632f530f37c8b939c7c194636a82ecbe41ab115e74e88f947ad41e483bbf19" +"checksum parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a58ba33211595f92cc2163ac583961d3dc767e656934146636b05256cc9acd7f" "checksum parity-crypto 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b9db194dfbcfe3b398d63d765437a5c7232d59906e203055f0e993f6458ff1" "checksum parity-multiaddr 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9a8e5d637787fe097ec1bfca2aa3eb687396518003df991c6c7216d86682d5ff" "checksum parity-multihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e8eab0287ccde7821e337a124dc5a4f1d6e4c25d10cc91e3f9361615dd95076" @@ -4702,12 +4920,16 @@ dependencies = [ "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +"checksum paste 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f50392d1265092fbee9273414cc40eb6d47d307bd66222c477bb8450c8504f9d" +"checksum paste-impl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a3cd512fe3a55e8933b2dcad913e365639db86d512e4004c3084b86864d9467a" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "28ea5118e2f41bfbc974b28d88c07621befd1fa5d6ec23549be96302a1a59dd2" -"checksum primitive-types 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f98b65b49b3979da4f94651c07a60a7879374d7d49de0036ecd116ee25c975b5" +"checksum primitive-types 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edb92f1ebfc177432c03287b15d48c202e6e2c95993a7af3ba039abb43b1492e" +"checksum proc-macro-crate 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4c6cf4e5b00300d151dfffae39f529dfa5188f42eeb14201229aa420d6aad10c" "checksum proc-macro-hack 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2c725b36c99df7af7bf9324e9c999b9e37d92c8f8caf106d82e1d7953218d2d8" +"checksum proc-macro-hack 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3e90aa19cd73dedc2d0e1e8407473f073d735fef0ab521438de6da8ee449ab66" "checksum proc-macro-hack-impl 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2b753ad9ed99dd8efeaa7d2fb8453c8f6bc3e54b97966d35f1bc77ca6865254a" "checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4" "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" @@ -4752,6 +4974,7 @@ dependencies = [ "checksum safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f7bf422d23a88c16d5090d455f182bc99c60af4df6a345c63428acf5129e347" "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" "checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56" +"checksum schnorrkel 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fe554f318830b48e5da8ab1ccb1ffd02b79228364dac7766b7cd1ec461ca5116" "checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum secp256k1 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfaccd3a23619349e0878d9a241f34b1982343cdf67367058cd7d078d326b63e" @@ -4763,8 +4986,10 @@ dependencies = [ "checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea" "checksum serde_json 1.0.38 (registry+https://github.com/rust-lang/crates.io-index)" = "27dce848e7467aa0e2fcaf0a413641499c0b745452aaca1194d24dedde9e13c9" "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +"checksum sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d963c78ce367df26d7ea8b8cc655c651b42e8a1e584e869c1e17dae3ccb116a" "checksum sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" +"checksum sha3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34a5e54083ce2b934bf059fdf38e7330a154177e029ab6c4e18638f2f624053a" "checksum shell32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e" @@ -4774,31 +4999,31 @@ dependencies = [ "checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" "checksum snow 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2ce0dd923ee41918b1e5a63f19d6443fa3d951868a87b691bd30674e91ad5aa2" "checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55" -"checksum sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-indices 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-support-procedural-tools 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-support-procedural-tools-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-treasury 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum srml-upgrade-key 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" +"checksum sr-api-macros 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum sr-io 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum sr-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum sr-std 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum sr-version 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-balances 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-consensus 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-council 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-democracy 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-executive 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-indices 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-metadata 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-session 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-staking 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-sudo 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-support 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-support-procedural 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-support-procedural-tools 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-support-procedural-tools-derive 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-system 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-timestamp 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-treasury 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum srml-upgrade-key 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" "checksum static_slice 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "92a7e0c5e3dfb52e8fbe0e63a1b947bbb17b4036408b151353c4491374931362" @@ -4811,35 +5036,38 @@ dependencies = [ "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3" "checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04" -"checksum substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-consensus-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-transaction-graph 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" -"checksum substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=alexander-backports)" = "" +"checksum substrate-cli 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-client 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-client-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-consensus-aura 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-consensus-aura-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-consensus-aura-slots 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-consensus-common 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-executor 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-finality-grandpa 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-finality-grandpa-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-inherents 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-keyring 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-keystore 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-network 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-network-libp2p 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-panic-handler 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-primitives 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-rpc 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-rpc-servers 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-serializer 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-service 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-state-db 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-state-machine 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-telemetry 0.3.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-transaction-graph 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-transaction-pool 0.1.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" +"checksum substrate-trie 0.4.0 (git+https://github.com/paritytech/substrate?branch=v0.10)" = "" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" "checksum subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "702662512f3ddeb74a64ce2fbbf3707ee1b6bb663d28bb054e0779bbc720d926" "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" -"checksum sysinfo 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c747a1fbe091faa7bf76c19f40099f9f12495384c811485d81cf3d60c0eae62" +"checksum sysinfo 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4da1ccc493b46042d6f5352910a7f18ed8fe81307dd7db3f2e2d8a7db6f6284" "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" "checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" @@ -4866,9 +5094,10 @@ dependencies = [ "checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" +"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -"checksum trie-db 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec6ceb1ad749359cedcf6fa95d7b5104acf70e871e2416e71cabcc3a8b2dbb8" -"checksum trie-root 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6294c313431d8bd2dda88db3a57550c4911dd6f7f0e8be6001e23c1e6cbdcf1b" +"checksum trie-db 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c7319e28ca295f27359d944a682f7f65b419158bf1590c92cadc0000258d788" +"checksum trie-root 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c6fef2705af3258ec46a7e22286090394a44216201a1cf7d04b78db825e543" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" "checksum twofish 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d261e83e727c8e2dbb75dacac67c36e35db36a958ee504f2164fc052434e1" "checksum twox-hash 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "555cd4909480122bbbf21e34faac4cb08a171f324775670447ed116726c474af" diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml index ad9c6aa3550e..2499061fb05e 100644 --- a/availability-store/Cargo.toml +++ b/availability-store/Cargo.toml @@ -8,8 +8,9 @@ authors = ["Parity Technologies "] polkadot-primitives = { path = "../primitives" } parking_lot = "0.4" log = "0.3" -parity-codec = "2.1" -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +parity-codec = "3.0" +parity-codec-derive = "3.0" +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } kvdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="616b40150ded71f57f650067fcbc5c99d7c343e6" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f04460406922..7d66f667f7ef 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -9,6 +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", branch = "alexander-backports" } +substrate-cli = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } polkadot-service = { path = "../service" } -structopt = "0.2.13" diff --git a/cli/src/lib.rs b/cli/src/lib.rs index d72ccf3b5d87..b0232a341471 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -25,7 +25,6 @@ extern crate tokio; extern crate substrate_cli as cli; extern crate polkadot_service as service; extern crate exit_future; -extern crate structopt; #[macro_use] extern crate log; @@ -36,7 +35,6 @@ use std::ops::Deref; use chain_spec::ChainSpec; use futures::Future; use tokio::runtime::Runtime; -use structopt::StructOpt; use service::Service as BareService; pub use service::{ @@ -44,7 +42,7 @@ pub use service::{ ProvideRuntimeApi, CoreApi, ParachainHost, }; -pub use cli::{VersionInfo, IntoExit}; +pub use cli::{VersionInfo, IntoExit, NoCustom}; pub use cli::error; fn load_spec(id: &str) -> Result, String> { @@ -85,42 +83,33 @@ pub fn run(args: I, worker: W, version: cli::VersionInfo) -> error::Res T: Into + Clone, W: Worker, { - let full_version = polkadot_service::full_version_from_strs( - version.version, - version.commit - ); - - let matches = match cli::CoreParams::clap() - .name(version.executable_name) - .author(version.author) - .about(version.description) - .version(&(full_version + "\n")[..]) - .get_matches_from_safe(args) { - Ok(m) => m, - Err(e) => e.exit(), - }; - - let (spec, mut config) = cli::parse_matches::(load_spec, &version, "parity-polkadot", &matches)?; - - match cli::execute_default::(spec, worker, &matches, &config)? { - cli::Action::ExecutedInternally => (), - cli::Action::RunService(worker) => { - info!("Parity ·:· Polkadot"); + cli::parse_and_execute::( + load_spec, &version, "parity-polkadot", args, worker, + |worker, _custom_args, mut config| { + info!("{}", version.name); info!(" version {}", config.full_version()); - info!(" by Parity Technologies, 2017, 2018"); + info!(" by {}, 2017-2019", version.author); info!("Chain specification: {}", config.chain_spec.name()); info!("Node name: {}", config.name); info!("Roles: {:?}", config.roles); config.custom = worker.configuration(); - let mut runtime = Runtime::new()?; + let runtime = Runtime::new().map_err(|e| format!("{:?}", e))?; let executor = runtime.executor(); - match config.roles == service::Roles::LIGHT { - true => run_until_exit(runtime, Factory::new_light(config, executor)?, worker)?, - false => run_until_exit(runtime, Factory::new_full(config, executor)?, worker)?, - } + match config.roles { + service::Roles::LIGHT => + run_until_exit( + runtime, + Factory::new_light(config, executor).map_err(|e| format!("{:?}", e))?, + worker + ), + _ => run_until_exit( + runtime, + Factory::new_full(config, executor).map_err(|e| format!("{:?}", e))?, + worker + ), + }.map_err(|e| format!("{:?}", e)) } - } - Ok(()) + ).map_err(Into::into).map(|_| ()) } fn run_until_exit( diff --git a/collator/Cargo.toml b/collator/Cargo.toml index 22cc5e2b0cbe..c693f3c27b9b 100644 --- a/collator/Cargo.toml +++ b/collator/Cargo.toml @@ -6,9 +6,9 @@ description = "Collator node implementation" [dependencies] futures = "0.1.17" -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } parity-codec = "2.1" -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } polkadot-runtime = { path = "../runtime", version = "0.1" } polkadot-primitives = { path = "../primitives", version = "0.1" } polkadot-cli = { path = "../cli" } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index 57944a6cac3c..e5ee5ead968e 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -10,20 +10,23 @@ tokio = "0.1.7" error-chain = "0.12" log = "0.3" exit-future = "0.1" -parity-codec = "2.1" +parity-codec = "3.0" polkadot-availability-store = { path = "../availability-store" } polkadot-parachain = { path = "../parachain" } polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime" } polkadot-statement-table = { path = "../statement-table" } -substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-support = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-consensus-common = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } [dev-dependencies] -substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } diff --git a/consensus/src/attestation_service.rs b/consensus/src/attestation_service.rs index fc87f83d9e7e..d0cb980c981f 100644 --- a/consensus/src/attestation_service.rs +++ b/consensus/src/attestation_service.rs @@ -33,7 +33,7 @@ use client::blockchain::HeaderBackend; use client::runtime_api::Core; use primitives::ed25519; use futures::prelude::*; -use polkadot_primitives::{Block, BlockId, InherentData}; +use polkadot_primitives::{Block, BlockId}; use polkadot_primitives::parachain::ParachainHost; use extrinsic_store::Store as ExtrinsicStore; use runtime_primitives::traits::ProvideRuntimeApi; @@ -122,7 +122,7 @@ pub(crate) fn start( ::Future: Send + 'static, P: BlockchainEvents + ChainHead + BlockBody, P: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, - P::Api: ParachainHost + Core + BlockBuilder, + P::Api: ParachainHost + Core + BlockBuilder, N: Network + Send + Sync + 'static, N::TableRouter: Send + 'static, { diff --git a/consensus/src/lib.rs b/consensus/src/lib.rs index 41343b87c881..034d5e343439 100644 --- a/consensus/src/lib.rs +++ b/consensus/src/lib.rs @@ -37,7 +37,9 @@ extern crate polkadot_runtime; extern crate polkadot_primitives; extern crate parity_codec as codec; +extern crate substrate_inherents as inherents; extern crate substrate_primitives as primitives; +extern crate srml_aura as runtime_aura; extern crate srml_support as runtime_support; extern crate sr_primitives as runtime_primitives; extern crate substrate_client as client; @@ -45,6 +47,7 @@ extern crate substrate_client as client; extern crate exit_future; extern crate tokio; extern crate substrate_consensus_common as consensus; +extern crate substrate_consensus_aura as aura; extern crate substrate_consensus_aura_primitives as aura_primitives; extern crate substrate_finality_grandpa as grandpa; extern crate substrate_transaction_pool as transaction_pool; @@ -65,6 +68,7 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; use std::time::{self, Duration, Instant}; +use aura::SlotDuration; use client::{BlockchainEvents, ChainHead, BlockBody}; use client::blockchain::HeaderBackend; use client::block_builder::api::BlockBuilder as BlockBuilderApi; @@ -73,7 +77,7 @@ use codec::Encode; use extrinsic_store::Store as ExtrinsicStore; use parking_lot::Mutex; use polkadot_primitives::{ - Hash, Block, BlockId, BlockNumber, Header, SessionKey, InherentData + Hash, Block, BlockId, BlockNumber, Header, SessionKey }; use polkadot_primitives::parachain::{Id as ParaId, Chain, DutyRoster, BlockData, Extrinsic as ParachainExtrinsic, CandidateReceipt, CandidateSignature}; use polkadot_primitives::parachain::{AttestedCandidate, ParachainHost, Statement as PrimitiveStatement}; @@ -82,13 +86,14 @@ use runtime_primitives::traits::ProvideRuntimeApi; use tokio::runtime::TaskExecutor; use tokio::timer::{Delay, Interval}; use transaction_pool::txpool::{Pool, ChainApi as PoolChainApi}; -use aura_primitives::AuraConsensusData; use attestation_service::ServiceHandle; use futures::prelude::*; use futures::future::{self, Either}; use collation::CollationFetch; use dynamic_inclusion::DynamicInclusion; +use inherents::InherentData; +use runtime_aura::timestamp::TimestampInherentData; pub use self::collation::{validate_collation, Collators}; pub use self::error::{ErrorKind, Error}; @@ -256,7 +261,7 @@ impl ParachainConsensus where C: Collators + Send + 'static, N: Network, P: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, - P::Api: ParachainHost + BlockBuilderApi, + P::Api: ParachainHost + BlockBuilderApi, ::Future: Send + 'static, N::TableRouter: Send + 'static, { @@ -350,6 +355,7 @@ pub struct ProposerFactory { transaction_pool: Arc>, key: Arc, _service_handle: ServiceHandle, + aura_slot_duration: SlotDuration, } impl ProposerFactory where @@ -357,7 +363,7 @@ impl ProposerFactory where ::Future: Send + 'static, P: BlockchainEvents + ChainHead + BlockBody, P: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, - P::Api: ParachainHost + Core + BlockBuilderApi, + P::Api: ParachainHost + Core + BlockBuilderApi, N: Network + Send + Sync + 'static, N::TableRouter: Send + 'static, TxApi: PoolChainApi, @@ -371,6 +377,7 @@ impl ProposerFactory where thread_pool: TaskExecutor, key: Arc, extrinsic_store: ExtrinsicStore, + aura_slot_duration: SlotDuration, ) -> Self { let parachain_consensus = Arc::new(ParachainConsensus { client: client.clone(), @@ -394,16 +401,17 @@ impl ProposerFactory where transaction_pool, key, _service_handle: service_handle, + aura_slot_duration, } } } -impl consensus::Environment for ProposerFactory where +impl consensus::Environment for ProposerFactory where C: Collators + Send + 'static, N: Network, TxApi: PoolChainApi, P: ProvideRuntimeApi + HeaderBackend + Send + Sync + 'static, - P::Api: ParachainHost + BlockBuilderApi, + P::Api: ParachainHost + BlockBuilderApi, ::Future: Send + 'static, N::TableRouter: Send + 'static, { @@ -431,6 +439,7 @@ impl consensus::Environment for Propos parent_id, parent_number: parent_header.number, transaction_pool: self.transaction_pool.clone(), + slot_duration: self.aura_slot_duration, }) } } @@ -505,12 +514,13 @@ pub struct Proposer where parent_number: BlockNumber, tracker: Arc, transaction_pool: Arc>, + slot_duration: SlotDuration, } -impl consensus::Proposer for Proposer where +impl consensus::Proposer for Proposer where TxApi: PoolChainApi, C: ProvideRuntimeApi + HeaderBackend + Send + Sync, - C::Api: ParachainHost + BlockBuilderApi, + C::Api: ParachainHost + BlockBuilderApi, { type Error = Error; type Create = Either< @@ -518,7 +528,7 @@ impl consensus::Proposer for Proposer, >; - fn propose(&self, consensus_data: AuraConsensusData) -> Self::Create { + fn propose(&self, inherent_data: InherentData, max_duration: Duration) -> Self::Create { const ATTEMPT_PROPOSE_EVERY: Duration = Duration::from_millis(100); const SLOT_DURATION_DENOMINATOR: u64 = 3; // wait up to 1/3 of the slot for candidates. @@ -528,7 +538,7 @@ impl consensus::Proposer for Proposer consensus::Proposer for Proposer timestamp, + Err(e) => return Either::B(future::err(ErrorKind::InherentError(e).into())), + }; // set up delay until next allowed timestamp. let current_timestamp = current_timestamp(); @@ -564,8 +577,10 @@ impl consensus::Proposer for Proposer { table: Arc, timing: ProposalTiming, believed_minimum_timestamp: u64, - consensus_data: AuraConsensusData, + inherent_data: Option, + deadline: Instant, } impl CreateProposal where TxApi: PoolChainApi, C: ProvideRuntimeApi + HeaderBackend + Send + Sync, - C::Api: ParachainHost + BlockBuilderApi, + C::Api: ParachainHost + BlockBuilderApi, { - fn propose_with(&self, candidates: Vec) -> Result { + fn propose_with(&mut self, candidates: Vec) -> Result { use client::block_builder::BlockBuilder; use runtime_primitives::traits::{Hash as HashT, BlakeTwo256}; const MAX_TRANSACTIONS: usize = 40; - let inherent_data = InherentData { - timestamp: self.believed_minimum_timestamp, - parachains: candidates, - aura_expected_slot: self.consensus_data.slot, - }; + let mut inherent_data = self.inherent_data.take().expect("CreateProposal is not polled after finishing; qed"); + inherent_data.put_data(polkadot_runtime::PARACHAIN_INHERENT_IDENTIFIER, &candidates).map_err(ErrorKind::InherentError)?; let runtime_api = self.client.runtime_api(); @@ -672,6 +685,10 @@ impl CreateProposal where if pending_size + encoded_size >= MAX_TRANSACTIONS_SIZE { break } + if Instant::now() > self.deadline { + debug!("Consensus deadline reached when pushing block transactions, proceeding with proposing."); + break; + } match block_builder.push(ready.data.clone()) { Ok(()) => { @@ -716,7 +733,7 @@ impl CreateProposal where impl Future for CreateProposal where TxApi: PoolChainApi, C: ProvideRuntimeApi + HeaderBackend + Send + Sync, - C::Api: ParachainHost + BlockBuilderApi, + C::Api: ParachainHost + BlockBuilderApi, { type Item = Block; type Error = Error; diff --git a/executor/Cargo.toml b/executor/Cargo.toml index f4c8d69740f1..0e45bf95a7ef 100644 --- a/executor/Cargo.toml +++ b/executor/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Parity Technologies "] description = "Polkadot node implementation in Rust." [dependencies] -substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-executor = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } polkadot-runtime = { path = "../runtime" } diff --git a/network/Cargo.toml b/network/Cargo.toml index 0d6a454b8ba7..8e6a9a64756f 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -10,11 +10,11 @@ parking_lot = "0.4" polkadot-availability-store = { path = "../availability-store" } polkadot-consensus = { path = "../consensus" } polkadot-primitives = { path = "../primitives" } -parity-codec = "2.1" -parity-codec-derive = "2.1" -substrate-network = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +parity-codec = "3.0" +parity-codec-derive = "3.0" +substrate-network = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } futures = "0.1" tokio = "0.1.7" log = "0.4" diff --git a/network/src/consensus.rs b/network/src/consensus.rs index 04263afed0f3..89d71ff9038b 100644 --- a/network/src/consensus.rs +++ b/network/src/consensus.rs @@ -152,24 +152,35 @@ impl Network for ConsensusNetwork where // spin up a task in the background that processes all incoming statements // TODO: propagate statements on a timer? - let inner_stream = self.network.consensus_gossip().write().messages_for(attestation_topic); - let process_task = self.network - .with_spec(|spec, ctx| { + let (tx, rx) = std::sync::mpsc::channel(); + self.network.with_gossip(move |gossip, _| { + let inner_rx = gossip.messages_for(attestation_topic); + let _ = tx.send(inner_rx); + }); + + let table_router_clone = table_router.clone(); + let executor = task_executor.clone(); + + // spin up a task in the background that processes all incoming statements + // TODO: propagate statements on a timer? + self.network + .with_spec(move |spec, ctx| { spec.new_consensus(ctx, parent_hash, CurrentConsensus { knowledge, local_session_key, }); - - MessageProcessTask { + let inner_stream = match rx.try_recv() { + Ok(inner_stream) => inner_stream, + _ => unreachable!("1. The with_gossip closure executed first, 2. the reply should be available") + }; + let process_task = MessageProcessTask { inner_stream, parent_hash, - table_router: table_router.clone(), + table_router: table_router_clone, exit, - } - }) - .then(|_| Ok(())); - - task_executor.spawn(process_task); + }; + executor.spawn(process_task); + }); table_router } @@ -180,14 +191,27 @@ impl Network for ConsensusNetwork where pub struct NetworkDown; /// A future that resolves when a collation is received. -pub struct AwaitingCollation(::futures::sync::oneshot::Receiver); +pub struct AwaitingCollation { + outer: ::futures::sync::oneshot::Receiver<::futures::sync::oneshot::Receiver>, + inner: Option<::futures::sync::oneshot::Receiver> +} impl Future for AwaitingCollation { type Item = Collation; type Error = NetworkDown; fn poll(&mut self) -> Poll { - self.0.poll().map_err(|_| NetworkDown) + if let Some(ref mut inner) = self.inner { + return inner + .poll() + .map_err(|_| NetworkDown) + } + if let Ok(futures::Async::Ready(mut inner)) = self.outer.poll() { + let poll_result = inner.poll(); + self.inner = Some(inner); + return poll_result.map_err(|_| NetworkDown) + } + Ok(futures::Async::NotReady) } } @@ -198,13 +222,16 @@ impl Collators for Conse type Collation = AwaitingCollation; fn collate(&self, parachain: ParaId, relay_parent: Hash) -> Self::Collation { - AwaitingCollation( - self.network.with_spec(|spec, _| spec.await_collation(relay_parent, parachain)) - ) + let (tx, rx) = ::futures::sync::oneshot::channel(); + self.network.with_spec(move |spec, _| { + let collation = spec.await_collation(relay_parent, parachain); + let _ = tx.send(collation); + }); + AwaitingCollation{outer: rx, inner: None} } fn note_bad_collator(&self, collator: AccountId) { - self.network.with_spec(|spec, ctx| spec.disconnect_bad_collator(ctx, collator)); + self.network.with_spec(move |spec, ctx| spec.disconnect_bad_collator(ctx, collator)); } } diff --git a/network/src/lib.rs b/network/src/lib.rs index d513b27064a4..3e3280c5b508 100644 --- a/network/src/lib.rs +++ b/network/src/lib.rs @@ -69,7 +69,7 @@ pub const DOT_PROTOCOL_ID: ::substrate_network::ProtocolId = *b"dot"; type FullStatus = GenericFullStatus; /// Specialization of the network service for the polkadot protocol. -pub type NetworkService = ::substrate_network::Service; +pub type NetworkService = ::substrate_network::Service; /// Status of a Polkadot node. #[derive(Debug, PartialEq, Eq, Clone, Encode, Decode)] @@ -311,7 +311,7 @@ impl PolkadotProtocol { }; if !info.claimed_validator { - ctx.report_peer(who, Severity::Bad("Session key broadcasted without setting authority role")); + ctx.report_peer(who, Severity::Bad("Session key broadcasted without setting authority role".to_string())); return; } @@ -354,7 +354,7 @@ impl PolkadotProtocol { self.pending.push(req); self.dispatch_pending_requests(ctx); } - None => ctx.report_peer(who, Severity::Bad("Unexpected block data response")), + None => ctx.report_peer(who, Severity::Bad("Unexpected block data response".to_string())), } } @@ -373,7 +373,7 @@ impl PolkadotProtocol { if info.validator_keys.as_slice().is_empty() { ctx.report_peer( who, - Severity::Bad("Sent collator role without registering first as validator"), + Severity::Bad("Sent collator role without registering first as validator".to_string()), ); } else { // update role for all saved session keys for this validator. @@ -419,7 +419,7 @@ impl Specialization 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")); + ctx.report_peer(who, Severity::Useless("Unknown Polkadot-specific reason".to_string())); return } @@ -496,7 +496,7 @@ impl Specialization 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")); + ctx.report_peer(who, Severity::Bad("Invalid polkadot protocol message format".to_string())); *message = Some(generic_message::Message::ChainSpecific(raw)); } } @@ -540,16 +540,16 @@ impl PolkadotProtocol { let collated_acc = collation.receipt.collator; match self.peers.get(&from) { - None => ctx.report_peer(from, Severity::Useless("Unknown Polkadot specific reason")), + None => ctx.report_peer(from, Severity::Useless("Unknown Polkadot specific reason".to_string())), Some(peer_info) => match peer_info.collating_for { - None => ctx.report_peer(from, Severity::Bad("Sent collation without registering collator intent")), + None => ctx.report_peer(from, Severity::Bad("Sent collation without registering collator intent".to_string())), 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")) + ctx.report_peer(from, Severity::Bad("Sent malformed collation".to_string())) }; } }, @@ -580,7 +580,7 @@ impl PolkadotProtocol { // disconnect a collator by account-id. fn disconnect_bad_collator(&mut self, ctx: &mut Context, account_id: AccountId) { if let Some((who, _)) = self.collator_peer(account_id) { - ctx.report_peer(who, Severity::Bad("Consensus layer determined the given collator misbehaved")) + ctx.report_peer(who, Severity::Bad("Consensus layer determined the given collator misbehaved".to_string())) } } } diff --git a/network/src/router.rs b/network/src/router.rs index 205aff1e65e6..b10f25837db5 100644 --- a/network/src/router.rs +++ b/network/src/router.rs @@ -190,22 +190,16 @@ impl Router

return } - let mut gossip = network.consensus_gossip().write(); - // propagate the statements // consider something more targeted than gossip in the future. if let Some(validity) = produced.validity { let signed = table.sign_and_import(validity.clone()).0; - network.with_spec(|_, ctx| - gossip.multicast(ctx, attestation_topic, signed.encode(), false) - ); + network.gossip_consensus_message(attestation_topic, signed.encode(), false); } if let Some(availability) = produced.availability { let signed = table.sign_and_import(availability).0; - network.with_spec(|_, ctx| - gossip.multicast(ctx, attestation_topic, signed.encode(), false) - ); + network.gossip_consensus_message(attestation_topic, signed.encode(), false); } }) .map_err(|e| debug!(target: "p_net", "Failed to produce statements: {:?}", e)) @@ -225,19 +219,21 @@ impl TableRouter for Router

let (candidate, availability) = self.table.sign_and_import(GenericStatement::Candidate(receipt)); self.knowledge.lock().note_candidate(hash, Some(block_data), Some(extrinsic)); - let mut gossip = self.network.consensus_gossip().write(); - self.network.with_spec(|_spec, ctx| { - gossip.multicast(ctx, self.attestation_topic, candidate.encode(), false); - if let Some(availability) = availability { - gossip.multicast(ctx, self.attestation_topic, availability.encode(), false); - } - }); + self.network.gossip_consensus_message(self.attestation_topic, candidate.encode(), false); + if let Some(availability) = availability { + self.network.gossip_consensus_message(self.attestation_topic, availability.encode(), false); + } } fn fetch_block_data(&self, candidate: &CandidateReceipt) -> BlockDataReceiver { - let parent_hash = self.parent_hash; - let rx = self.network.with_spec(|spec, ctx| { spec.fetch_block_data(ctx, candidate, parent_hash) }); - BlockDataReceiver { inner: rx } + let parent_hash = self.parent_hash.clone(); + let candidate = candidate.clone(); + let (tx, rx) = ::futures::sync::oneshot::channel(); + self.network.with_spec(move |spec, ctx| { + let inner_rx = spec.fetch_block_data(ctx, &candidate, parent_hash); + let _ = tx.send(inner_rx); + }); + BlockDataReceiver { outer: rx, inner: None } } fn fetch_extrinsic_data(&self, _candidate: &CandidateReceipt) -> Self::FetchExtrinsic { @@ -247,14 +243,15 @@ impl TableRouter for Router

impl

Drop for Router

{ fn drop(&mut self) { - let parent_hash = &self.parent_hash; - self.network.with_spec(|spec, _| spec.remove_consensus(parent_hash)); + let parent_hash = self.parent_hash.clone(); + self.network.with_spec(move |spec, _| spec.remove_consensus(&parent_hash)); } } /// Receiver for block data. pub struct BlockDataReceiver { - inner: ::futures::sync::oneshot::Receiver, + outer: ::futures::sync::oneshot::Receiver<::futures::sync::oneshot::Receiver>, + inner: Option<::futures::sync::oneshot::Receiver> } impl Future for BlockDataReceiver { @@ -262,10 +259,24 @@ impl Future for BlockDataReceiver { type Error = io::Error; fn poll(&mut self) -> Poll { - self.inner.poll().map_err(|_| io::Error::new( - io::ErrorKind::Other, - "Sending end of channel hung up", - )) + if let Some(ref mut inner) = self.inner { + return inner + .poll() + .map_err(|_| io::Error::new( + io::ErrorKind::Other, + "Sending end of channel hung up", + )) + } + if let Ok(futures::Async::Ready(mut inner)) = self.outer.poll() { + let poll_result = inner.poll(); + self.inner = Some(inner); + return poll_result + .map_err(|_| io::Error::new( + io::ErrorKind::Other, + "Sending end of channel hung up", + )) + } + Ok(futures::Async::NotReady) } } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index a8257de8e54d..8265c30ba130 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -6,16 +6,16 @@ authors = ["Parity Technologies "] [dependencies] serde = { version = "1.0", default-features = false } serde_derive = { version = "1.0", optional = true } -parity-codec = { version = "2.1", default-features = false } -parity-codec-derive = { version = "2.1", default-features = false } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-version = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-std = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } +parity-codec = "3.0" +parity-codec-derive = "3.0" +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } [dev-dependencies] -substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } pretty_assertions = "0.4" [features] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 09c11c58dff4..b7e5e61da995 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -11,36 +11,37 @@ 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 } -parity-codec = "2.1" -parity-codec-derive = "2.1" -substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-std = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-io = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-support = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-aura = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-balances = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-council = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-executive = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-indices = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-session = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-staking = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-system = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-version = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +parity-codec = "3.0" +parity-codec-derive = "3.0" +substrate-serializer = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-balances = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-council = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-executive = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-indices = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-session = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-staking = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-system = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } [dev-dependencies] hex-literal = "0.1.0" -substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-keyring = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } [features] default = ["std"] @@ -49,6 +50,7 @@ std = [ "polkadot-primitives/std", "parity-codec/std", "parity-codec-derive/std", + "substrate-inherents/std", "substrate-primitives/std", "sr-std/std", "sr-io/std", diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index a61b782611bf..d14949296896 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -23,16 +23,15 @@ #[macro_use] extern crate bitvec; -#[macro_use] extern crate parity_codec_derive; extern crate parity_codec as codec; extern crate substrate_consensus_aura_primitives as consensus_aura; +extern crate substrate_inherents as inherents; extern crate substrate_primitives; #[macro_use] extern crate substrate_client as client; -#[macro_use] extern crate sr_std as rstd; #[cfg(test)] extern crate sr_io; @@ -76,9 +75,9 @@ use client::{ block_builder::api as block_builder_api, runtime_api as client_api, }; -use consensus_aura::api as aura_api; +use inherents::CheckInherentsResult; use sr_primitives::{ - ApplyResult, CheckInherentError, generic, transaction_validity::TransactionValidity, + ApplyResult, generic, transaction_validity::TransactionValidity, traits::{Convert, BlakeTwo256, Block as BlockT, DigestFor, StaticLookup} }; use version::RuntimeVersion; @@ -95,14 +94,12 @@ pub use sr_primitives::BuildStorage; pub use consensus::Call as ConsensusCall; pub use timestamp::Call as TimestampCall; pub use balances::Call as BalancesCall; -pub use parachains::Call as ParachainsCall; +pub use parachains::{Call as ParachainsCall, INHERENT_IDENTIFIER as PARACHAIN_INHERENT_IDENTIFIER}; pub use sr_primitives::{Permill, Perbill}; pub use timestamp::BlockPeriod; -pub use srml_support::{StorageValue, RuntimeMetadata}; +pub use srml_support::StorageValue; -const TIMESTAMP_SET_POSITION: u32 = 0; const PARACHAINS_SET_POSITION: u32 = 1; -const NOTE_OFFLINE_POSITION: u32 = 2; // this should be reintroduced /// Runtime version. pub const VERSION: RuntimeVersion = RuntimeVersion { @@ -157,7 +154,6 @@ impl balances::Trait for Runtime { } impl consensus::Trait for Runtime { - const NOTE_OFFLINE_POSITION: u32 = NOTE_OFFLINE_POSITION; type Log = Log; type SessionKey = SessionKey; @@ -167,7 +163,6 @@ impl consensus::Trait for Runtime { } impl timestamp::Trait for Runtime { - const TIMESTAMP_SET_POSITION: u32 = TIMESTAMP_SET_POSITION; type Moment = u64; type OnTimestampSet = Aura; } @@ -189,9 +184,11 @@ impl session::Trait for Runtime { impl staking::Trait for Runtime { type OnRewardMinted = Treasury; type Event = Event; + type Currency = balances::Module; } impl democracy::Trait for Runtime { + type Currency = balances::Module; type Proposal = Call; type Event = Event; } @@ -211,6 +208,7 @@ impl council::motions::Trait for Runtime { } impl treasury::Trait for Runtime { + type Currency = balances::Module; type ApproveOrigin = council_motions::EnsureMembers<_4>; type RejectOrigin = council_motions::EnsureMembers<_2>; type Event = Event; @@ -241,7 +239,7 @@ construct_runtime!( pub enum Runtime with Log(InternalLog: DigestItem) where Block = Block, NodeBlock = primitives::Block, - InherentData = primitives::InherentData + UncheckedExtrinsic = UncheckedExtrinsic { System: system::{default, Log(ChangesTrieRoot)}, Aura: aura::{Module}, @@ -308,7 +306,7 @@ impl_runtime_apis! { } } - impl block_builder_api::BlockBuilder for Runtime { + impl block_builder_api::BlockBuilder for Runtime { fn apply_extrinsic(extrinsic: ::Extrinsic) -> ApplyResult { Executive::apply_extrinsic(extrinsic) } @@ -317,48 +315,12 @@ impl_runtime_apis! { Executive::finalise_block() } - fn inherent_extrinsics(data: primitives::InherentData) -> Vec<::Extrinsic> { - use sr_primitives::traits::ProvideInherent; - - let mut inherent = Vec::new(); - - inherent.extend( - Timestamp::create_inherent_extrinsics(data.timestamp) - .into_iter() - .map(|v| (v.0, UncheckedExtrinsic::new_unsigned(Call::Timestamp(v.1)))) - ); - - inherent.extend( - Parachains::create_inherent_extrinsics(data.parachains) - .into_iter() - .map(|v| (v.0, UncheckedExtrinsic::new_unsigned(Call::Parachains(v.1)))) - ); - - inherent.as_mut_slice().sort_unstable_by_key(|v| v.0); - inherent.into_iter().map(|v| v.1).collect() + fn inherent_extrinsics(data: inherents::InherentData) -> Vec<::Extrinsic> { + data.create_extrinsics() } - fn check_inherents(block: Block, data: primitives::InherentData) -> Result<(), CheckInherentError> { - let expected_slot = data.aura_expected_slot; - - // draw timestamp out from extrinsics. - let set_timestamp = block.extrinsics() - .get(TIMESTAMP_SET_POSITION as usize) - .and_then(|xt: &UncheckedExtrinsic| match xt.function { - Call::Timestamp(TimestampCall::set(ref t)) => Some(t.clone()), - _ => None, - }) - .ok_or_else(|| CheckInherentError::Other("No valid timestamp in block.".into()))?; - - // take the "worse" result of normal verification and the timestamp vs. seal - // check. - CheckInherentError::combine_results( - Runtime::check_inherents(block, data), - || { - Aura::verify_inherent(set_timestamp.into(), expected_slot) - .map_err(|s| CheckInherentError::Other(s.into())) - }, - ) + fn check_inherents(block: Block, data: inherents::InherentData) -> CheckInherentsResult { + data.check_extrinsics(&block) } fn random_seed() -> ::Hash { @@ -410,7 +372,7 @@ impl_runtime_apis! { } } - impl aura_api::AuraApi for Runtime { + impl consensus_aura::AuraApi for Runtime { fn slot_duration() -> u64 { Aura::slot_duration() } diff --git a/runtime/src/parachains.rs b/runtime/src/parachains.rs index b4256c4001de..f24d91d3d523 100644 --- a/runtime/src/parachains.rs +++ b/runtime/src/parachains.rs @@ -20,10 +20,10 @@ use rstd::prelude::*; use codec::Decode; use bitvec::BigEndian; -use sr_primitives::CheckInherentError; -use sr_primitives::traits::{ - Extrinsic, Block as BlockT, Hash as HashT, BlakeTwo256, ProvideInherent, +use inherents::{ + ProvideInherent, InherentData, InherentIdentifier, RuntimeString, MakeFatalError }; +use sr_primitives::traits::{Hash as HashT, BlakeTwo256}; use primitives::parachain::{Id as ParaId, Chain, DutyRoster, AttestedCandidate, Statement}; use {system, session}; @@ -31,13 +31,14 @@ use srml_support::{StorageValue, StorageMap}; use srml_support::dispatch::Result; #[cfg(any(feature = "std", test))] -use sr_primitives::{self, ChildrenStorageMap}; +use sr_primitives::{self, ChildrenStorageOverlay}; #[cfg(any(feature = "std", test))] use rstd::marker::PhantomData; use system::ensure_inherent; + pub trait Trait: session::Trait { /// The position of the set_heads call in the block. const SET_POSITION: u32; @@ -58,7 +59,7 @@ decl_storage! { add_extra_genesis { config(parachains): Vec<(ParaId, Vec, Vec)>; config(_phdata): PhantomData; - build(|storage: &mut sr_primitives::StorageMap, _: &mut ChildrenStorageMap, config: &GenesisConfig| { + build(|storage: &mut sr_primitives::StorageOverlay, _: &mut ChildrenStorageOverlay, config: &GenesisConfig| { use codec::Encode; let mut p = config.parachains.clone(); @@ -420,34 +421,21 @@ impl Module { */ } -impl ProvideInherent for Module { - type Inherent = Vec; - type Call = Call; +pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"newheads"; - fn create_inherent_extrinsics(data: Self::Inherent) -> Vec<(u32, Self::Call)> { - vec![(T::SET_POSITION, Call::set_heads(data))] - } +pub type InherentType = Vec; - fn check_inherent Option<&Self::Call>>( - block: &Block, _data: Self::Inherent, extract_function: &F - ) -> ::rstd::result::Result<(), CheckInherentError> { - let has_heads = block - .extrinsics() - .get(T::SET_POSITION as usize) - .map_or(false, |xt| { - xt.is_signed() == Some(false) && match extract_function(&xt) { - Some(Call::set_heads(_)) => true, - _ => false, - } - }); +impl ProvideInherent for Module { + type Call = Call; + type Error = MakeFatalError; + const INHERENT_IDENTIFIER: InherentIdentifier = INHERENT_IDENTIFIER; - if !has_heads { - return Err(CheckInherentError::Other( - "No valid parachains inherent in block".into() - )); - } + fn create_inherent(data: &InherentData) -> Option { + let data = data.get_data::(&INHERENT_IDENTIFIER) + .expect("Parachain heads could not be decoded.") + .expect("No parachain heads found in inherent data."); - Ok(()) + Some(Call::set_heads(data)) } } @@ -469,7 +457,7 @@ mod tests { #[derive(Clone, Eq, PartialEq)] pub struct Test; impl consensus::Trait for Test { - const NOTE_OFFLINE_POSITION: u32 = 1; + type InherentOfflineReport = (); type SessionKey = SessionKey; type InherentOfflineReport = (); type Log = ::Log; diff --git a/runtime/wasm/Cargo.toml b/runtime/wasm/Cargo.toml index 5db49d4c20e9..ca157bd19e38 100644 --- a/runtime/wasm/Cargo.toml +++ b/runtime/wasm/Cargo.toml @@ -13,29 +13,29 @@ polkadot-primitives = { path = "../../primitives", default-features = false } safe-mix = { version = "1.0", default-features = false } parity-codec = { version = "2.1", default-features = false } parity-codec-derive = { version = "2.1", default-features = false } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-std = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-io = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-support = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-aura = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-balances = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-council = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-executive = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-indices = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-session = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-staking = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-system = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } -sr-version = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports", default-features = false } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +substrate-consensus-aura-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-std = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-support = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-balances = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-consensus = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-council = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-democracy = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-executive = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-indices = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-session = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-staking = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-sudo = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-system = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-timestamp = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-treasury = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +srml-upgrade-key = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } +sr-version = { git = "https://github.com/paritytech/substrate", branch = "v0.10", default-features = false } [profile.release] panic = "abort" diff --git a/service/Cargo.toml b/service/Cargo.toml index 3e6dad175c20..de70c1c45280 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -17,12 +17,13 @@ polkadot-primitives = { path = "../primitives" } polkadot-runtime = { path = "../runtime" } polkadot-executor = { path = "../executor" } polkadot-network = { path = "../network" } -sr-io = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-client = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-service = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } -substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +sr-io = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +sr-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-client = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-inherents = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-service = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-telemetry = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } +substrate-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } diff --git a/service/src/chain_spec.rs b/service/src/chain_spec.rs index 77ca81d259da..1c6130889f33 100644 --- a/service/src/chain_spec.rs +++ b/service/src/chain_spec.rs @@ -68,6 +68,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig { existential_deposit: 1 * DOLLARS, transfer_fee: 1 * CENTS, creation_fee: 1 * CENTS, + vesting: vec![], }), session: Some(SessionConfig { validators: initial_authorities.iter().cloned().map(Into::into).collect(), @@ -173,6 +174,7 @@ fn testnet_genesis(initial_authorities: Vec, upgrade_key: H256) -> transfer_fee: 0, creation_fee: 0, balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(), + vesting: vec![], }), session: Some(SessionConfig { validators: initial_authorities.iter().cloned().map(Into::into).collect(), diff --git a/service/src/lib.rs b/service/src/lib.rs index 0c0d69973075..2bd9daeed3e9 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -27,6 +27,7 @@ extern crate polkadot_network; extern crate sr_primitives; extern crate substrate_primitives as primitives; extern crate substrate_client as client; +extern crate substrate_inherents as inherents; #[macro_use] extern crate substrate_service as service; extern crate substrate_consensus_aura as aura; @@ -43,14 +44,14 @@ pub mod chain_spec; use std::sync::Arc; use std::time::Duration; -use polkadot_primitives::{parachain, AccountId, Block, InherentData}; +use polkadot_primitives::{parachain, AccountId, Block}; use polkadot_runtime::{GenesisConfig, RuntimeApi}; use primitives::ed25519; use tokio::runtime::TaskExecutor; use service::{FactoryFullConfiguration, FullBackend, LightBackend, FullExecutor, LightExecutor}; use transaction_pool::txpool::{Pool as TransactionPool}; -use aura::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra, InherentProducingFn}; - +use aura::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra}; +use inherents::InherentDataProviders; pub use service::{ Roles, PruningMode, TransactionPoolOptions, ComponentClient, ErrorKind, Error, ComponentBlock, LightComponents, FullComponents, @@ -81,6 +82,8 @@ pub struct CustomConfiguration { Arc>, grandpa::LinkHalfForService )>, + + inherent_data_providers: InherentDataProviders, } /// Chain API type for the transaction pool. @@ -139,14 +142,6 @@ impl PolkadotService for Service> { } } -fn inherent_data_import_queue(timestamp: u64, slot: u64) -> InherentData { - InherentData { - parachains: Vec::new(), - timestamp, - aura_expected_slot: slot, - } -} - construct_service_factory! { struct Factory { Block = Block, @@ -220,6 +215,7 @@ construct_service_factory! { executor.clone(), key.clone(), extrinsic_store, + SlotDuration::get_or_compute(&*client)?, ); info!("Using authority key {}", key.public()); @@ -231,7 +227,8 @@ construct_service_factory! { Arc::new(proposer_factory), service.network(), service.on_exit(), - ); + service.config.custom.inherent_data_providers.clone(), + )?; executor.spawn(task); Ok(service) @@ -240,39 +237,42 @@ construct_service_factory! { { |config, executor| >::new(config, executor) }, FullImportQueue = AuraImportQueue< Self::Block, - grandpa::BlockImportForService, + FullClient, NothingExtra, - InherentProducingFn, > { |config: &mut FactoryFullConfiguration, client: Arc>| { let slot_duration = SlotDuration::get_or_compute(&*client)?; - let (block_import, link_half) = grandpa::block_import::<_, _, _, RuntimeApi, FullClient>(client.clone(), client)?; + let (block_import, link_half) = grandpa::block_import::<_, _, _, RuntimeApi, FullClient>(client.clone(), client.clone())?; let block_import = Arc::new(block_import); + let justification_import = block_import.clone(); config.custom.grandpa_import_setup = Some((block_import.clone(), link_half)); - Ok(import_queue( + import_queue( slot_duration, block_import, + Some(justification_import), + client.clone(), NothingExtra, - inherent_data_import_queue as _, - )) + config.custom.inherent_data_providers.clone(), + ).map_err(Into::into) }}, LightImportQueue = AuraImportQueue< Self::Block, LightClient, NothingExtra, - InherentProducingFn, > - { |config, client: Arc>| { + { |config: &mut FactoryFullConfiguration, client: Arc>| { let slot_duration = SlotDuration::get_or_compute(&*client)?; - Ok(import_queue( + import_queue( slot_duration, + client.clone(), + None, client, NothingExtra, - inherent_data_import_queue as _, - )) + config.custom.inherent_data_providers.clone(), + ).map_err(Into::into) }}, } } diff --git a/src/main.rs b/src/main.rs index fa5ce2c3f185..f4a0fb03abe6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -73,6 +73,7 @@ fn run() -> cli::error::Result<()> { executable_name: "polkadot", author: "Parity Team ", description: "Polkadot Relay-chain Client Node", + support_url: "https://github.com/paritytech/polkadot/issues/new", }; cli::run(::std::env::args(), Worker, version) } diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml index 7347b02f9aed..6786b8f034ba 100644 --- a/statement-table/Cargo.toml +++ b/statement-table/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -parity-codec = "2.1" -parity-codec-derive = "2.1" -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +parity-codec = "3.0" +parity-codec-derive = "3.0" +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } polkadot-primitives = { path = "../primitives" } diff --git a/test-parachains/adder/collator/Cargo.toml b/test-parachains/adder/collator/Cargo.toml index 48ada78a9ff6..c5a96e49b0ea 100644 --- a/test-parachains/adder/collator/Cargo.toml +++ b/test-parachains/adder/collator/Cargo.toml @@ -8,7 +8,7 @@ adder = { path = ".." } polkadot-parachain = { path = "../../../parachain" } polkadot-collator = { path = "../../../collator" } polkadot-primitives = { path = "../../../primitives" } -substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "alexander-backports" } +substrate-primitives = { git = "https://github.com/paritytech/substrate", branch = "v0.10" } parking_lot = "0.4" ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" } futures = "0.1"