diff --git a/Cargo.lock b/Cargo.lock index 794d604..61e7cba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,7 +16,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" dependencies = [ - "gimli 0.22.0", + "gimli", ] [[package]] @@ -196,7 +196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -309,7 +309,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.20.0", + "object", "rustc-demangle", ] @@ -350,16 +350,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -[[package]] -name = "bincode" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" -dependencies = [ - "byteorder", - "serde", -] - [[package]] name = "bindgen" version = "0.53.3" @@ -643,9 +633,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.1" +version = "2.33.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "10040cdf04294b565d9e0319955430099ec3813a64c952b86a41200ad714ae48" dependencies = [ "ansi_term 0.11.0", "atty", @@ -667,9 +657,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e296417c8154304ac70aceda41f05318f986f7c0c767bcb0a2366fbb890e78e1" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" dependencies = [ "cache-padded", ] @@ -722,98 +712,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" -[[package]] -name = "cranelift-bforest" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcc286b052ee24a1e5a222e7c1125e6010ad35b0f248709b9b3737a8fedcfdf" -dependencies = [ - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38" -dependencies = [ - "byteorder", - "cranelift-bforest", - "cranelift-codegen-meta", - "cranelift-codegen-shared", - "cranelift-entity", - "gimli 0.21.0", - "log 0.4.11", - "regalloc", - "serde", - "smallvec 1.4.1", - "target-lexicon", - "thiserror", -] - -[[package]] -name = "cranelift-codegen-meta" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f460031861e4f4ad510be62b2ae50bba6cc886b598a36f9c0a970feab9598" -dependencies = [ - "cranelift-codegen-shared", - "cranelift-entity", -] - -[[package]] -name = "cranelift-codegen-shared" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad12409e922e7697cd0bdc7dc26992f64a77c31880dfe5e3c7722f4710206d" - -[[package]] -name = "cranelift-entity" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97cdc58972ea065d107872cfb9079f4c92ade78a8af85aaff519a65b5d13f71" -dependencies = [ - "serde", -] - -[[package]] -name = "cranelift-frontend" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6" -dependencies = [ - "cranelift-codegen", - "log 0.4.11", - "smallvec 1.4.1", - "target-lexicon", -] - -[[package]] -name = "cranelift-native" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e69d44d59826eef6794066ac2c0f4ad3975f02d97030c60dbc04e3886adf36e" -dependencies = [ - "cranelift-codegen", - "raw-cpuid", - "target-lexicon", -] - -[[package]] -name = "cranelift-wasm" -version = "0.66.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979df666b1304624abe99738e9e0e7c7479ee5523ba4b8b237df9ff49996acbb" -dependencies = [ - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "log 0.4.11", - "serde", - "thiserror", - "wasmparser 0.59.0", -] - [[package]] name = "crc32fast" version = "1.2.0" @@ -933,7 +831,7 @@ checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -1009,7 +907,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -1058,26 +956,6 @@ dependencies = [ "syn 0.11.11", ] -[[package]] -name = "enumflags2" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0" -dependencies = [ - "enumflags2_derive", -] - -[[package]] -name = "enumflags2_derive" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" -dependencies = [ - "proc-macro2", - "quote 1.0.7", - "syn 1.0.36", -] - [[package]] name = "env_logger" version = "0.7.1" @@ -1106,32 +984,11 @@ dependencies = [ "serde", ] -[[package]] -name = "errno" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eab5ee3df98a279d9b316b1af6ac95422127b1290317e6d18c1743c99418b01" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -dependencies = [ - "gcc", - "libc", -] - [[package]] name = "event-listener" -version = "2.3.0" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298f00c3b04c1d9b4cb86aefaaa35348af0957d98b30a5306fc635f8e718923d" +checksum = "68082183f458867ce7cddea16d4df4443c1537112c0c09c450dedc09daf5c719" [[package]] name = "exit-future" @@ -1160,7 +1017,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "synstructure", ] @@ -1170,12 +1027,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fastrand" version = "1.3.3" @@ -1191,31 +1042,6 @@ dependencies = [ "libc", ] -[[package]] -name = "file-per-thread-logger" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3937f028664bd0e13df401ba49a4567ccda587420365823242977f06609ed1" -dependencies = [ - "env_logger", - "log 0.4.11", -] - -[[package]] -name = "finality-grandpa" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8feb87a63249689640ac9c011742c33139204e3c134293d3054022276869133b" -dependencies = [ - "either", - "futures 0.3.5", - "futures-timer 2.0.2", - "log 0.4.11", - "num-traits 0.2.12", - "parity-scale-codec", - "parking_lot 0.9.0", -] - [[package]] name = "fixed-hash" version = "0.6.1" @@ -1271,7 +1097,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", ] @@ -1279,7 +1105,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -1293,29 +1119,10 @@ dependencies = [ "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "frame-benchmarking-cli" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "Inflector", - "frame-benchmarking", - "parity-scale-codec", - "sc-cli", - "sc-client-db", - "sc-executor", - "sc-service", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-externalities 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-state-machine 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "structopt", -] - [[package]] name = "frame-executive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -1330,7 +1137,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "serde", @@ -1353,7 +1160,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "bitmask", "frame-metadata 11.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -1378,40 +1185,40 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support-procedural-tools", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "frame-system" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1424,15 +1231,6 @@ dependencies = [ "sp-version 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "frame-system-rpc-runtime-api" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "fs-swap" version = "0.2.4" @@ -1587,7 +1385,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -1733,17 +1531,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gimli" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.22.0" @@ -2135,7 +1922,7 @@ checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -2146,7 +1933,6 @@ checksum = "5b88cd59ee5f71fea89a62248fc8f387d44400cefe05ef548466d61ced9029a7" dependencies = [ "autocfg 1.0.0", "hashbrown 0.8.1", - "serde", ] [[package]] @@ -2277,7 +2063,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -2394,7 +2180,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -2479,12 +2265,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -[[package]] -name = "leb128" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" - [[package]] name = "libc" version = "0.2.74" @@ -2597,7 +2377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f753d9324cd3ec14bf04b8a8cd0d269c87f294153d6bf2a84497a63a5ad22213" dependencies = [ "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -2909,15 +2689,6 @@ dependencies = [ "hashbrown 0.6.3", ] -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "matches" version = "0.1.8" @@ -3087,12 +2858,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "more-asserts" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" - [[package]] name = "multihash" version = "0.11.2" @@ -3211,245 +2976,41 @@ dependencies = [ ] [[package]] -name = "node-cli" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking-cli", - "frame-support", - "frame-system", - "futures 0.3.5", - "hex-literal", - "jsonrpc-core", - "log 0.4.11", - "node-executor", - "node-inspect", - "node-primitives", - "node-rpc", - "node-runtime", - "pallet-authority-discovery", - "pallet-balances", - "pallet-contracts", - "pallet-grandpa", - "pallet-im-online", - "pallet-indices", - "pallet-staking", - "pallet-timestamp", - "pallet-transaction-payment", - "parity-scale-codec", - "parking_lot 0.10.2", - "rand 0.7.3", - "sc-authority-discovery", - "sc-basic-authorship", - "sc-chain-spec", - "sc-cli", - "sc-client-api", - "sc-client-db", - "sc-consensus", - "sc-consensus-babe", - "sc-finality-grandpa", - "sc-network", - "sc-offchain", - "sc-rpc", - "sc-service", - "sc-telemetry", - "sc-tracing", - "sc-transaction-pool", - "serde", - "sp-authority-discovery", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-finality-grandpa", - "sp-finality-tracker", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-keyring", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-timestamp", - "sp-transaction-pool 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-trie 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "structopt", - "substrate-build-script-utils", - "tracing", -] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] -name = "node-executor" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "node-primitives", - "node-runtime", - "parity-scale-codec", - "sc-executor", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-state-machine 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-trie 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "trie-root", -] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] -name = "node-inspect" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ - "derive_more", - "log 0.4.11", - "parity-scale-codec", - "sc-cli", - "sc-client-api", - "sc-service", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "structopt", + "memchr", + "version_check 0.9.2", ] [[package]] -name = "node-primitives" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +name = "ntapi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" dependencies = [ - "frame-system", - "parity-scale-codec", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "winapi 0.3.9", ] [[package]] -name = "node-rpc" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "jsonrpc-core", - "node-primitives", - "node-runtime", - "pallet-contracts-rpc", - "pallet-transaction-payment-rpc", - "sc-client-api", - "sc-consensus-babe", - "sc-consensus-babe-rpc", - "sc-consensus-epochs", - "sc-finality-grandpa", - "sc-finality-grandpa-rpc", - "sc-keystore", - "sc-rpc", - "sc-rpc-api 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-transaction-pool 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "substrate-frame-rpc-system", -] - -[[package]] -name = "node-runtime" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "frame-executive", - "frame-support", - "frame-system", - "frame-system-rpc-runtime-api", - "integer-sqrt", - "node-primitives", - "pallet-authority-discovery", - "pallet-authorship", - "pallet-babe", - "pallet-balances", - "pallet-collective", - "pallet-contracts", - "pallet-contracts-primitives", - "pallet-contracts-rpc-runtime-api", - "pallet-democracy", - "pallet-elections-phragmen", - "pallet-finality-tracker", - "pallet-grandpa", - "pallet-identity", - "pallet-im-online", - "pallet-indices", - "pallet-membership", - "pallet-multisig", - "pallet-offences", - "pallet-proxy", - "pallet-randomness-collective-flip", - "pallet-recovery", - "pallet-scheduler", - "pallet-session", - "pallet-society", - "pallet-staking", - "pallet-staking-reward-curve", - "pallet-sudo", - "pallet-timestamp", - "pallet-transaction-payment", - "pallet-transaction-payment-rpc-runtime-api", - "pallet-treasury", - "pallet-utility", - "pallet-vesting", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-authority-discovery", - "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-keyring", - "sp-offchain", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-session", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-transaction-pool 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-version 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "static_assertions", - "substrate-wasm-builder-runner", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check 0.9.2", -] - -[[package]] -name = "ntapi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.0", "num-integer", @@ -3517,22 +3078,11 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" - [[package]] name = "object" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" -dependencies = [ - "crc32fast", - "indexmap", - "wasmparser 0.57.0", -] [[package]] name = "once_cell" @@ -3597,259 +3147,24 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "pallet-authority-discovery" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "pallet-session", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-authority-discovery", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-authorship" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-authorship", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-babe" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-session", - "pallet-timestamp", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-consensus-vrf", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-session", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-timestamp", -] - [[package]] name = "pallet-balances" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-collective" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-contracts" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "bitflags", - "frame-support", - "frame-system", - "pallet-contracts-primitives", - "parity-scale-codec", - "parity-wasm", - "pwasm-utils", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-sandbox", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "wasmi-validation", -] - -[[package]] -name = "pallet-contracts-primitives" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-contracts-rpc" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-contracts-primitives", - "pallet-contracts-rpc-runtime-api", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-rpc 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-contracts-rpc-runtime-api" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "pallet-contracts-primitives", - "parity-scale-codec", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-democracy" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "serde", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-elections-phragmen" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-npos-elections", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-finality-tracker" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "parity-scale-codec", - "serde", - "sp-finality-tracker", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "pallet-grandpa" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-finality-tracker", - "pallet-session", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-finality-grandpa", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-session", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-identity" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "enumflags2", - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-im-online" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-session", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "pallet-indices" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -3862,69 +3177,10 @@ dependencies = [ "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "pallet-membership" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-multisig" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-offences" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "pallet-balances", - "parity-scale-codec", - "serde", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-proxy" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -3934,105 +3190,10 @@ dependencies = [ "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "pallet-recovery" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "enumflags2", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-scheduler" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-session" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "impl-trait-for-tuples", - "pallet-timestamp", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-session", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-trie 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-society" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "rand_chacha 0.2.2", - "serde", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-staking" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "pallet-authorship", - "pallet-session", - "parity-scale-codec", - "serde", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-npos-elections", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-staking", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "static_assertions", -] - -[[package]] -name = "pallet-staking-reward-curve" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote 1.0.7", - "syn 1.0.36", -] - [[package]] name = "pallet-sudo" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -4046,7 +3207,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-benchmarking", "frame-support", @@ -4063,7 +3224,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "frame-system", @@ -4077,28 +3238,10 @@ dependencies = [ "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "pallet-transaction-payment-rpc" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "pallet-transaction-payment-rpc-runtime-api", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-rpc 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "frame-support", "parity-scale-codec", @@ -4108,49 +3251,6 @@ dependencies = [ "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "pallet-treasury" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "pallet-balances", - "parity-scale-codec", - "serde", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-utility" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "pallet-vesting" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "enumflags2", - "frame-support", - "frame-system", - "parity-scale-codec", - "serde", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "parity-db" version = "0.1.2" @@ -4205,7 +3305,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -4256,7 +3356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2", - "syn 1.0.36", + "syn 1.0.38", "synstructure", ] @@ -4351,12 +3451,6 @@ dependencies = [ "crypto-mac 0.7.0", ] -[[package]] -name = "pdqselect" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27" - [[package]] name = "peeking_take_while" version = "0.1.2" @@ -4402,7 +3496,7 @@ checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -4484,7 +3578,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "version_check 0.9.2", ] @@ -4600,7 +3694,7 @@ dependencies = [ "itertools 0.8.2", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -4619,17 +3713,6 @@ version = "2.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d883f78645c21b7281d21305181aa1f4dd9e9363e7cf2566c93121552cff003e" -[[package]] -name = "pwasm-utils" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7a12f176deee919f4ba55326ee17491c8b707d0987aed822682c821b660192" -dependencies = [ - "byteorder", - "log 0.4.11", - "parity-wasm", -] - [[package]] name = "quick-error" version = "1.2.3" @@ -4853,23 +3936,12 @@ dependencies = [ ] [[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "raw-cpuid" -version = "7.0.3" +name = "rand_xorshift" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" dependencies = [ - "bitflags", - "cc", - "rustc_version", + "rand_core 0.3.1", ] [[package]] @@ -4946,18 +4018,7 @@ checksum = "7d21b475ab879ef0e315ad99067fa25778c3b0377f57f1b00207448dac1a3144" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", -] - -[[package]] -name = "regalloc" -version = "0.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8" -dependencies = [ - "log 0.4.11", - "rustc-hash", - "smallvec 1.4.1", + "syn 1.0.38", ] [[package]] @@ -4978,18 +4039,6 @@ version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" -[[package]] -name = "region" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877e54ea2adcd70d80e9179344c97f93ef0dffd6b03e1f4529e6e83ab2fa9ae0" -dependencies = [ - "bitflags", - "libc", - "mach", - "winapi 0.3.9", -] - [[package]] name = "remove_dir_all" version = "0.5.3" @@ -5017,7 +4066,7 @@ checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -5176,37 +4225,10 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -[[package]] -name = "sc-authority-discovery" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "bytes 0.5.6", - "derive_more", - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.11", - "parity-scale-codec", - "prost", - "prost-build", - "rand 0.7.3", - "sc-client-api", - "sc-keystore", - "sc-network", - "serde_json", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-authority-discovery", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "substrate-prometheus-endpoint 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "sc-basic-authorship" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5230,7 +4252,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5247,7 +4269,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5263,18 +4285,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "sc-cli" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "ansi_term 0.12.1", "atty", @@ -5315,7 +4337,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "fnv", @@ -5351,7 +4373,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "blake2-rfc", "hash-db", @@ -5380,99 +4402,18 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "sc-client-api", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sc-consensus-babe" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ - "derive_more", - "fork-tree", - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.11", - "merlin", - "num-bigint", - "num-rational", - "num-traits 0.2.12", - "parity-scale-codec", - "parking_lot 0.10.2", - "pdqselect", - "rand 0.7.3", - "retain_mut", "sc-client-api", - "sc-consensus-epochs", - "sc-consensus-slots", - "sc-consensus-uncles", - "sc-keystore", - "sc-telemetry", - "schnorrkel", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-consensus-vrf", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-timestamp", - "sp-utils 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-version 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "substrate-prometheus-endpoint 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sc-consensus-babe-rpc" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "derive_more", - "futures 0.3.5", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "sc-consensus-babe", - "sc-consensus-epochs", - "sc-keystore", - "sc-rpc-api 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-babe", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sc-consensus-epochs" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "fork-tree", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-client-api", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] [[package]] name = "sc-consensus-manual-seal" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "assert_matches", "derive_more", @@ -5494,47 +4435,10 @@ dependencies = [ "substrate-prometheus-endpoint 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", ] -[[package]] -name = "sc-consensus-slots" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.11", - "parity-scale-codec", - "parking_lot 0.10.2", - "sc-client-api", - "sc-telemetry", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-slots", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-state-machine 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sc-consensus-uncles" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "log 0.4.11", - "sc-client-api", - "sp-authorship", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "sc-executor" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "lazy_static", @@ -5545,7 +4449,6 @@ dependencies = [ "parking_lot 0.10.2", "sc-executor-common", "sc-executor-wasmi", - "sc-executor-wasmtime", "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-externalities 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -5562,7 +4465,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "log 0.4.11", @@ -5579,7 +4482,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -5591,86 +4494,10 @@ dependencies = [ "wasmi", ] -[[package]] -name = "sc-executor-wasmtime" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "cranelift-codegen", - "cranelift-wasm", - "log 0.4.11", - "parity-scale-codec", - "parity-wasm", - "sc-executor-common", - "scoped-tls", - "sp-allocator", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime-interface 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-wasm-interface 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "substrate-wasmtime", - "wasmtime-environ", - "wasmtime-runtime", -] - -[[package]] -name = "sc-finality-grandpa" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "assert_matches", - "derive_more", - "finality-grandpa", - "fork-tree", - "futures 0.3.5", - "futures-timer 3.0.2", - "log 0.4.11", - "parity-scale-codec", - "parking_lot 0.10.2", - "pin-project", - "rand 0.7.3", - "sc-block-builder", - "sc-client-api", - "sc-consensus", - "sc-keystore", - "sc-network", - "sc-network-gossip", - "sc-telemetry", - "serde_json", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-arithmetic 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-finality-grandpa", - "sp-finality-tracker", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-utils 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "substrate-prometheus-endpoint 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sc-finality-grandpa-rpc" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "derive_more", - "finality-grandpa", - "futures 0.3.5", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "log 0.4.11", - "sc-finality-grandpa", - "serde", - "serde_json", -] - [[package]] name = "sc-informant" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -5688,7 +4515,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "hex", @@ -5704,7 +4531,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "hash-db", "lazy_static", @@ -5723,7 +4550,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "bitflags", "bs58", @@ -5772,25 +4599,10 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sc-network-gossip" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "futures 0.3.5", - "futures-timer 3.0.2", - "libp2p", - "log 0.4.11", - "lru", - "sc-network", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "wasm-timer", -] - [[package]] name = "sc-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "bytes 0.5.6", "fnv", @@ -5817,7 +4629,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "libp2p", @@ -5830,7 +4642,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "log 0.4.11", "substrate-prometheus-endpoint 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -5839,7 +4651,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "hash-db", @@ -5871,7 +4683,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "futures 0.3.5", @@ -5920,7 +4732,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -5936,7 +4748,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "directories", @@ -6000,7 +4812,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "log 0.4.11", "parity-scale-codec", @@ -6014,7 +4826,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6035,7 +4847,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "erased-serde", "log 0.4.11", @@ -6052,7 +4864,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "futures 0.3.5", @@ -6073,7 +4885,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "futures 0.3.5", @@ -6136,26 +4948,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scroll" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9" -dependencies = [ - "proc-macro2", - "quote 1.0.7", - "syn 1.0.36", -] - [[package]] name = "sct" version = "0.6.0" @@ -6265,7 +5057,7 @@ checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -6343,9 +5135,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook-registry" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" +checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" dependencies = [ "arc-swap", "libc", @@ -6404,7 +5196,7 @@ checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -6511,7 +5303,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "log 0.4.11", @@ -6523,7 +5315,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "hash-db", "parity-scale-codec", @@ -6554,13 +5346,13 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "blake2-rfc", "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -6573,13 +5365,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "sp-application-crypto" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "serde", @@ -6604,7 +5396,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -6615,46 +5407,23 @@ dependencies = [ ] [[package]] -name = "sp-arithmetic" -version = "2.0.0-rc5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b472a16a6653d84bbb9ce148c75e136f468b24479e1fbb3219dde88341fde89" -dependencies = [ - "integer-sqrt", - "num-traits 0.2.12", - "parity-scale-codec", - "serde", - "sp-debug-derive 2.0.0-rc5 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 2.0.0-rc5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "sp-authority-discovery" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sp-authorship" +name = "sp-arithmetic" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b472a16a6653d84bbb9ce148c75e136f468b24479e1fbb3219dde88341fde89" dependencies = [ + "integer-sqrt", + "num-traits 0.2.12", "parity-scale-codec", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "serde", + "sp-debug-derive 2.0.0-rc5 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 2.0.0-rc5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-block-builder" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -6679,7 +5448,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "log 0.4.11", @@ -6714,7 +5483,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "serde", "serde_json", @@ -6733,7 +5502,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "futures 0.3.5", @@ -6785,61 +5554,21 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-timestamp", -] - -[[package]] -name = "sp-consensus-babe" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ - "merlin", "parity-scale-codec", "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-consensus-slots", - "sp-consensus-vrf", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-timestamp", ] -[[package]] -name = "sp-consensus-slots" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sp-consensus-vrf" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "schnorrkel", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "sp-core" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "base58", "blake2-rfc", @@ -6927,7 +5656,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -6946,11 +5675,11 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -6961,13 +5690,13 @@ checksum = "db388274224f88d94a0d2646353c690d6871d25f819c5da84fbc2d427fbb16a9" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "sp-externalities" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "environmental", "parity-scale-codec", @@ -6987,36 +5716,10 @@ dependencies = [ "sp-storage 2.0.0-rc5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-finality-grandpa" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "finality-grandpa", - "log 0.4.11", - "parity-scale-codec", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sp-finality-tracker" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "sp-inherents" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "parity-scale-codec", @@ -7041,7 +5744,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "hash-db", @@ -7084,7 +5787,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "lazy_static", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -7092,33 +5795,10 @@ dependencies = [ "strum", ] -[[package]] -name = "sp-npos-elections" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "serde", - "sp-arithmetic 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-npos-elections-compact", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - -[[package]] -name = "sp-npos-elections-compact" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote 1.0.7", - "syn 1.0.36", -] - [[package]] name = "sp-offchain" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -7128,7 +5808,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "backtrace", "log 0.4.11", @@ -7147,7 +5827,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "serde", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -7166,7 +5846,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "either", "hash256-std-hasher", @@ -7211,7 +5891,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7242,13 +5922,13 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -7261,26 +5941,13 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", -] - -[[package]] -name = "sp-sandbox" -version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "parity-scale-codec", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-io 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-std 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-wasm-interface 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "wasmi", + "syn 1.0.38", ] [[package]] name = "sp-serializer" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "serde", "serde_json", @@ -7289,7 +5956,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -7302,7 +5969,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "parity-scale-codec", "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -7312,7 +5979,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7355,7 +6022,7 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" [[package]] name = "sp-std" @@ -7366,7 +6033,7 @@ checksum = "2a58c21080bbfd72305a66db730d9cfaac50100a85071f560b133881f70e109a" [[package]] name = "sp-storage" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7391,7 +6058,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7405,7 +6072,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "log 0.4.11", "rental", @@ -7426,7 +6093,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "derive_more", "futures 0.3.5", @@ -7457,7 +6124,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "hash-db", "memory-db", @@ -7486,7 +6153,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "futures 0.3.5", "futures-core", @@ -7511,7 +6178,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7536,7 +6203,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7609,9 +6276,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "de5472fb24d7e80ae84a7801b7978f95a19ec32cb1876faea59ab711eb901976" dependencies = [ "clap", "lazy_static", @@ -7620,15 +6287,15 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "1e0eb37335aeeebe51be42e2dc07f031163fbabfa6ac67d7ea68b5c2f68d5f99" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -7649,7 +6316,7 @@ dependencies = [ "heck", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -7667,38 +6334,15 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "platforms", ] -[[package]] -name = "substrate-frame-rpc-system" -version = "2.0.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" -dependencies = [ - "frame-system-rpc-runtime-api", - "futures 0.3.5", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "log 0.4.11", - "parity-scale-codec", - "sc-client-api", - "sc-rpc-api 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "serde", - "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", - "sp-transaction-pool 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", -] - [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc5" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" dependencies = [ "async-std", "derive_more", @@ -7761,7 +6405,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "synstructure", ] @@ -7780,7 +6424,6 @@ dependencies = [ "jsonrpc-pubsub", "jsonrpsee", "log 0.4.11", - "node-cli", "pallet-balances", "pallet-indices", "parity-scale-codec", @@ -7789,22 +6432,34 @@ dependencies = [ "rand 0.7.3", "sc-basic-authorship", "sc-cli", + "sc-client-api", + "sc-client-db", "sc-consensus", "sc-consensus-manual-seal", "sc-executor", + "sc-informant", + "sc-keystore", + "sc-network", "sc-rpc", "sc-rpc-api 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sc-service", "sc-transaction-pool", "serde_json", + "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "sp-blockchain 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-externalities 0.8.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-inherents 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-keyring", + "sp-offchain", "sp-runtime 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "sp-session", "sp-storage 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-timestamp", + "sp-transaction-pool 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "structopt", + "substrate-build-script-utils", "substrate-subxt", "test-runtime", "tokio 0.2.22", @@ -7815,32 +6470,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#172ccdd65c76d1aee16111265e7285dfabd7aa51" - -[[package]] -name = "substrate-wasmtime" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a69f5b3afef86e3e372529bf3fb1f7219b20287c4490e4cb4b4e91970f4f5" -dependencies = [ - "anyhow", - "backtrace", - "cfg-if", - "lazy_static", - "libc", - "log 0.4.11", - "region", - "rustc-demangle", - "smallvec 1.4.1", - "target-lexicon", - "wasmparser 0.59.0", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-profiling", - "wasmtime-runtime", - "wat", - "winapi 0.3.9", -] +source = "git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner#70325ee1c1cc8310cfcdce9ad59b5ec19058060f" [[package]] name = "subtle" @@ -7867,9 +6497,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.36" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" dependencies = [ "proc-macro2", "quote 1.0.7", @@ -7893,7 +6523,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "unicode-xid 0.2.1", ] @@ -7918,12 +6548,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" -[[package]] -name = "target-lexicon" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" - [[package]] name = "tempfile" version = "3.1.0" @@ -7955,6 +6579,7 @@ dependencies = [ "frame-support", "frame-system", "pallet-balances", + "pallet-indices", "pallet-randomness-collective-flip", "pallet-sudo", "pallet-timestamp", @@ -7962,6 +6587,7 @@ dependencies = [ "parity-scale-codec", "serde", "sp-api 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", + "sp-application-crypto 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-block-builder 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", "sp-consensus-aura", "sp-core 2.0.0-rc5 (git+https://github.com/paritytech/substrate.git?branch=seun-substrate-test-runner)", @@ -8002,7 +6628,7 @@ checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -8212,7 +6838,7 @@ checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] @@ -8425,14 +7051,14 @@ checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", ] [[package]] name = "tracing-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2734b5a028fa697686f16c6d18c2c6a3c7e41513f9a213abb6754c4acb3c8d7" +checksum = "d593f98af59ebc017c0648f0117525db358745a8894a8d684e185ba3f45954f9" dependencies = [ "lazy_static", ] @@ -8704,7 +7330,7 @@ dependencies = [ "log 0.4.11", "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "wasm-bindgen-shared", ] @@ -8738,7 +7364,7 @@ checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8771,7 +7397,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff" dependencies = [ - "errno", "libc", "memory_units", "num-rational", @@ -8789,166 +7414,6 @@ dependencies = [ "parity-wasm", ] -[[package]] -name = "wasmparser" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" - -[[package]] -name = "wasmparser" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" - -[[package]] -name = "wasmtime-debug" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634af9067a3af6cf2c7d33dc3b84767ddaf5d010ba68e80eecbcea73d4a349" -dependencies = [ - "anyhow", - "gimli 0.21.0", - "more-asserts", - "object 0.20.0", - "target-lexicon", - "thiserror", - "wasmparser 0.59.0", - "wasmtime-environ", -] - -[[package]] -name = "wasmtime-environ" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f85619a94ee4034bd5bb87fc3dcf71fd2237b81c840809da1201061eec9ab3" -dependencies = [ - "anyhow", - "base64 0.12.3", - "bincode", - "cfg-if", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-wasm", - "directories", - "errno", - "file-per-thread-logger", - "indexmap", - "libc", - "log 0.4.11", - "more-asserts", - "rayon", - "serde", - "sha2 0.8.2", - "thiserror", - "toml", - "wasmparser 0.59.0", - "winapi 0.3.9", - "zstd", -] - -[[package]] -name = "wasmtime-jit" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23" -dependencies = [ - "anyhow", - "cfg-if", - "cranelift-codegen", - "cranelift-entity", - "cranelift-frontend", - "cranelift-native", - "cranelift-wasm", - "gimli 0.21.0", - "log 0.4.11", - "more-asserts", - "object 0.20.0", - "region", - "target-lexicon", - "thiserror", - "wasmparser 0.59.0", - "wasmtime-debug", - "wasmtime-environ", - "wasmtime-obj", - "wasmtime-profiling", - "wasmtime-runtime", - "winapi 0.3.9", -] - -[[package]] -name = "wasmtime-obj" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81d8e02e9bc9fe2da9b6d48bbc217f96e089f7df613f11a28a3958abc44641e" -dependencies = [ - "anyhow", - "more-asserts", - "object 0.20.0", - "target-lexicon", - "wasmtime-debug", - "wasmtime-environ", -] - -[[package]] -name = "wasmtime-profiling" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27" -dependencies = [ - "anyhow", - "cfg-if", - "gimli 0.21.0", - "lazy_static", - "libc", - "object 0.19.0", - "scroll", - "serde", - "target-lexicon", - "wasmtime-environ", - "wasmtime-runtime", -] - -[[package]] -name = "wasmtime-runtime" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93" -dependencies = [ - "backtrace", - "cc", - "cfg-if", - "indexmap", - "lazy_static", - "libc", - "log 0.4.11", - "memoffset", - "more-asserts", - "region", - "thiserror", - "wasmtime-environ", - "winapi 0.3.9", -] - -[[package]] -name = "wast" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" -dependencies = [ - "leb128", -] - -[[package]] -name = "wat" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" -dependencies = [ - "wast", -] - [[package]] name = "web-sys" version = "0.3.44" @@ -9168,37 +7633,6 @@ checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2" dependencies = [ "proc-macro2", "quote 1.0.7", - "syn 1.0.36", + "syn 1.0.38", "synstructure", ] - -[[package]] -name = "zstd" -version = "0.5.3+zstd.1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "2.0.5+zstd.1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "1.4.17+zstd.1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b" -dependencies = [ - "cc", - "glob", - "itertools 0.9.0", - "libc", -] diff --git a/Cargo.toml b/Cargo.toml index 0449025..d16d00a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,27 +3,43 @@ name = "substrate-test-runner" version = "0.1.0" authors = ["Tomasz Drwięga "] edition = "2018" +build = "build.rs" [workspace] members = [ "runtime" ] +[build-dependencies] +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } + [dependencies] runtime = { package = "test-runtime", path = "./runtime" } -node-cli = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sc-informant = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } + +sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } + sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sc-client-db = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-session = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-offchain = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } @@ -44,6 +60,7 @@ futures = { package = "futures", version = "0.3", features = ["compat"] } rand = "0.7" parking_lot = "0.10" tokio = { version = "0.2", features = ["full"] } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } # Calling RPC jsonrpc-core-client = { version = "14.2", features = ["ws"] } @@ -57,5 +74,3 @@ primitive-types = "0.7" sp-externalities = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-storage = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } -[dev-dependencies] -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } diff --git a/build.rs b/build.rs new file mode 100644 index 0000000..21c531e --- /dev/null +++ b/build.rs @@ -0,0 +1,8 @@ +use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed}; + +fn main() { + generate_cargo_keys(); + + rerun_if_git_head_changed(); +} + diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 54c58b1..96ea6d3 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -15,6 +15,7 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features = serde = { version = "1.0.101", optional = true, features = ["derive"] } balances = { default-features = false, package = "pallet-balances", git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +indices = { default-features = false, package = "pallet-indices", git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } randomness-collective-flip = { default-features = false, package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sudo = { default-features = false, package = "pallet-sudo", git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } @@ -34,6 +35,7 @@ sp-session = { default-features = false, git = "https://github.com/paritytech/su sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } +sp-application-crypto = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } [build-dependencies] wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner", git = "https://github.com/paritytech/substrate.git", branch = "seun-substrate-test-runner" } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index efbace7..9283e19 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -8,11 +8,14 @@ #[cfg(feature = "std")] include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); +use codec::Encode; +use frame_support::debug; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; -use sp_runtime::traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Saturating, Verify}; +use sp_runtime::traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, Saturating, StaticLookup, Verify}; +use sp_runtime::SaturatedConversion; use sp_runtime::{ - create_runtime_str, generic, impl_opaque_keys, + create_runtime_str, generic, impl_opaque_keys, traits, transaction_validity::{TransactionSource, TransactionValidity}, ApplyExtrinsicResult, MultiSignature, }; @@ -133,7 +136,7 @@ impl system::Trait for Runtime { /// The aggregated dispatch type that is available for extrinsics. type Call = Call; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. - type Lookup = IdentityLookup; + type Lookup = Indices; /// The index type for storing how many extrinsics an account has signed. type Index = Index; /// The index type for blocks. @@ -184,6 +187,22 @@ impl system::Trait for Runtime { type SystemWeightInfo = (); } +parameter_types! { + pub const IndexDeposit: Balance = 1 * DOLLARS; +} + +pub const MILLICENTS: Balance = 1_000_000_000; +pub const CENTS: Balance = 1_000 * MILLICENTS; +pub const DOLLARS: Balance = 100 * CENTS; + +impl indices::Trait for Runtime { + type AccountIndex = AccountIndex; + type Currency = Balances; + type Deposit = IndexDeposit; + type Event = Event; + type WeightInfo = (); +} + parameter_types! { pub const MinimumPeriod: u64 = SLOT_DURATION / 2; } @@ -240,13 +259,80 @@ construct_runtime!( RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage}, Timestamp: timestamp::{Module, Call, Storage, Inherent}, Balances: balances::{Module, Call, Storage, Config, Event}, + Indices: indices::{Module, Call, Storage, Config, Event}, TransactionPayment: transaction_payment::{Module, Storage}, Sudo: sudo::{Module, Call, Config, Storage, Event}, } ); +impl system::offchain::SigningTypes for Runtime { + type Public = ::Signer; + type Signature = MultiSignature; +} + +use sp_application_crypto::sr25519; +use sp_runtime::MultiSigner; + +pub struct RuntimeKeyType; + +impl system::offchain::AppCrypto for RuntimeKeyType { + type RuntimeAppPublic = sr25519::AppPublic; + type GenericSignature = sp_core::sr25519::Signature; + type GenericPublic = sp_core::sr25519::Public; +} + +impl system::offchain::SendTransactionTypes for Runtime +where + Call: From, +{ + type Extrinsic = UncheckedExtrinsic; + type OverarchingCall = Call; +} + +impl system::offchain::CreateSignedTransaction for Runtime +where + Call: From, +{ + fn create_transaction>( + call: Call, + public: ::Signer, + account: AccountId, + nonce: Index, + ) -> Option<(Call, ::SignaturePayload)> { + // take the biggest period possible. + let period = BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let current_block = System::block_number() + .saturated_into::() + // The `System::block_number` is initialized with `n+1`, + // so the actual block number is `n`. + .saturating_sub(1); + let tip = 0; + let extra: SignedExtra = ( + system::CheckSpecVersion::::new(), + system::CheckTxVersion::::new(), + system::CheckGenesis::::new(), + system::CheckEra::::from(generic::Era::mortal(period, current_block)), + system::CheckNonce::::from(nonce), + system::CheckWeight::::new(), + transaction_payment::ChargeTransactionPayment::::from(tip), + ); + let raw_payload = SignedPayload::new(call, extra) + .map_err(|e| { + debug::warn!("Unable to create signed payload: {:?}", e); + }) + .ok()?; + let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?; + let address = Indices::unlookup(account); + let (call, extra, _) = raw_payload.deconstruct(); + Some((call, (address, signature.into(), extra))) + } +} + /// The address format for describing accounts. -pub type Address = AccountId; +pub type Address = ::Source; /// Block header type as expected by this runtime. pub type Header = generic::Header; /// Block type as expected by this runtime. @@ -271,6 +357,8 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive, Runtime, AllModules>; +/// Signed payload type +pub type SignedPayload = generic::SignedPayload; impl_runtime_apis! { impl sp_api::Core for Runtime { diff --git a/src/chain_spec.rs b/src/chain_spec.rs new file mode 100644 index 0000000..e37b8ab --- /dev/null +++ b/src/chain_spec.rs @@ -0,0 +1,91 @@ +use runtime::{ + AccountId, Signature, WASM_BINARY, + BalancesConfig, GenesisConfig, IndicesConfig, SudoConfig, SystemConfig, +}; +use sc_service::ChainType; +use sp_core::{sr25519, Pair, Public}; +use sp_runtime::traits::{IdentifyAccount, Verify}; + +/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. +pub type ChainSpec = sc_service::GenericChainSpec; + +/// Generate a crypto pair from seed. +pub fn get_from_seed(seed: &str) -> ::Public { + TPublic::Pair::from_string(&format!("//{}", seed), None) + .expect("static values are valid; qed") + .public() +} + +type AccountPublic = ::Signer; + +pub fn spec_factory(_: String) -> Result, String> { + // we supply our own chainspec + Ok(Box::new(development_config()?)) +} + +/// Generate an account ID from seed. +pub fn get_account_id_from_seed(seed: &str) -> AccountId +where + AccountPublic: From<::Public>, +{ + AccountPublic::from(get_from_seed::(seed)).into_account() +} + +pub fn development_config() -> Result { + Ok(ChainSpec::from_genesis( + "Development", + "dev", + ChainType::Development, + move || { + testnet_genesis( + WASM_BINARY, + get_account_id_from_seed::("Alice"), + vec![ + get_account_id_from_seed::("Alice"), + get_account_id_from_seed::("Bob"), + get_account_id_from_seed::("Charlie"), + get_account_id_from_seed::("Dave"), + get_account_id_from_seed::("Eve"), + get_account_id_from_seed::("Ferdie"), + get_account_id_from_seed::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), + get_account_id_from_seed::("Charlie//stash"), + get_account_id_from_seed::("Dave//stash"), + get_account_id_from_seed::("Eve//stash"), + get_account_id_from_seed::("Ferdie//stash"), + ], + true, + ) + }, + vec![], + None, + None, + None, + None, + )) +} + +/// Configure initial storage state for FRAME modules. +fn testnet_genesis( + wasm_binary: &[u8], + root_key: AccountId, + endowed_accounts: Vec, + _enable_println: bool, +) -> GenesisConfig { + GenesisConfig { + system: Some(SystemConfig { + // Add Wasm runtime to storage. + code: wasm_binary.to_vec(), + changes_trie_config: Default::default(), + }), + balances: Some(BalancesConfig { + // Configure endowed accounts with initial balance of 1 << 60. + balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(), + }), + indices: Some(IndicesConfig { indices: vec![] }), + sudo: Some(SudoConfig { + // Assign network admin rights. + key: root_key, + }), + } +} diff --git a/src/lib.rs b/src/lib.rs index 5c7b5c7..81b4b1b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,11 @@ pub mod node; pub mod rpc; -pub mod subxt; +pub mod chain_spec; pub mod test; pub mod types; + + pub mod prelude { pub use super::rpc::RpcExtension; pub use super::test::*; diff --git a/src/node.rs b/src/node.rs index f26e1f1..5091647 100644 --- a/src/node.rs +++ b/src/node.rs @@ -1,58 +1,77 @@ +use std::io::Write; +use std::sync::Arc; + use futures::FutureExt; use jsonrpc_core::MetaIoHandler; +use jsonrpc_core_client::{RpcChannel, transports::local}; use parking_lot::RwLock; -use sc_cli::{build_runtime, SubstrateCli}; -use sc_executor::native_executor_instance; +use sc_cli::{build_runtime, ChainSpecFactory}; +use sc_client_api::{backend::Backend, execution_extensions::ExecutionStrategies}; +use sc_executor::NativeExecutionDispatch; +use sc_informant::OutputFormat; +use sc_network::{config::TransportConfig, multiaddr}; use sc_service::{ - build_network, new_full_parts, spawn_tasks, BuildNetworkParams, Configuration, RpcHandlers, SpawnTasksParams, - TaskExecutor, TaskManager, TaskType, + BasePath, build_network, BuildNetworkParams, Configuration, DatabaseConfig, new_full_parts, + Role, spawn_tasks, SpawnTasksParams, TaskExecutor, TaskManager, TaskType, TFullBackend, TFullClient, }; +use sc_service::config::{KeystoreConfig, NetworkConfiguration, WasmExecutionMethod}; use sc_transaction_pool::BasicPool; +use sp_api::{ApiErrorExt, ApiExt, ConstructRuntimeApi, Core, Metadata}; +use sp_block_builder::BlockBuilder; use sp_inherents::InherentDataProviders; -use std::io::Write; +use sp_keyring::Sr25519Keyring; +use sp_offchain::OffchainWorkerApi; +use sp_runtime::traits::Block as BlockT; +use sp_session::SessionKeys; +use sp_transaction_pool::runtime_api::TaggedTransactionQueue; use std::marker::PhantomData; -use std::sync::Arc; - -// Our native executor instance. -native_executor_instance!( - pub Executor, - runtime::api::dispatch, - runtime::native_version, -); type Module = String; type Logger = Arc>>>; -/// this holds a reference to a running node on another thread, -/// we set a port over cli, process is dropped when this struct is dropped -/// holds logs from the process. -pub struct InternalNode { - logs: Logger, +/// This holds a reference to a running node on another thread, +/// the node process is dropped when this struct is dropped +/// also holds logs from the process. +pub struct InternalNode { + logger: Logger, /// rpc handler for communicating with the node over rpc. rpc_handlers: Arc>, /// tokio-compat runtime - tokio_runtime: tokio_compat::runtime::Runtime, + compat_runtime: tokio_compat::runtime::Runtime, + /// node tokio runtime _runtime: tokio::runtime::Runtime, /// handle to the running node. _task_manager: Option, - _phantom: PhantomData, + _phantom: PhantomData, } -impl InternalNode { - pub fn builder() -> InternalNodeBuilder { - InternalNodeBuilder::new() - } - - pub fn new(logs: Logger, cli: &[String]) -> Self { - let cli = node_cli::Cli::from_iter(cli.iter()); - let tokio_runtime = tokio_compat::runtime::Runtime::new().unwrap(); - let newer_runtime = build_runtime().unwrap(); - let runtime_handle = newer_runtime.handle().clone(); +impl InternalNode { + /// Starts a node with the manual-seal authorship, + pub fn new(spec_factory: SpecFactory) -> Result + where + Node: TestRuntimeRequirements, + > + >::RuntimeApi: + Core + Metadata + OffchainWorkerApi + + SessionKeys + TaggedTransactionQueue + + BlockBuilder + ApiErrorExt + + ApiExt< + Node::OpaqueBlock, + StateBackend= as Backend>::State + >, + SpecFactory: ChainSpecFactory, + { + let logger = build_logger(); + + let compat_runtime = tokio_compat::runtime::Runtime::new().unwrap(); + let tokio_runtime = build_runtime().unwrap(); + let runtime_handle = tokio_runtime.handle().clone(); let task_executor = move |fut, task_type| match task_type { TaskType::Async => runtime_handle.spawn(fut).map(drop), @@ -61,209 +80,283 @@ impl InternalNode { .map(drop), }; - let config = cli - .create_configuration(&cli.run, TaskExecutor::from(task_executor)) - .expect("failed to create node config"); - let (task_manager, rpc_handlers) = build_node(config).unwrap(); + let config = build_config(spec_factory, task_executor.into()); + + let (client, backend, keystore, mut task_manager) = + new_full_parts::(&config)?; + let client = Arc::new(client); + let import_queue = manual_seal::import_queue(Box::new(client.clone()), &task_manager.spawn_handle(), None); + + let transaction_pool = BasicPool::new_full( + config.transaction_pool.clone(), + config.prometheus_registry(), + task_manager.spawn_handle(), + client.clone(), + ); + + let (network, network_status_sinks, system_rpc_tx) = { + let params = BuildNetworkParams { + config: &config, + client: client.clone(), + transaction_pool: transaction_pool.clone(), + spawn_handle: task_manager.spawn_handle(), + import_queue, + on_demand: None, + block_announce_validator_builder: None, + finality_proof_request_builder: None, + finality_proof_provider: None, + }; + build_network(params)? + }; - Self { - logs, - _task_manager: Some(task_manager), - tokio_runtime: tokio_runtime, - _runtime: newer_runtime, + // Proposer object for block authorship. + let proposer = sc_basic_authorship::ProposerFactory::new( + client.clone(), + transaction_pool.clone(), + config.prometheus_registry(), + ); + + // Channel for the rpc handler to communicate with the authorship task. + let (command_sink, commands_stream) = futures::channel::mpsc::channel(10); + + let rpc_handlers = { + let params = SpawnTasksParams { + config, + client: client.clone(), + backend: backend.clone(), + task_manager: &mut task_manager, + keystore, + on_demand: None, + transaction_pool: transaction_pool.clone(), + rpc_extensions_builder: Box::new(move |_| { + use manual_seal::rpc; + let mut io = jsonrpc_core::IoHandler::default(); + io.extend_with({ + // We provide the rpc handler with the sending end of the channel to allow the rpc + // send EngineCommands to the background block authorship task. + let handler = rpc::ManualSeal::<::Hash>::new(command_sink.clone()); + rpc::ManualSealApi::to_delegate(handler) + }); + io + }), + remote_blockchain: None, + network, + network_status_sinks, + system_rpc_tx, + telemetry_connection_sinks: Default::default(), + }; + spawn_tasks(params)? + }; + + let inherent_data_providers = InherentDataProviders::new(); + inherent_data_providers + .register_provider(sp_timestamp::InherentDataProvider) + .expect("failed to register timestamp inherent"); + + let select_chain = sc_consensus::LongestChain::new(backend.clone()); + + // Background authorship future. + let authorship_future = manual_seal::run_manual_seal( + Box::new(client.clone()), + proposer, + client, + transaction_pool.pool().clone(), + commands_stream, + select_chain, + inherent_data_providers, + ); + + // spawn the authorship task as an essential task. + task_manager + .spawn_essential_handle() + .spawn("manual-seal", authorship_future); + + Ok(Self { rpc_handlers: rpc_handlers.io_handler(), + _task_manager: Some(task_manager), _phantom: PhantomData, - } + _runtime: tokio_runtime, + compat_runtime, + logger, + }) } + /// returns a reference to the rpc handlers. pub fn rpc_handler(&self) -> Arc> { self.rpc_handlers.clone() } + /// create a new jsonrpc client using the jsonrpc-core-client local transport + pub fn rpc_client(&self) -> C + where + C: From + 'static, + { + use futures01::Future; + let rpc_handler = self.rpc_handlers.clone(); + let (client, fut) = local::connect::(rpc_handler); + self.compat_runtime.spawn(fut.map_err(|_| ())); + client + } + + /// provides access to the tokio compat runtime. pub fn tokio_runtime(&mut self) -> &mut tokio_compat::runtime::Runtime { - &mut self.tokio_runtime + &mut self.compat_runtime } pub(crate) fn logs(&self) -> &Logger { - &self.logs + &self.logger } } -impl Drop for InternalNode { +impl Drop for InternalNode { fn drop(&mut self) { if let Some(mut task_manager) = self._task_manager.take() { + // if this isn't called the node will live forever task_manager.terminate() } } } -#[derive(Debug)] -pub struct InternalNodeBuilder { - /// Parameters passed as-is. - cli: Vec, - logs: Logger, - _phantom: PhantomData, -} -impl InternalNodeBuilder { - pub fn new() -> Self { - let ignore = [ - "yamux", - "multistream_select", - "libp2p", - "jsonrpc_client_transports", - "sc_network", - "tokio_reactor", - "sub-libp2p", - "sync", - "peerset", - "ws", - "sc_network", - "sc_service", - "sc_peerset", - "rpc", - ]; - let logs = Logger::default(); - { - let logs = logs.clone(); - let mut builder = env_logger::builder(); - builder.format(move |buf: &mut env_logger::fmt::Formatter, record: &log::Record| { - let entry = format!("{} {} {}", record.level(), record.target(), record.args()); - let res = writeln!(buf, "{}", entry); - logs.write().entry(record.target().to_string()).or_default().push(entry); - res - }); - builder.filter_level(log::LevelFilter::Debug); - builder.filter_module("runtime", log::LevelFilter::Trace); - for module in &ignore { - builder.filter_module(module, log::LevelFilter::Info); - } - - let _ = builder.is_test(true).try_init(); - } - - // create random directory for database - let random_path = { - let dir: String = rand::Rng::sample_iter(rand::thread_rng(), &rand::distributions::Alphanumeric) - .take(15) - .collect(); - let path = format!("/tmp/substrate-test-runner/{}", dir); - std::fs::create_dir_all(&path).unwrap(); - path - }; - Self { - cli: vec![ - "--no-mdns".into(), - "--no-prometheus".into(), - "--no-telemetry".into(), - format!("--base-path={}", random_path), - "--dev".into(), - ], - logs, - _phantom: PhantomData, - } - } - - pub fn cli_param(mut self, param: &str) -> Self { - self.cli.push(param.into()); - self - } - - pub fn start(self) -> InternalNode { - InternalNode::new(self.logs, &self.cli) - } +/// Wrapper trait for concrete type required by this testing framework. +pub trait TestRuntimeRequirements { + /// Opaque block type + type OpaqueBlock: BlockT; + /// Executor type + type Executor: NativeExecutionDispatch + 'static; + /// Runtime + type Runtime: frame_system::Trait; + /// RuntimeApi + type RuntimeApi: Send + Sync + 'static + + ConstructRuntimeApi>; } -/// starts a manual seal authorship task. -pub fn build_node(config: Configuration) -> Result<(TaskManager, RpcHandlers), sc_service::Error> { - // Channel for the rpc handler to communicate with the authorship task. - let (command_sink, commands_stream) = futures::channel::mpsc::channel(10); - - let (client, backend, keystore, mut task_manager) = - new_full_parts::(&config)?; - let client = Arc::new(client); - let import_queue = manual_seal::import_queue(Box::new(client.clone()), &task_manager.spawn_handle(), None); - - let transaction_pool = BasicPool::new_full( - config.transaction_pool.clone(), - config.prometheus_registry(), - task_manager.spawn_handle(), - client.clone(), - ); - - let (network, network_status_sinks, system_rpc_tx) = { - let params = BuildNetworkParams { - config: &config, - client: client.clone(), - transaction_pool: transaction_pool.clone(), - spawn_handle: task_manager.spawn_handle(), - import_queue, - on_demand: None, - block_announce_validator_builder: None, - finality_proof_request_builder: None, - finality_proof_provider: None, - }; - build_network(params)? +/// Used to create `Configuration` object for the node. +fn build_config(spec_factory: SpecFactory, task_executor: TaskExecutor) -> Configuration + where + SpecFactory: ChainSpecFactory +{ + let base_path = BasePath::new_temp_dir().expect("could not create temporary directory"); + let root = base_path.path(); + let role = Role::Authority { + sentry_nodes: Vec::new(), }; - - // Proposer object for block authorship. - let proposer = sc_basic_authorship::ProposerFactory::new( - client.clone(), - transaction_pool.clone(), - config.prometheus_registry(), + let key_seed = Sr25519Keyring::Alice.to_seed(); + let mut chain_spec = spec_factory + .load_spec("dev".into()) + .expect("failed to load chain specification"); + let storage = chain_spec + .as_storage_builder() + .build_storage() + .expect("could not build storage"); + + chain_spec.set_storage(storage); + + let mut network_config = NetworkConfiguration::new( + format!("Polkadot Test Node for: {}", key_seed), + "network/test/0.1", + Default::default(), + None, ); - - let rpc_handlers = { - let params = SpawnTasksParams { - config, - client: client.clone(), - backend: backend.clone(), - task_manager: &mut task_manager, - keystore, - on_demand: None, - transaction_pool: transaction_pool.clone(), - rpc_extensions_builder: Box::new(move |_| { - use manual_seal::rpc; - let mut io = jsonrpc_core::IoHandler::default(); - io.extend_with( - // We provide the rpc handler with the sending end of the channel to allow the rpc - // send EngineCommands to the background block authorship task. - rpc::ManualSealApi::to_delegate(rpc::ManualSeal::::new(command_sink.clone())), - ); - io - }), - remote_blockchain: None, - network, - network_status_sinks, - system_rpc_tx, - telemetry_connection_sinks: Default::default(), - }; - spawn_tasks(params)? + let informant_output_format = OutputFormat { + enable_color: false, + prefix: format!("[{}] ", key_seed), }; - let inherent_data_providers = InherentDataProviders::new(); - inherent_data_providers - .register_provider(sp_timestamp::InherentDataProvider) - .expect("failed to register timestamp inherent"); - - let select_chain = sc_consensus::LongestChain::new(backend.clone()); - - // Background authorship future. - let authorship_future = manual_seal::run_manual_seal( - Box::new(client.clone()), - proposer, - client, - transaction_pool.pool().clone(), - commands_stream, - select_chain, - inherent_data_providers, - ); - - // spawn the authorship task as an essential task. - task_manager - .spawn_essential_handle() - .spawn("manual-seal", authorship_future); + network_config.allow_non_globals_in_dht = true; + + network_config + .listen_addresses + .push(multiaddr::Protocol::Memory(rand::random()).into()); + + network_config.transport = TransportConfig::MemoryOnly; + + Configuration { + impl_name: "polkadot-test-node".to_string(), + impl_version: "0.1".to_string(), + role, + task_executor, + transaction_pool: Default::default(), + network: network_config, + keystore: KeystoreConfig::Path { + path: root.join("key"), + password: None, + }, + database: DatabaseConfig::RocksDb { + path: root.join("db"), + cache_size: 128, + }, + state_cache_size: 16777216, + state_cache_child_ratio: None, + pruning: Default::default(), + chain_spec, + wasm_method: WasmExecutionMethod::Interpreted, + // NOTE: we enforce the use of the native runtime to make the errors more debuggable + execution_strategies: ExecutionStrategies { + syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + importing: sc_client_api::ExecutionStrategy::NativeWhenPossible, + block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible, + offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible, + other: sc_client_api::ExecutionStrategy::NativeWhenPossible, + }, + rpc_http: None, + rpc_ws: None, + rpc_ipc: None, + rpc_ws_max_connections: None, + rpc_cors: None, + rpc_methods: Default::default(), + prometheus_config: None, + telemetry_endpoints: None, + telemetry_external_transport: None, + default_heap_pages: None, + offchain_worker: Default::default(), + force_authoring: false, + disable_grandpa: false, + dev_key_seed: Some(key_seed), + tracing_targets: None, + tracing_receiver: Default::default(), + max_runtime_instances: 8, + announce_block: true, + base_path: Some(base_path), + informant_output_format, + } +} - // we really only care about the rpc interface. - Ok((task_manager, rpc_handlers)) +/// Builds the global logger. +fn build_logger() -> Logger { + let ignore = [ + "yamux", + "multistream_select", + "libp2p", + "jsonrpc_client_transports", + "sc_network", + "tokio_reactor", + "sub-libp2p", + "sync", + "peerset", + "ws", + "sc_network", + "sc_service", + "sc_peerset", + "rpc", + ]; + let logs = Logger::default(); + { + let logs = logs.clone(); + let mut builder = env_logger::builder(); + builder.format(move |buf: &mut env_logger::fmt::Formatter, record: &log::Record| { + let entry = format!("{} {} {}", record.level(), record.target(), record.args()); + let res = writeln!(buf, "{}", entry); + logs.write().entry(record.target().to_string()).or_default().push(entry); + res + }); + builder.write_style(env_logger::WriteStyle::Always); + builder.filter_level(log::LevelFilter::Debug); + builder.filter_module("runtime", log::LevelFilter::Trace); + for module in &ignore { + builder.filter_module(module, log::LevelFilter::Info); + } + let _ = builder.is_test(true).try_init(); + } + logs } diff --git a/src/rpc.rs b/src/rpc.rs index c530fde..ffa3351 100644 --- a/src/rpc.rs +++ b/src/rpc.rs @@ -11,6 +11,7 @@ pub type ChainClient = pub type StateClient = sc_rpc_api::state::StateClient>; +pub type AuthorClient = sc_rpc_api::author::AuthorClient, types::BlockHash>; pub trait RpcExtension { fn raw_rpc(&mut self) -> RawClient { self.rpc() diff --git a/src/subxt.rs b/src/subxt.rs deleted file mode 100644 index b6e8c1d..0000000 --- a/src/subxt.rs +++ /dev/null @@ -1,96 +0,0 @@ -use futures::compat::Future01CompatExt; -use futures::{ - channel::mpsc, - compat::{Compat01As03, Sink01CompatExt, Stream01CompatExt}, - sink::SinkExt, - stream::StreamExt, -}; -use futures01::sync::mpsc as mpsc01; -use jsonrpc_core::MetaIoHandler; -use jsonrpsee::{ - common::{Request, Response}, - transport::TransportClient, -}; -pub use sc_service::{ - config::{DatabaseConfig, KeystoreConfig}, - Error as ServiceError, -}; -use std::{future::Future, pin::Pin, sync::Arc}; - -/// Error thrown by the client. -#[derive(Debug, derive_more::Display, derive_more::From, derive_more::Error)] -pub enum SubxtClientError { - /// Failed to parse json rpc message. - #[display(fmt = "{}", _0)] - Json(serde_json::Error), - /// Channel closed. - #[display(fmt = "{}", _0)] - Mpsc(mpsc::SendError), -} - -/// Client for an embedded substrate node. -pub struct SubxtClient { - request_sink: mpsc::Sender, - response_stream: Compat01As03>, -} - -impl SubxtClient { - /// Create a new client. - pub fn new(rpc: Arc>) -> Self { - let (request_sink, mut request_stream) = mpsc::channel::(4); - let (response_sink, response_stream) = mpsc01::channel::(4); - - let session = response_sink.clone(); - - tokio::task::spawn(async move { - while let Some(request) = request_stream.next().await { - let rpc = rpc.clone(); - let mut response_sink = response_sink.clone().sink_compat(); - - let response = rpc.handle_request(&request, session.clone().into()).compat().await; - if let Ok(Some(response)) = response { - response_sink.send(response).await.ok(); - } - } - }); - - Self { - request_sink, - response_stream: response_stream.compat(), - } - } -} - -impl TransportClient for SubxtClient { - type Error = SubxtClientError; - - fn send_request<'a>( - &'a mut self, - request: Request, - ) -> Pin> + Send + 'a>> { - Box::pin(async move { - let request = serde_json::to_string(&request)?; - self.request_sink.send(request).await?; - Ok(()) - }) - } - - fn next_response<'a>(&'a mut self) -> Pin> + Send + 'a>> { - Box::pin(async move { - let response = self - .response_stream - .next() - .await - .expect("channel shouldn't close") - .unwrap(); - Ok(serde_json::from_str(&response)?) - }) - } -} - -impl From for jsonrpsee::Client { - fn from(client: SubxtClient) -> Self { - let client = jsonrpsee::raw::RawClient::new(client); - jsonrpsee::Client::new(client) - } -} diff --git a/src/test/blackbox.rs b/src/test/blackbox.rs index 3349d4e..59452ee 100644 --- a/src/test/blackbox.rs +++ b/src/test/blackbox.rs @@ -5,29 +5,38 @@ use crate::{ types, }; use jsonrpc_core_client::{transports::local, RpcChannel}; +use crate::node::TestRuntimeRequirements; -pub enum BlackBoxNode { +/// A black box node, either runs a manual seal background node, +/// or connects via ws to a running node. +pub enum BlackBoxNode { /// Connects to an external node. External(String), /// Spawns a pristine node. - Internal(InternalNode), + Internal(InternalNode), } /// A black box test. -pub struct BlackBox { - node: BlackBoxNode, +pub struct BlackBox { + node: BlackBoxNode, } -impl BlackBox -where - Runtime: frame_system::Trait, +impl BlackBox + where + N: TestRuntimeRequirements, { - pub async fn with_state(&mut self, closure: impl FnOnce() -> R) -> R { - TestExternalities::::new(self.rpc()).execute_with(closure) + /// Execute provided `Fn` in an externalities provided environment. + pub async fn with_state(&mut self, func: impl FnOnce() -> T) -> T { + TestExternalities::::new(self.rpc()).execute_with(func) + } + + /// Wait `number` of blocks. + pub fn wait_blocks(&self, _number: impl Into>) { + todo!() } } -impl rpc::RpcExtension for BlackBox { +impl rpc::RpcExtension for BlackBox { fn rpc + 'static>(&mut self) -> TClient { let client = match self.node { BlackBoxNode::External(ref url) => futures::executor::block_on(rpc::connect_ws(&url)).unwrap(), @@ -43,15 +52,9 @@ impl rpc::RpcExtension for BlackBox { } } -impl BlackBox { - pub fn new(node: BlackBoxNode) -> Self { +impl BlackBox{ + /// Create an instance of `BlackBox`. + pub fn new(node: BlackBoxNode) -> Self { Self { node } } } - -impl BlackBox { - /// Wait `number` of blocks. - pub fn wait_blocks(&self, _number: impl Into>) { - todo!() - } -} diff --git a/src/test/deterministic.rs b/src/test/deterministic.rs index 122872c..2872585 100644 --- a/src/test/deterministic.rs +++ b/src/test/deterministic.rs @@ -1,36 +1,61 @@ -use crate::test::externalities::TestExternalities; +use crate::test::externalities::{TestExternalities, TxPoolExtApi}; use crate::{ node::InternalNode, rpc::{self, RpcExtension}, }; -use jsonrpc_core_client::transports::local; use jsonrpc_core_client::RpcChannel; use manual_seal::rpc::ManualSealClient; +use sp_core::{ + offchain::TransactionPoolExt, + testing::{KeyStore, SR25519}, + traits::KeystoreExt, +}; +use sp_externalities::{Externalities, ExternalitiesExt}; +use sp_keyring::sr25519::Keyring; use std::ops::{Deref, DerefMut}; +use crate::node::TestRuntimeRequirements; +use sp_runtime::traits::Block as BlockT; /// A deterministic internal instance of substrate node. -pub struct Deterministic { - node: InternalNode, +pub struct Deterministic { + node: InternalNode, + externalities: TestExternalities, } -impl rpc::RpcExtension for Deterministic { +impl rpc::RpcExtension for Deterministic { fn rpc + 'static>(&mut self) -> TClient { - use futures01::Future; - let rpc_handler = self.node.rpc_handler(); - let (client, fut) = local::connect::(rpc_handler); - self.node.tokio_runtime().spawn(fut.map_err(|_| ())); - - client + self.node.rpc_client() } } -impl Deterministic { - pub fn new(node: InternalNode) -> Self { - Self { node } +impl Deterministic { + pub fn new(node: InternalNode) -> Self { + let mut externalities = TestExternalities::::new(node.rpc_client()); + + (&mut externalities as &mut dyn Externalities) + .register_extension(TransactionPoolExt::new(TxPoolExtApi::::new(node.rpc_client()))) + .expect("Failed to transaction register"); + + let keystore = KeyStore::new(); + + // here we load all the test keys (which have initial balances) + // in the keyring into the keystore + for key in Keyring::iter() { + keystore + .write() + .sr25519_generate_new(SR25519, Some(&format!("//{}", key))) + .expect("failed to add key to keystore: "); + } + + (&mut externalities as &mut dyn Externalities) + .register_extension(KeystoreExt(keystore)) + .expect("Failed to transaction register"); + + Self { node, externalities } } } -impl Deterministic { +impl Deterministic { pub fn assert_log_line(&self, module: &str, content: &str) { if let Some(logs) = self.node.logs().read().get(module) { for log in logs { @@ -45,26 +70,24 @@ impl Deterministic { } pub fn produce_blocks(&mut self, num: usize) { - log::info!("produce blocks"); - - let client = self.rpc::>(); - log::info!("produce blocks"); + let client = self.rpc::::Hash>>(); for _ in 0..num { self.node .tokio_runtime() - .block_on(client.create_block(true, true, None)) + .block_on(client.create_block(true, false, None)) .expect("block production failed: "); } log::info!("sealed {} blocks", num) } + /// Execute closure in an externalities provided environment. pub fn with_state(&mut self, closure: impl FnOnce() -> R) -> R { - TestExternalities::::new(self.rpc()).execute_with(closure) + self.externalities.execute_with(closure) } } -impl Deref for Deterministic { +impl Deref for Deterministic { type Target = InternalNode; fn deref(&self) -> &Self::Target { @@ -72,7 +95,7 @@ impl Deref for Deterministic { } } -impl DerefMut for Deterministic { +impl DerefMut for Deterministic { fn deref_mut(&mut self) -> &mut Self::Target { &mut self.node } diff --git a/src/test/externalities.rs b/src/test/externalities.rs index 69d8169..56c4e73 100644 --- a/src/test/externalities.rs +++ b/src/test/externalities.rs @@ -1,54 +1,89 @@ use crate::rpc; use futures01::Future; -use sp_externalities::{Error, Extension}; +use sp_core::offchain::TransactionPool; +use sp_externalities::Extensions; use sp_storage::{ChildInfo, StorageKey}; use std::any::{Any, TypeId}; +use std::collections::HashMap; +use crate::node::TestRuntimeRequirements; -pub struct TestExternalities { - client: rpc::StateClient, +pub struct TestExternalities { + client: rpc::StateClient, + overlay: HashMap, Option>>, + extensions: Extensions, } -impl TestExternalities { - pub fn new(client: rpc::StateClient) -> Self { +pub struct TxPoolExtApi { + client: rpc::AuthorClient, +} + +impl TransactionPool for TxPoolExtApi { + fn submit_transaction(&mut self, extrinsic: Vec) -> Result<(), ()> { + match self.client.submit_extrinsic(extrinsic.into()).wait() { + Ok(hash) => log::info!("extrinsic successfully submitted with hash {:?}", hash), + Err(err) => log::error!("error submitting extrinsic {:?}", err), + }; + Ok(()) + } +} + +impl TxPoolExtApi { + pub fn new(client: rpc::AuthorClient) -> Self { Self { client } } +} + +impl TestExternalities { + pub fn new(client: rpc::StateClient) -> Self { + Self { + client, + overlay: Default::default(), + extensions: Extensions::new(), + } + } pub fn execute_with(&mut self, execute: impl FnOnce() -> R) -> R { sp_externalities::set_and_run_with_externalities(self, execute) } } -// TODO [ToDr] Most likely the implementation is not really relevant, but we still need the trait. -impl sp_externalities::ExtensionStore for TestExternalities { - fn extension_by_type_id(&mut self, _type_id: TypeId) -> Option<&mut dyn Any> { - todo!() +impl sp_externalities::ExtensionStore for TestExternalities { + fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any> { + self.extensions.get_mut(type_id) } fn register_extension_with_type_id( &mut self, - _type_id: TypeId, - _extension: Box, - ) -> Result<(), Error> { - todo!() + type_id: TypeId, + extension: Box, + ) -> Result<(), sp_externalities::Error> { + self.extensions.register_with_type_id(type_id, extension) } - fn deregister_extension_by_type_id(&mut self, _type_id: TypeId) -> Result<(), Error> { - todo!() + fn deregister_extension_by_type_id(&mut self, type_id: TypeId) -> Result<(), sp_externalities::Error> { + self.extensions + .deregister(type_id) + .ok_or(sp_externalities::Error::ExtensionIsNotRegistered(type_id)) + .map(drop) } } -impl sp_externalities::Externalities for TestExternalities { +impl sp_externalities::Externalities for TestExternalities { fn set_offchain_storage(&mut self, _key: &[u8], _value: Option<&[u8]>) { - todo!() + unimplemented!("set_offchain_storage") } fn storage(&self, key: &[u8]) -> Option> { + if let Some(value) = self.overlay.get(key) { + log::info!("fetching from overlay: {:?}", key); + return value.as_ref().cloned(); + } + // this is pretty weird, but stay with me. // the tests in `simple_run` is wrapped with a tokio runtime // so this means the code path here has access to the tokio v0.1 runtime - // requried for this future to complete, without the runtime, this call would panic. - self.client - .storage(StorageKey(key.to_vec()), None) + // requried for this future to complete, without the runtime, this call would panic. + self.client.storage(StorageKey(key.to_vec()), None) .wait() .ok() .flatten() @@ -56,95 +91,96 @@ impl sp_externalities::Externalities for TestExter } fn storage_hash(&self, _key: &[u8]) -> Option> { - todo!() + unimplemented!("storage_hash") } fn child_storage_hash(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option> { - todo!() + unimplemented!("child_storage_hash") } fn child_storage(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option> { - todo!() + unimplemented!("child_storage") } fn next_storage_key(&self, _key: &[u8]) -> Option> { - todo!() + unimplemented!("next_storage_key") } fn next_child_storage_key(&self, _child_info: &ChildInfo, _key: &[u8]) -> Option> { - todo!() + unimplemented!("next_child_storage_key") } fn kill_child_storage(&mut self, _child_info: &ChildInfo) { - todo!() + unimplemented!("kill_child_storage") } fn clear_prefix(&mut self, _prefix: &[u8]) { - todo!() + unimplemented!("clear_prefix") } fn clear_child_prefix(&mut self, _child_info: &ChildInfo, _prefix: &[u8]) { - todo!() + unimplemented!("clear_child_prefix") } - fn place_storage(&mut self, _key: Vec, _value: Option>) { - // Create a sudo transaction that alters storage on-chain. - todo!() + fn place_storage(&mut self, key: Vec, value: Option>) { + log::info!("inserting into overlay: {:?}\n\n{:?}", key, value); + + self.overlay.insert(key, value); } fn place_child_storage(&mut self, _child_info: &ChildInfo, _key: Vec, _value: Option>) { - todo!() + unimplemented!("place_child_storage") } fn chain_id(&self) -> u64 { - todo!() + unimplemented!("chain_id") } fn storage_root(&mut self) -> Vec { - todo!() + unimplemented!("storage_root") } fn child_storage_root(&mut self, _child_info: &ChildInfo) -> Vec { - todo!() + unimplemented!("child_storage_root") } fn storage_append(&mut self, _key: Vec, _value: Vec) { - todo!() + unimplemented!("storage_append") } fn storage_changes_root(&mut self, _parent: &[u8]) -> Result>, ()> { - todo!() + unimplemented!("storage_changes_root") } fn storage_start_transaction(&mut self) { - todo!() + unimplemented!("storage_start_transaction") } fn storage_rollback_transaction(&mut self) -> Result<(), ()> { - todo!() + unimplemented!("storage_rollback_transaction") } fn storage_commit_transaction(&mut self) -> Result<(), ()> { - todo!() + unimplemented!("storage_commit_transaction") } fn wipe(&mut self) { - todo!() + unimplemented!("wipe") } fn commit(&mut self) { - todo!() + unimplemented!("commit") } fn read_write_count(&self) -> (u32, u32, u32, u32) { - todo!() + unimplemented!("read_write_count") } fn reset_read_write_count(&mut self) { - todo!() + unimplemented!("reset_read_write_count") } fn set_whitelist(&mut self, _: Vec>) { - todo!() + unimplemented!("set_whitelist") } } diff --git a/src/test/mod.rs b/src/test/mod.rs index 966586e..3442acd 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -2,21 +2,16 @@ pub mod blackbox; pub mod deterministic; pub mod externalities; -pub fn blackbox_external(url: &str) -> blackbox::BlackBox { +use crate::node::{InternalNode, TestRuntimeRequirements}; + +pub fn blackbox_external(url: &str) -> blackbox::BlackBox { blackbox::BlackBox::new(blackbox::BlackBoxNode::External(url.into())) } -pub fn blackbox_internal() -> blackbox::BlackBox { - let node = crate::node::InternalNode::::builder().start(); +pub fn blackbox_internal(node: InternalNode) -> blackbox::BlackBox { blackbox::BlackBox::new(blackbox::BlackBoxNode::Internal(node)) } -pub fn deterministic( - node: crate::node::InternalNode, -) -> deterministic::Deterministic { +pub fn deterministic(node: InternalNode) -> deterministic::Deterministic { deterministic::Deterministic::new(node) } - -pub fn node() -> crate::node::InternalNodeBuilder { - crate::node::InternalNode::::builder() -} diff --git a/tests/simple_run.rs b/tests/simple_run.rs index 60c9a25..a0ac9c4 100644 --- a/tests/simple_run.rs +++ b/tests/simple_run.rs @@ -1,27 +1,42 @@ +use frame_system::offchain::{SendSignedTransaction, Signer}; use futures::compat::Future01CompatExt; -use pallet_indices::address::Address; -use runtime::Runtime; +use pallet_balances::Call as BalancesCall; +use runtime::{Runtime, RuntimeKeyType}; use sp_core::crypto::Pair; use sp_keyring::Sr25519Keyring; use sp_runtime::{traits::IdentifyAccount, MultiSigner}; -use substrate_subxt::{balances::TransferCallExt, ClientBuilder, DefaultNodeRuntime, PairSigner}; -use substrate_test_runner::{prelude::*, rpc, subxt, test}; +use substrate_test_runner::{ + prelude::*, rpc, test, node::{InternalNode, TestRuntimeRequirements}, + chain_spec::spec_factory, +}; +use sc_executor::native_executor_instance; + +// Declare an instance of the native executor named `Executor`. Include the wasm binary as the +// equivalent wasm code. +native_executor_instance!( + pub Executor, + runtime::api::dispatch, + runtime::native_version, +); + +struct Node; + +impl TestRuntimeRequirements for Node { + type OpaqueBlock = runtime::opaque::Block; + type Executor = Executor; + type Runtime = runtime::Runtime; + type RuntimeApi = runtime::RuntimeApi; +} #[test] fn should_run_off_chain_worker() { - let mut test = test::deterministic( - test::node::() - // TODO [ToDr] This does not work properly, since we have a shared logger. - .cli_param("-lsc_offchain=trace") - // .with_sudo(Keyring::Alice) - // .with_genesis_state(|| { - // ... - // }) - .start(), - ); - let chain_client = test.rpc::>(); - let rpc_client = test.raw_rpc(); - test.tokio_runtime().block_on_std(async { + let node = InternalNode::::new(spec_factory).unwrap(); + + let mut test = test::deterministic(node); + let mut runtime = tokio_compat::runtime::Runtime::new().unwrap(); + runtime.block_on_std(async { + let chain_client = test.rpc::>(); + let rpc_client = test.raw_rpc(); // TODO [ToDr] This should be even rawer - allowing to pass JSON call, // which in turn could be collected from the UI. @@ -34,58 +49,77 @@ fn should_run_off_chain_worker() { let header = chain_client.header(None).compat().await.unwrap(); println!("{:?}", header); - }); + test.produce_blocks(15); - test.produce_blocks(15); - test.assert_log_line("db", "best = true"); + test.assert_log_line("db", "best = true"); + }); } #[test] fn should_read_state() { // given - let mut test = test::deterministic(test::node::().start()); + let node = InternalNode::::new(spec_factory).unwrap(); + let mut test = test::deterministic(node); type Balances = pallet_balances::Module; test.produce_blocks(1); let alice = Sr25519Keyring::Alice.pair(); let bob = Sr25519Keyring::Bob.pair(); - let signer = PairSigner::new(alice.clone()); - - let rpc_handlers = test.rpc_handler(); - - let alice_balance = test.with_state(|| Balances::free_balance(MultiSigner::from(alice.public()).into_account())); - - test.tokio_runtime().block_on_std(async { - let client = ClientBuilder::::new() - .set_client(subxt::SubxtClient::new(rpc_handlers)) - .build() - .await - .unwrap(); - - client - .transfer( - &signer, - &Address::from(MultiSigner::from(bob.public()).into_account()), - 8900000000000000, - ) - .await - .expect("failed to transfer funds"); + let (alice_public, bob_public) = ( + alice.public(), + bob.public(), + ); + + let signer = Signer::::all_accounts() + // only use alice' account for signing + .with_filter(vec![alice.public().into()]); + + let (bob_balance, alice_balance) = test.with_state(|| { + let events = frame_system::Module::::events(); + log::info!("{:#?}", events); + ( + Balances::free_balance(MultiSigner::from(bob_public).into_account()), + Balances::free_balance(MultiSigner::from(alice_public).into_account()), + ) }); + let mut result = test.with_state(|| { + signer.send_signed_transaction(|_account| { + BalancesCall::transfer(MultiSigner::from(bob_public).into_account().into(), 8900000000000000) + }) + }); + + assert!(result.pop().unwrap().1.is_ok()); + test.produce_blocks(1); - let new_alice_balance = - test.with_state(|| Balances::free_balance(MultiSigner::from(alice.public()).into_account())); + let (new_bob_balance, new_alice_balance) = test.with_state(|| { + let events = frame_system::Module::::events(); + log::info!("{:#?}", events); + ( + Balances::free_balance(MultiSigner::from(bob_public).into_account()), + Balances::free_balance(MultiSigner::from(alice_public).into_account()), + ) + }); + + // FIXME: alice' balance doesnt change lmao + log::info!( + "\n\n{:#?}: before {}, after {}\n\n{:#?}: before {}, after {}\n\n", + MultiSigner::from(bob_public), + bob_balance, + new_bob_balance, + MultiSigner::from(alice_public), + alice_balance, + new_alice_balance + ); - // account for fees - assert!((alice_balance - new_alice_balance) > 8900000000000000); + assert_eq!((new_bob_balance - bob_balance), 8900000000000000); } #[test] -#[ignore] // wait_blocks not implemented yet. fn external_black_box() { - let test = test::blackbox_external::("ws://127.0.0.1:3001"); + let test = test::blackbox_external::("ws://127.0.0.1:3001"); test.wait_blocks(5_u32); }