From 845e6ae32abeaa5e2f63d24c936054f73985e7b8 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Thu, 10 Jun 2021 21:32:02 +0200 Subject: [PATCH] chore(deps): update substrate cumulus polkadot deps --- Cargo.lock | 2872 ++++++++++++++--------- Cargo.toml | 171 ++ node/Cargo.toml | 295 +-- node/src/chain_spec.rs | 60 +- node/src/cli.rs | 70 +- node/src/command.rs | 608 +++-- node/src/service.rs | 334 ++- pallets/asset-depository/Cargo.toml | 12 +- pallets/asset-index/Cargo.toml | 23 +- pallets/committee/Cargo.toml | 14 +- pallets/local-treasury/Cargo.toml | 14 +- pallets/price-feed/Cargo.toml | 17 +- pallets/remote-asset-manager/Cargo.toml | 28 +- pallets/saft-registry/Cargo.toml | 14 +- pallets/xcm-asset-support/Cargo.toml | 20 +- pallets/xcm-asset-support/src/lib.rs | 12 +- primitives/xcm-calls/Cargo.toml | 26 +- runtime/Cargo.toml | 79 +- runtime/src/lib.rs | 73 +- 19 files changed, 2796 insertions(+), 1946 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d35e78631..19f62e3b49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "adler" -version = "1.0.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" [[package]] name = "aead" @@ -98,24 +98,13 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] -[[package]] -name = "alga" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" -dependencies = [ - "approx 0.3.2", - "num-complex 0.2.4", - "num-traits", -] - [[package]] name = "always-assert" version = "0.1.2" @@ -155,15 +144,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "approx" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" -dependencies = [ - "num-traits", -] - [[package]] name = "arrayref" version = "0.3.6" @@ -210,14 +190,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "async-channel" -version = "1.6.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" dependencies = [ "concurrent-queue", "event-listener", @@ -226,16 +206,16 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", "once_cell", - "slab", + "vec-arena", ] [[package]] @@ -256,20 +236,20 @@ dependencies = [ [[package]] name = "async-io" -version = "1.4.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" +checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd" dependencies = [ "concurrent-queue", "fastrand", "futures-lite", "libc", "log", + "nb-connect", "once_cell", "parking", "polling", - "slab", - "socket2 0.4.0", + "vec-arena", "waker-fn", "winapi 0.3.9", ] @@ -294,16 +274,15 @@ dependencies = [ [[package]] name = "async-process" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac" +checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda" dependencies = [ "async-io", "blocking", - "cfg-if 1.0.0", + "cfg-if 0.1.10", "event-listener", "futures-lite", - "libc", "once_cell", "signal-hook", "winapi 0.3.9", @@ -321,7 +300,7 @@ dependencies = [ "async-io", "async-lock", "async-process", - "crossbeam-utils 0.8.4", + "crossbeam-utils 0.8.1", "futures-channel", "futures-core", "futures-io", @@ -332,7 +311,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", "pin-utils", "slab", "wasm-bindgen-futures", @@ -340,9 +319,9 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d613d619c2886fc0f4b5a777eceab405b23de82d73f0fc61ae402fdb9bc6fb2" +checksum = "f665c56111e244fe38e7708ee10948a4356ad6a548997c21f5a63a0f4e0edc4d" dependencies = [ "async-std", "async-trait", @@ -366,7 +345,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -379,7 +358,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", ] [[package]] @@ -392,7 +371,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", ] [[package]] @@ -429,16 +408,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.59" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744" +checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" dependencies = [ - "addr2line 0.15.1", - "cc", + "addr2line 0.14.1", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.24.0", + "object 0.22.0", "rustc-demangle", ] @@ -471,14 +449,17 @@ name = "beef" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409" +dependencies = [ + "serde", +] [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6432d4c8cbf16044c0003a22359f7f8184729b98" dependencies = [ "beefy-primitives", - "futures 0.3.15", + "futures 0.3.14", "hex", "log", "parity-scale-codec", @@ -489,6 +470,7 @@ dependencies = [ "sc-network-gossip", "sp-api", "sp-application-crypto", + "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-core", @@ -502,11 +484,11 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6432d4c8cbf16044c0003a22359f7f8184729b98" dependencies = [ "beefy-gadget", "beefy-primitives", - "futures 0.3.15", + "futures 0.3.14", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -523,7 +505,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6432d4c8cbf16044c0003a22359f7f8184729b98" dependencies = [ "parity-scale-codec", "sp-api", @@ -535,10 +517,11 @@ dependencies = [ [[package]] name = "bincode" -version = "1.3.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" dependencies = [ + "byteorder", "serde", ] @@ -569,9 +552,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.20.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d" dependencies = [ "funty", "radium", @@ -646,7 +629,7 @@ dependencies = [ "block-padding 0.1.5", "byte-tools", "byteorder", - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -697,6 +680,114 @@ dependencies = [ "once_cell", ] +[[package]] +name = "bp-header-chain" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "finality-grandpa", + "frame-support", + "parity-scale-codec", + "serde", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-messages" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-runtime", + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-std", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-rococo" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "parity-scale-codec", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + +[[package]] +name = "bp-runtime" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "frame-support", + "hash-db", + "num-traits", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + +[[package]] +name = "bp-test-utils" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-header-chain", + "ed25519-dalek", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-wococo" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "parity-scale-codec", + "sp-api", + "sp-runtime", + "sp-std", + "sp-version", +] + [[package]] name = "bs58" version = "0.4.0" @@ -705,9 +796,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.16" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" dependencies = [ "memchr", ] @@ -723,9 +814,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "byte-slice-cast" @@ -741,9 +832,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "bytes" @@ -774,6 +865,15 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +[[package]] +name = "camino" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9" +dependencies = [ + "serde", +] + [[package]] name = "cargo-platform" version = "0.1.1" @@ -796,11 +896,25 @@ dependencies = [ "serde_json", ] +[[package]] +name = "cargo_metadata" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +dependencies = [ + "camino", + "cargo-platform", + "semver 0.11.0", + "semver-parser 0.10.2", + "serde", + "serde_json", +] + [[package]] name = "cc" -version = "1.0.67" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" dependencies = [ "jobserver", ] @@ -870,9 +984,9 @@ dependencies = [ [[package]] name = "cid" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "7d88f30b1e74e7063df5711496f3ee6e74a9735d62062242d70cddf77717f18e" dependencies = [ "multibase", "multihash", @@ -941,6 +1055,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const_fn" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -948,18 +1068,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "convert_case" -version = "0.4.0" +name = "core-foundation" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.2", "libc", ] @@ -969,6 +1093,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + [[package]] name = "cpp_demangle" version = "0.3.2" @@ -980,13 +1110,10 @@ dependencies = [ ] [[package]] -name = "cpufeatures" -version = "0.1.1" +name = "cpuid-bool" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4" -dependencies = [ - "libc", -] +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "cpuid-bool" @@ -996,38 +1123,36 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcee7a5107071484772b89fdf37f0f460b7db75f476e43ea7a684fd942470bcf" +checksum = "c8ca3560686e7c9c7ed7e0fe77469f2410ba5d7781b1acaa9adc8d8deea28e3e" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654ab96f0f1cab71c0d323618a58360a492da2c341eb2c1f977fc195c664001b" +checksum = "baf9bf1ffffb6ce3d2e5ebc83549bd2436426c99b31cc550d521364cbe35d276" dependencies = [ - "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.23.0", + "gimli 0.24.0", "log", "regalloc", "serde", "smallvec 1.6.1", "target-lexicon", - "thiserror", ] [[package]] name = "cranelift-codegen-meta" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65994cfc5be9d5fd10c5fc30bcdddfa50c04bb79c91329287bff846434ff8f14" +checksum = "4cc21936a5a6d07e23849ffe83e5c1f6f50305c074f4b2970ca50c13bf55b821" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -1035,27 +1160,27 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "889d720b688b8b7df5e4903f9b788c3c59396050f5548e516e58ccb7312463ab" +checksum = "ca5b6ffaa87560bebe69a5446449da18090b126037920b0c1c6d5945f72faf6b" dependencies = [ "serde", ] [[package]] name = "cranelift-entity" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2e6884a363e42a9ba980193ea8603a4272f8a92bd8bbaf9f57a94dbea0ff96" +checksum = "7d6b4a8bef04f82e4296782646f733c641d09497df2fabf791323fefaa44c64c" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f41e2f9b57d2c030e249d0958f1cdc2c3cd46accf8c0438b3d1944e9153444" +checksum = "c31b783b351f966fce33e3c03498cb116d16d97a8f9978164a60920bd0d3a99c" dependencies = [ "cranelift-codegen", "log", @@ -1065,9 +1190,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab70ba7575665375d31cbdea2462916ce58be887834e1b83c860b43b51af637" +checksum = "a77c88d3dd48021ff1e37e978a00098524abd3513444ae252c08d37b310b3d2a" dependencies = [ "cranelift-codegen", "target-lexicon", @@ -1075,9 +1200,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.71.0" +version = "0.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fc3d2e70da6439adf97648dcdf81834363154f2907405345b6fbe7ca38918c" +checksum = "edb6d408e2da77cdbbd65466298d44c86ae71c1785d2ab0d8657753cdb4d9d89" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1101,12 +1226,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.4", + "crossbeam-utils 0.8.1", ] [[package]] @@ -1127,8 +1252,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.4", - "crossbeam-utils 0.8.4", + "crossbeam-epoch 0.9.1", + "crossbeam-utils 0.8.1", ] [[package]] @@ -1148,14 +1273,15 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.4", + "const_fn", + "crossbeam-utils 0.8.1", "lazy_static", - "memoffset 0.6.3", + "memoffset 0.6.1", "scopeguard", ] @@ -1183,9 +1309,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" dependencies = [ "autocfg", "cfg-if 1.0.0", @@ -1204,7 +1330,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", "subtle 1.0.0", ] @@ -1229,12 +1355,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.20" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19" dependencies = [ "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1251,7 +1377,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "sc-cli", "sc-service", @@ -1261,65 +1387,68 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", - "parking_lot 0.9.0", + "parking_lot 0.10.2", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", "sc-client-api", + "sp-api", "sp-consensus", "sp-core", "sp-io", "sp-runtime", - "sp-state-machine", "tracing", ] [[package]] -name = "cumulus-client-consensus-common" +name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "async-trait", - "dyn-clone", - "futures 0.3.15", + "cumulus-client-consensus-common", + "cumulus-primitives-core", + "futures 0.3.14", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime", + "parking_lot 0.10.2", + "polkadot-service", "sc-client-api", + "sc-consensus-aura", + "sc-consensus-slots", + "sc-telemetry", "sp-api", + "sp-application-crypto", "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-core", "sp-inherents", + "sp-keystore", "sp-runtime", - "sp-trie", "substrate-prometheus-endpoint", - "tokio 0.1.22", "tracing", ] [[package]] -name = "cumulus-client-consensus-relay-chain" +name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "async-trait", - "cumulus-client-consensus-common", - "cumulus-primitives-core", - "cumulus-primitives-parachain-inherent", - "futures 0.3.15", + "dyn-clone", + "futures 0.3.14", "parity-scale-codec", - "parking_lot 0.9.0", - "polkadot-service", + "polkadot-primitives", + "polkadot-runtime", "sc-client-api", "sp-api", "sp-block-builder", @@ -1328,6 +1457,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", + "sp-trie", "substrate-prometheus-endpoint", "tracing", ] @@ -1335,10 +1465,10 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "futures-timer 3.0.2", "parity-scale-codec", "parking_lot 0.10.2", @@ -1356,20 +1486,49 @@ dependencies = [ "tracing", ] +[[package]] +name = "cumulus-client-pov-recovery" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" +dependencies = [ + "cumulus-primitives-core", + "futures 0.3.14", + "futures-timer 3.0.2", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-parachain", + "polkadot-primitives", + "polkadot-service", + "polkadot-statement-table", + "rand 0.8.3", + "sc-client-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-maybe-compressed-blob", + "sp-runtime", + "tracing", +] + [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-client-collator", "cumulus-client-consensus-common", + "cumulus-client-pov-recovery", "cumulus-primitives-core", - "futures 0.3.15", "parity-scale-codec", + "parking_lot 0.10.2", + "polkadot-overseer", "polkadot-primitives", "polkadot-service", "sc-chain-spec", "sc-client-api", + "sc-consensus-babe", "sc-service", "sc-telemetry", "sc-tracing", @@ -1381,10 +1540,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "cumulus-pallet-dmp-queue" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=master#11a0bca6d7e41a584250dd2166f66a2a9ec64365" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "rand 0.8.3", + "rand_chacha 0.3.0", + "sp-io", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", +] + [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-parachain-inherent", @@ -1414,13 +1592,14 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", "serde", + "sp-io", "sp-runtime", "sp-std", "xcm", @@ -1429,7 +1608,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1447,7 +1626,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1455,6 +1634,7 @@ dependencies = [ "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", + "sp-api", "sp-runtime", "sp-std", "sp-trie", @@ -1464,10 +1644,12 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ + "async-trait", "cumulus-primitives-core", "parity-scale-codec", + "polkadot-service", "sc-client-api", "sp-api", "sp-core", @@ -1482,7 +1664,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech/cumulus?branch=master#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1499,9 +1681,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "2.1.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e1720189a637d44fe464f4df1e6eb900b4835255b14354497c78af37d9bb8" +checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5" dependencies = [ "byteorder", "digest 0.8.1", @@ -1512,9 +1694,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "639891fde0dbea823fc3d798a0fdf9d2f9440a42d64a78ab3488b0ca025117b3" +checksum = "c8492de420e9e60bc9a1d66e2dbb91825390b738a388606600663fc529b4b307" dependencies = [ "byteorder", "digest 0.9.0", @@ -1546,7 +1728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f83e699727abca3c56e187945f303389590305ab2f0185ea445aa66e8d5f2a" dependencies = [ "data-encoding", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1557,7 +1739,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1576,14 +1758,13 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.13" +version = "0.99.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" +checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ - "convert_case", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1592,7 +1773,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.4", + "generic-array 0.12.3", ] [[package]] @@ -1606,9 +1787,9 @@ dependencies = [ [[package]] name = "directories" -version = "3.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7" +checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" dependencies = [ "dirs-sys", ] @@ -1625,12 +1806,12 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", - "redox_users", + "redox_users 0.3.5", "winapi 0.3.9", ] @@ -1641,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users", + "redox_users 0.4.0", "winapi 0.3.9", ] @@ -1655,6 +1836,12 @@ dependencies = [ "quick-error 1.2.3", ] +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "dyn-clonable" version = "0.9.0" @@ -1673,7 +1860,7 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1684,9 +1871,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" [[package]] name = "ed25519" -version = "1.1.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0860415b12243916284c67a9be413e044ee6668247b99ba26d94b2bc06c8f6" +checksum = "37c66a534cbb46ab4ea03477eae19d5c22c01da8258030280b7bd9d8433fb6ef" dependencies = [ "signature", ] @@ -1697,11 +1884,11 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.0.0", "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.5", + "sha2 0.9.2", "zeroize", ] @@ -1720,7 +1907,7 @@ dependencies = [ "heck", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1740,7 +1927,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1751,7 +1938,7 @@ checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -1855,7 +2042,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", ] [[package]] @@ -1876,7 +2063,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "synstructure", ] @@ -1894,9 +2081,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" +checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" dependencies = [ "instant", ] @@ -1927,7 +2114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c" dependencies = [ "either", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "log", "num-traits", @@ -1955,9 +2142,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -1975,16 +2162,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" dependencies = [ "matches", "percent-encoding 2.1.0", @@ -1993,14 +2180,14 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", "linregress", "log", "parity-scale-codec", - "paste", + "paste 1.0.4", "sp-api", "sp-io", "sp-runtime", @@ -2012,7 +2199,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "Inflector", "chrono", @@ -2035,7 +2222,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -2048,7 +2235,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -2063,7 +2250,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "serde", @@ -2074,16 +2261,17 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "log", + "max-encoded-len", "once_cell", "parity-scale-codec", - "paste", + "paste 1.0.4", "serde", "smallvec 1.6.1", "sp-arithmetic", @@ -2100,41 +2288,41 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "Inflector", "frame-support-procedural-tools", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2151,7 +2339,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -2165,7 +2353,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-api", @@ -2174,7 +2362,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "parity-scale-codec", @@ -2185,9 +2373,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0" +checksum = "bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431" [[package]] name = "fs-swap" @@ -2241,15 +2429,15 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" +checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" [[package]] name = "futures" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" dependencies = [ "futures-channel", "futures-core", @@ -2262,9 +2450,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" dependencies = [ "futures-core", "futures-sink", @@ -2272,9 +2460,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" [[package]] name = "futures-cpupool" @@ -2282,7 +2470,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "num_cpus", ] @@ -2292,21 +2480,21 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ - "futures 0.1.31", - "futures 0.3.15", + "futures 0.1.30", + "futures 0.3.14", "lazy_static", "log", "parking_lot 0.9.0", - "pin-project 0.4.28", + "pin-project 0.4.27", "serde", "serde_json", ] [[package]] name = "futures-executor" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" dependencies = [ "futures-core", "futures-task", @@ -2316,9 +2504,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" [[package]] name = "futures-lite" @@ -2331,21 +2519,20 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" dependencies = [ - "autocfg", "proc-macro-hack", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -2361,15 +2548,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" [[package]] name = "futures-timer" @@ -2385,12 +2572,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" dependencies = [ - "autocfg", - "futures 0.1.31", + "futures 0.1.30", "futures-channel", "futures-core", "futures-io", @@ -2398,7 +2584,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2411,20 +2597,33 @@ version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +[[package]] +name = "generator" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc" +dependencies = [ + "cc", + "libc", + "log", + "rustc_version", + "winapi 0.3.9", +] + [[package]] name = "generic-array" -version = "0.12.4" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" dependencies = [ "typenum", ] [[package]] name = "generic-array" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309" +checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" dependencies = [ "typenum", ] @@ -2452,9 +2651,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2476,17 +2675,17 @@ name = "gimli" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] [[package]] name = "gimli" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" +dependencies = [ + "fallible-iterator", + "indexmap", + "stable_deref_trait", +] [[package]] name = "glob" @@ -2529,7 +2728,7 @@ dependencies = [ "byteorder", "bytes 0.4.12", "fnv", - "futures 0.1.31", + "futures 0.1.30", "http 0.1.21", "indexmap", "log", @@ -2549,10 +2748,10 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.4", + "http 0.2.2", "indexmap", "slab", - "tokio 0.2.25", + "tokio 0.2.24", "tokio-util", "tracing", "tracing-futures", @@ -2560,14 +2759,14 @@ dependencies = [ [[package]] name = "handlebars" -version = "3.5.5" +version = "3.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" +checksum = "964d0e99a61fe9b1b347389b77ebf8b7e1587b70293676aaca7d27e59b9073b2" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", + "quick-error 2.0.0", "serde", "serde_json", ] @@ -2607,9 +2806,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] @@ -2678,7 +2877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ "digest 0.8.1", - "generic-array 0.12.4", + "generic-array 0.12.3", "hmac 0.7.1", ] @@ -2706,11 +2905,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "fnv", "itoa", ] @@ -2722,7 +2921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "http 0.1.21", "tokio-buf", ] @@ -2734,14 +2933,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ "bytes 0.5.6", - "http 0.2.4", + "http 0.2.2", +] + +[[package]] +name = "http-body" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +dependencies = [ + "bytes 1.0.1", + "http 0.2.2", + "pin-project-lite 0.2.4", ] [[package]] name = "httparse" -version = "1.4.1" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" [[package]] name = "httpdate" @@ -2766,12 +2976,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.12.36" +version = "0.12.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" +checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "futures-cpupool", "h2 0.1.26", "http 0.1.21", @@ -2796,23 +3006,45 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.10" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", "h2 0.2.7", - "http 0.2.4", + "http 0.2.2", "http-body 0.3.1", "httparse", "httpdate", "itoa", - "pin-project 1.0.7", + "pin-project 1.0.4", "socket2 0.3.19", - "tokio 0.2.25", + "tokio 0.2.24", + "tower-service", + "tracing", + "want 0.3.0", +] + +[[package]] +name = "hyper" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +dependencies = [ + "bytes 1.0.1", + "futures-channel", + "futures-core", + "futures-util", + "http 0.2.2", + "http-body 0.4.2", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.4", + "tokio 1.6.1", "tower-service", "tracing", "want 0.3.0", @@ -2827,12 +3059,12 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.10", + "hyper 0.13.9", "log", "rustls 0.18.1", - "rustls-native-certs", - "tokio 0.2.25", - "tokio-rustls", + "rustls-native-certs 0.4.0", + "tokio 0.2.24", + "tokio-rustls 0.14.1", "webpki", ] @@ -2849,9 +3081,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ "matches", "unicode-bidi", @@ -2881,12 +3113,12 @@ dependencies = [ [[package]] name = "if-watch" -version = "0.2.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" +checksum = "6a6d52908d4ea4ab2bc22474ba149bf1011c8e2c3ebc1ff593ae28ac44f494b6" dependencies = [ "async-io", - "futures 0.3.15", + "futures 0.3.14", "futures-lite", "if-addrs", "ipnet", @@ -2930,14 +3162,14 @@ checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "indexmap" -version = "1.6.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" dependencies = [ "autocfg", "hashbrown", @@ -2955,9 +3187,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.7" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" +checksum = "4f4ebd0bd29be0f11973e9b3e219005661042a019fd757798c36a47c87852625" [[package]] name = "integer-sqrt" @@ -2974,7 +3206,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "futures-timer 2.0.2", ] @@ -3037,18 +3269,18 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" dependencies = [ "wasm-bindgen", ] @@ -3060,7 +3292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7" dependencies = [ "failure", - "futures 0.1.31", + "futures 0.1.30", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3075,7 +3307,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "log", "serde", "serde_derive", @@ -3100,7 +3332,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -3109,7 +3341,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" dependencies = [ - "hyper 0.12.36", + "hyper 0.12.35", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -3175,63 +3407,59 @@ dependencies = [ "slab", ] -[[package]] -name = "jsonrpsee-http-client" -version = "0.2.0-alpha.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3a49473ea266be8e9f23e20a7bfa4349109b42319d72cc0b8a101e18fa6466" -dependencies = [ - "async-trait", - "fnv", - "hyper 0.13.10", - "hyper-rustls", - "jsonrpsee-types", - "jsonrpsee-utils", - "log", - "serde", - "serde_json", - "thiserror", - "url 2.2.2", -] - [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0-alpha.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0cbaee9ca6440e191545a68c7bf28db0ff918359a904e37a6e7cf7edd132f5a" +checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "jsonrpsee-types" -version = "0.2.0-alpha.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab3dabceeeeb865897661d532d47202eaae71cd2c606f53cb69f1fbc0555a51" +checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172" dependencies = [ "async-trait", "beef", "futures-channel", "futures-util", + "hyper 0.14.5", "log", "serde", "serde_json", + "soketto 0.5.0", "thiserror", ] [[package]] -name = "jsonrpsee-utils" -version = "0.2.0-alpha.6" +name = "jsonrpsee-ws-client" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63cf4d423614e71fd144a8691208539d2b23d8373e069e2fbe023c5eba5e922" +checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32" dependencies = [ - "futures-util", - "hyper 0.13.10", + "async-trait", + "fnv", + "futures 0.3.14", "jsonrpsee-types", + "log", + "pin-project 1.0.4", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", + "serde", + "serde_json", + "soketto 0.5.0", + "thiserror", + "tokio 0.2.24", + "tokio-rustls 0.15.0", + "tokio-util", + "url 2.2.0", ] [[package]] @@ -3252,8 +3480,8 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", "bitvec", @@ -3266,6 +3494,7 @@ dependencies = [ "frame-try-runtime", "hex-literal 0.3.1", "log", + "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -3275,6 +3504,7 @@ dependencies = [ "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-elections-phragmen", + "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -3293,7 +3523,7 @@ dependencies = [ "pallet-session-benchmarking", "pallet-society", "pallet-staking", - "pallet-staking-reward-curve", + "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -3301,14 +3531,17 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-xcm 0.1.0 (git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d)", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", "serde", "serde_derive", "smallvec 1.6.1", "sp-api", + "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -3325,6 +3558,9 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder 3.0.0", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] @@ -3359,9 +3595,9 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b27cdb788bf1c8ade782289f9dbee626940be2961fd75c7cde993fa2f1ded1" +checksum = "34446c373ccc494c2124439281c198c7636ccdc2752c06722bbffd56d459c1e4" dependencies = [ "fs-swap", "kvdb", @@ -3395,9 +3631,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.94" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "5600b4e6efc5421841a2138a6b082e07fe12f9aaa12783d50e5d13325b26b4fc" [[package]] name = "libloading" @@ -3433,7 +3669,7 @@ checksum = "08053fbef67cd777049ef7a95ebaca2ece370b4ed7712c3fa404d69a88cb741b" dependencies = [ "atomic", "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "lazy_static", "libp2p-core", "libp2p-deflate", @@ -3459,23 +3695,23 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "smallvec 1.6.1", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.28.3" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554d3e7e9e65f939d66b75fd6a4c67f258fe250da61b91f46c545fc4a89b51d9" +checksum = "71dd51b562e14846e65bad00e5808d0644376e6588668c490d3c48e1dfeb4a9a" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -3484,13 +3720,13 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "prost", "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", - "sha2 0.9.5", + "sha2 0.9.2", "smallvec 1.6.1", "thiserror", "unsigned-varint 0.7.0", @@ -3505,7 +3741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2181a641cd15f9b6ba71b1335800f309012a0a97a29ffaabbbf40e9d3d58f08" dependencies = [ "flate2", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", ] @@ -3516,7 +3752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62e63dab8b5ff35e0c101a3e51e843ba782c07bbb1682f5fd827622e0d02b98b" dependencies = [ "async-std-resolver", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "log", "smallvec 1.6.1", @@ -3531,7 +3767,7 @@ checksum = "48a9b570f6766301d9c4aa00fce3554cad1598e2f466debbc4dde909028417cf" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "libp2p-swarm", "log", @@ -3543,16 +3779,16 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.30.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7b0c8506a6ec3344b9e706d7c7a6dba826f8ede735cfe13dde12a8c263c4af9" +checksum = "73cb9a89a301afde1e588c73f7e9131e12a5388725f290a9047b878862db1b53" dependencies = [ "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", "bytes 1.0.1", "fnv", - "futures 0.3.15", + "futures 0.3.14", "hex_fmt", "libp2p-core", "libp2p-swarm", @@ -3561,7 +3797,7 @@ dependencies = [ "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.5", + "sha2 0.9.2", "smallvec 1.6.1", "unsigned-varint 0.7.0", "wasm-timer", @@ -3573,7 +3809,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f668f00efd9883e8b7bcc582eaf0164615792608f886f6577da18bcbeea0a46" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "libp2p-swarm", "log", @@ -3594,14 +3830,14 @@ dependencies = [ "bytes 1.0.1", "either", "fnv", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "libp2p-swarm", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.5", + "sha2 0.9.2", "smallvec 1.6.1", "uint", "unsigned-varint 0.7.0", @@ -3611,14 +3847,14 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.30.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efa70c1c3d2d91237f8546e27aeb85e287d62c066a7b4f3ea6a696d43ced714" +checksum = "c221897b3fd7f215de7ecfec215c5eba598e5b61c605b5f8b56fe8a4fb507724" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.15", + "futures 0.3.14", "if-watch", "lazy_static", "libp2p-core", @@ -3638,7 +3874,7 @@ checksum = "85e9b544335d1ed30af71daa96edbefadef6f19c7a55f078b9fc92c87163105d" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "log", "nohash-hasher", @@ -3655,15 +3891,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36db0f0db3b0433f5b9463f1c0cd9eadc0a3734a9170439ce501ff99733a88bd" dependencies = [ "bytes 1.0.1", - "curve25519-dalek 3.1.0", - "futures 0.3.15", + "curve25519-dalek 3.0.0", + "futures 0.3.14", "lazy_static", "libp2p-core", "log", "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.5", + "sha2 0.9.2", "snow", "static_assertions", "x25519-dalek", @@ -3676,7 +3912,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4bfaffac63bf3c7ec11ed9d8879d455966ddea7e78ee14737f0b6dce0d1cd1" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "libp2p-swarm", "log", @@ -3693,7 +3929,7 @@ checksum = "0c8c37b4d2a075b4be8442760a5f8c037180f0c8dd5b5734b9978ab868b3aa11" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "log", "prost", @@ -3708,9 +3944,9 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "log", - "pin-project 1.0.7", + "pin-project 1.0.4", "rand 0.7.3", "salsa20", "sha3", @@ -3724,12 +3960,12 @@ checksum = "0b8786aca3f18671d8776289706a5521f6c9124a820f69e358de214b9939440d" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.7", + "pin-project 1.0.4", "prost", "prost-build", "rand 0.7.3", @@ -3747,7 +3983,7 @@ checksum = "1cdbe172f08e6d0f95fa8634e273d4c4268c4063de2e33e7435194b0130c62e3" dependencies = [ "async-trait", "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "libp2p-swarm", "log", @@ -3766,7 +4002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e04d8e1eef675029ec728ba14e8d0da7975d84b6679b699b4ae91a1de9c3a92" dependencies = [ "either", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "log", "rand 0.7.3", @@ -3782,7 +4018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "365b0a699fea5168676840567582a012ea297b1ca02eee467e58301b9c9c5eed" dependencies = [ "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -3792,7 +4028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b1a27d21c477951799e99d5c105d78868258502ce092988040a808d5a19bbd9" dependencies = [ "async-io", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "if-watch", "ipnet", @@ -3809,18 +4045,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffd6564bb3b7ff203661ccbb69003c2b551e34cef974f2d6c6a28306a12170b5" dependencies = [ "async-std", - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.28.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d413e4cf9b8e5dfbcd2a60d3dc5a3391308bdb463684093d4f67137b7113de" +checksum = "cef45d61e43c313531b5e903e4e8415212ff6338e0c54c47da5b9b412b5760de" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -3835,14 +4071,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cace60995ef6f637e4752cccbb2590f6bc358e8741a0d066307636c69a4b3a74" dependencies = [ "either", - "futures 0.3.15", + "futures 0.3.14", "futures-rustls", "libp2p-core", "log", "quicksink", "rw-stream-sink", - "soketto", - "url 2.2.2", + "soketto 0.4.2", + "url 2.2.0", "webpki-roots", ] @@ -3852,7 +4088,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f35da42cfc6d5cb0dcf3ad6881bc68d146cdf38f98655e09e33fbba4d13eabc4" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "libp2p-core", "parking_lot 0.11.1", "thiserror", @@ -3889,9 +4125,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" dependencies = [ "cc", "pkg-config", @@ -3900,9 +4136,9 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" [[package]] name = "linked_hash_set" @@ -3915,11 +4151,11 @@ dependencies = [ [[package]] name = "linregress" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b36162d2e1dcbdeb61223cb788f029f8ac9f2ab19969b89c5a8f4517aad4d940" +checksum = "0d0ad4b5cc8385a881c561fac3501353d63d2a2b7a357b5064d71815c9a92724" dependencies = [ - "nalgebra 0.25.4", + "nalgebra", "statrs", ] @@ -3934,9 +4170,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" dependencies = [ "scopeguard", ] @@ -3951,6 +4187,19 @@ dependencies = [ "value-bag", ] +[[package]] +name = "loom" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0e8460f2f2121162705187214720353c517b97bdfb3494c0b1e33d83ebe4bed" +dependencies = [ + "cfg-if 0.1.10", + "generator", + "scoped-tls", + "serde", + "serde_json", +] + [[package]] name = "lru" version = "0.6.5" @@ -4015,12 +4264,25 @@ dependencies = [ ] [[package]] -name = "matrixmultiply" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8a15b776d9dfaecd44b03c5828c2199cddff5247215858aac14624f8d6b741" +name = "max-encoded-len" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "rawpointer", + "impl-trait-for-tuples", + "max-encoded-len-derive", + "parity-scale-codec", + "primitive-types", +] + +[[package]] +name = "max-encoded-len-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.68", ] [[package]] @@ -4031,15 +4293,15 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memmap2" -version = "0.2.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397d1a6d6d0563c0f5462bbdae662cf6c784edf5e828e40c7257f85d82bf56dd" +checksum = "e73be3b7d04a0123e933fea1d50d126cc7196bbc0362c0ce426694f777194eee" dependencies = [ "libc", ] @@ -4055,9 +4317,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" dependencies = [ "autocfg", ] @@ -4090,9 +4352,9 @@ checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] name = "merlin" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" +checksum = "c6feca46f4fa3443a01769d768727f10c10a20fdb65e52dc16a81f0c8269bb78" dependencies = [ "byteorder", "keccak", @@ -4103,10 +4365,10 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "futures-timer 3.0.2", ] @@ -4116,36 +4378,36 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c023c3f16109e7f33aa451f773fd61070e265b4977d0b6e344a51049296dd7df" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "rand 0.7.3", "thrift", ] [[package]] name = "minicbor" -version = "0.8.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d" +checksum = "ea79ce4ab9f445ec6b71833a2290ac0a29c9dde0fa7cae4c481eecae021d9bd9" dependencies = [ "minicbor-derive", ] [[package]] name = "minicbor-derive" -version = "0.6.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2b9e8883d58e34b18facd16c4564a77ea50fce028ad3d0ee6753440e37acc8" +checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" dependencies = [ "adler", "autocfg", @@ -4190,7 +4452,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.7", + "miow 0.3.6", "winapi 0.3.9", ] @@ -4219,10 +4481,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.7" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ + "socket2 0.3.19", "winapi 0.3.9", ] @@ -4255,7 +4518,7 @@ dependencies = [ "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.5", + "sha2 0.9.2", "sha3", "unsigned-varint 0.5.1", ] @@ -4270,61 +4533,44 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "synstructure", ] [[package]] name = "multimap" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" [[package]] name = "multistream-select" -version = "0.10.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" +checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840" dependencies = [ "bytes 1.0.1", - "futures 0.3.15", + "futures 0.3.14", "log", - "pin-project 1.0.7", + "pin-project 1.0.4", "smallvec 1.6.1", - "unsigned-varint 0.7.0", + "unsigned-varint 0.6.0", ] [[package]] name = "nalgebra" -version = "0.19.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abb021006c01b126a936a8dd1351e0720d83995f4fc942d0d426c654f990745" +checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486" dependencies = [ - "alga", - "approx 0.3.2", - "generic-array 0.13.3", - "matrixmultiply 0.2.4", - "num-complex 0.2.4", - "num-rational 0.2.4", + "approx", + "generic-array 0.13.2", + "matrixmultiply", + "num-complex", + "num-rational", "num-traits", "rand 0.7.3", "rand_distr", - "typenum", -] - -[[package]] -name = "nalgebra" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70c9e8c5f213c8e93fc8c112ade4edd3ee62062fb897776c23dcebac7932900" -dependencies = [ - "approx 0.4.0", - "generic-array 0.14.4", - "matrixmultiply 0.3.1", - "num-complex 0.3.1", - "num-rational 0.3.2", - "num-traits", - "serde", "simba", "typenum", ] @@ -4338,6 +4584,16 @@ dependencies = [ "rand 0.3.23", ] +[[package]] +name = "nb-connect" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "net2" version = "0.2.37" @@ -4392,15 +4648,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - [[package]] name = "num-integer" version = "0.1.44" @@ -4423,17 +4670,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.14" @@ -4456,25 +4692,25 @@ dependencies = [ [[package]] name = "object" -version = "0.23.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" -dependencies = [ - "crc32fast", - "indexmap", -] +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" [[package]] name = "object" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" +dependencies = [ + "crc32fast", + "indexmap", +] [[package]] name = "once_cell" -version = "1.7.2" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" dependencies = [ "parking_lot 0.11.1", ] @@ -4493,9 +4729,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "ordered-float" @@ -4554,7 +4790,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -4569,14 +4805,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", - "sp-authorship", - "sp-inherents", + "sp-authorship 3.0.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", "sp-runtime", "sp-std", ] @@ -4584,7 +4819,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4607,12 +4842,13 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "max-encoded-len", "parity-scale-codec", "sp-runtime", "sp-std", @@ -4621,7 +4857,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=rococo-v1#b0e5f2da52cc9bc9804a23e111d003413b268faf" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6432d4c8cbf16044c0003a22359f7f8184729b98" dependencies = [ "beefy-primitives", "frame-support", @@ -4636,7 +4872,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4647,10 +4883,31 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "bp-test-utils", + "finality-grandpa", + "frame-support", + "frame-system", + "log", + "num-traits", + "parity-scale-codec", + "serde", + "sp-finality-grandpa", + "sp-runtime", + "sp-std", + "sp-trie", +] + [[package]] name = "pallet-chainlink-feed" version = "0.1.0" -source = "git+https://github.com/ChainSafe/chainlink-polkadot#ee618d840cba167d5e77643511b2a4265951e8f1" +source = "git+https://github.com/smartcontractkit/chainlink-polkadot?branch=master#ef7f415d5415ad016230532edce2b21533f5b1a9" dependencies = [ "frame-benchmarking", "frame-support", @@ -4666,7 +4923,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4697,7 +4954,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4712,7 +4969,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4722,6 +4979,7 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "sp-arithmetic", + "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", @@ -4732,7 +4990,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4747,9 +5005,23 @@ dependencies = [ ] [[package]] -name = "pallet-grandpa" +name = "pallet-gilt" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-arithmetic", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-grandpa" +version = "3.1.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4761,6 +5033,7 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-finality-grandpa", + "sp-io", "sp-runtime", "sp-session", "sp-staking", @@ -4770,7 +5043,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4785,7 +5058,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4804,7 +5077,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4812,7 +5085,7 @@ dependencies = [ "parity-scale-codec", "sp-core", "sp-io", - "sp-keyring", + "sp-keyring 3.0.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", "sp-runtime", "sp-std", ] @@ -4835,7 +5108,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4850,7 +5123,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4867,7 +5140,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -4883,7 +5156,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4901,7 +5174,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -4916,7 +5189,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -4929,7 +5202,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -4945,7 +5218,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4983,11 +5256,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "max-encoded-len", "parity-scale-codec", "sp-core", "sp-io", @@ -4998,7 +5272,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -5011,7 +5285,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "enumflags2", "frame-support", @@ -5065,7 +5339,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5080,7 +5354,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -5099,7 +5373,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5115,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -5128,7 +5402,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5138,7 +5412,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", - "paste", + "paste 1.0.4", "rand_chacha 0.2.2", "serde", "sp-application-crypto", @@ -5152,18 +5426,27 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", +] + +[[package]] +name = "pallet-staking-reward-fn" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "log", + "sp-arithmetic", ] [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -5176,7 +5459,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5194,7 +5477,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5209,7 +5492,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-support", "frame-system", @@ -5225,7 +5508,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5242,7 +5525,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5253,7 +5536,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5269,7 +5552,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-benchmarking", "frame-support", @@ -5284,7 +5567,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5298,7 +5581,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "frame-support", "frame-system", @@ -5307,6 +5590,21 @@ dependencies = [ "sp-runtime", "sp-std", "xcm", + "xcm-executor", +] + +[[package]] +name = "pallet-xcm" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-runtime", + "sp-std", + "xcm", + "xcm-executor", ] [[package]] @@ -5330,7 +5628,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus.git?branch=rococo-v1#da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -5343,6 +5641,7 @@ dependencies = [ name = "parachain-runtime" version = "2.0.0" dependencies = [ + "cumulus-pallet-dmp-queue", "cumulus-pallet-parachain-system", "cumulus-pallet-xcm", "cumulus-pallet-xcmp-queue", @@ -5369,7 +5668,7 @@ dependencies = [ "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", - "pallet-xcm", + "pallet-xcm 0.1.0 (git+https://github.com/paritytech/polkadot?branch=master)", "parachain-info", "parity-scale-codec", "polkadot-parachain", @@ -5394,9 +5693,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495197c078e54b8735181aa35c00a327f7f3a3cc00a1ee8c95926dd010f0ec6b" +checksum = "2e337f62db341435f0da05b8f6b97e984ef4ea5800510cd07c2d624688c40b47" dependencies = [ "blake2-rfc", "crc32fast", @@ -5424,14 +5723,14 @@ dependencies = [ "serde", "static_assertions", "unsigned-varint 0.7.0", - "url 2.2.2", + "url 2.2.0", ] [[package]] name = "parity-scale-codec" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f518afaa5a47d0d6386229b0a6e01e86427291d643aa4cabb4992219f504f8" +checksum = "731f4d179ed52b1c7eeb29baf29c604ea9301b889b23ce93660220a5465d5c6f" dependencies = [ "arrayvec 0.7.0", "bitvec", @@ -5449,7 +5748,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -5465,11 +5764,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "libc", "log", "mio-named-pipes", - "miow 0.3.7", + "miow 0.3.6", "rand 0.7.3", "tokio 0.1.22", "tokio-named-pipes", @@ -5502,7 +5801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.26", - "syn 1.0.72", + "syn 1.0.68", "synstructure", ] @@ -5517,9 +5816,9 @@ dependencies = [ [[package]] name = "parity-wasm" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" +checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" [[package]] name = "parity-ws" @@ -5536,7 +5835,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.2.2", + "url 2.2.0", ] [[package]] @@ -5573,8 +5872,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.4", - "parking_lot_core 0.8.3", + "lock_api 0.4.2", + "parking_lot_core 0.8.2", ] [[package]] @@ -5588,7 +5887,7 @@ dependencies = [ "libc", "redox_syscall 0.1.57", "rustc_version", - "smallvec 0.6.14", + "smallvec 0.6.13", "winapi 0.3.9", ] @@ -5608,23 +5907,42 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.8", + "redox_syscall 0.1.57", "smallvec 1.6.1", "winapi 0.3.9", ] [[package]] name = "paste" -version = "1.0.5" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1" + +[[package]] +name = "paste-impl" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] [[package]] name = "pbkdf2" @@ -5698,7 +6016,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -5724,55 +6042,55 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.27", ] [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2" dependencies = [ - "pin-project-internal 1.0.7", + "pin-project-internal 1.0.4", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" +checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" [[package]] name = "pin-utils" @@ -5782,14 +6100,16 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pint" -version = "2.0.0" +version = "3.0.0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", - "cumulus-client-consensus-relay-chain", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-client-service", "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", "derive_more 0.15.0", "frame-benchmarking", "frame-benchmarking-cli", @@ -5811,6 +6131,7 @@ dependencies = [ "sc-consensus", "sc-executor", "sc-keystore", + "sc-network", "sc-rpc", "sc-rpc-api", "sc-service", @@ -5822,15 +6143,19 @@ dependencies = [ "sp-block-builder", "sp-blockchain", "sp-consensus", + "sp-consensus-aura", "sp-core", "sp-inherents", + "sp-keystore", + "sp-offchain", "sp-runtime", + "sp-session", "sp-timestamp", "sp-transaction-pool", - "sp-trie", "structopt", "substrate-build-script-utils", "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", ] [[package]] @@ -5848,9 +6173,9 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -5862,10 +6187,9 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", - "parity-scale-codec", + "futures 0.3.14", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -5876,9 +6200,9 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "lru", "parity-scale-codec", "polkadot-erasure-coding", @@ -5899,9 +6223,9 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "lru", "parity-scale-codec", "polkadot-erasure-coding", @@ -5917,11 +6241,11 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "frame-benchmarking-cli", - "futures 0.3.15", + "futures 0.3.14", "log", "polkadot-node-core-pvf", "polkadot-service", @@ -5935,13 +6259,42 @@ dependencies = [ "try-runtime-cli", ] +[[package]] +name = "polkadot-client" +version = "0.9.3" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "beefy-primitives", + "frame-benchmarking", + "frame-system-rpc-runtime-api", + "pallet-mmr-primitives", + "pallet-transaction-payment-rpc-runtime-api", + "polkadot-primitives", + "polkadot-runtime", + "sc-client-api", + "sc-executor", + "sc-service", + "sp-api", + "sp-authority-discovery", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-finality-grandpa", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-storage", + "sp-transaction-pool", +] + [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "always-assert", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -5957,8 +6310,8 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -5969,8 +6322,8 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -5984,9 +6337,9 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -5999,10 +6352,10 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", "parking_lot 0.11.1", "polkadot-node-network-protocol", @@ -6019,9 +6372,9 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -6037,11 +6390,11 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "futures-timer 3.0.2", "kvdb", "merlin", @@ -6066,10 +6419,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "kvdb", "parity-scale-codec", @@ -6086,10 +6439,10 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", - "futures 0.3.15", + "futures 0.3.14", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -6104,9 +6457,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -6116,28 +6469,13 @@ dependencies = [ "wasm-timer", ] -[[package]] -name = "polkadot-node-core-candidate-selection" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" -dependencies = [ - "futures 0.3.15", - "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", - "polkadot-primitives", - "sp-keystore", - "thiserror", - "tracing", -] - [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", "polkadot-node-core-pvf", "polkadot-node-primitives", @@ -6152,9 +6490,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -6163,37 +6501,30 @@ dependencies = [ ] [[package]] -name = "polkadot-node-core-proposer" +name = "polkadot-node-core-parachains-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "async-trait", + "futures 0.3.14", "futures-timer 3.0.2", "polkadot-node-subsystem", "polkadot-overseer", "polkadot-primitives", - "sc-basic-authorship", - "sc-block-builder", - "sc-client-api", - "sc-telemetry", - "sp-api", "sp-blockchain", - "sp-consensus", - "sp-core", "sp-inherents", "sp-runtime", - "sp-transaction-pool", - "substrate-prometheus-endpoint", + "thiserror", "tracing", ] [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6205,17 +6536,17 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "always-assert", "assert_matches", "async-process", "async-std", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "libc", "parity-scale-codec", - "pin-project 1.0.7", + "pin-project 1.0.4", "polkadot-core-primitives", "polkadot-parachain", "rand 0.8.3", @@ -6233,9 +6564,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -6251,7 +6582,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-std", "lazy_static", @@ -6269,9 +6600,9 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -6284,9 +6615,9 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -6306,19 +6637,19 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-std", "async-trait", - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "futures-timer 3.0.2", "lazy_static", "log", "mick-jaeger", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6336,15 +6667,15 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "lru", "metered-channel", "parity-scale-codec", - "pin-project 1.0.7", + "pin-project 1.0.4", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6364,15 +6695,17 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", + "lru", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "polkadot-procmacro-overseer-subsystems-gen", "sc-client-api", "sp-api", "tracing", @@ -6380,10 +6713,10 @@ dependencies = [ [[package]] name = "polkadot-parachain" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "parity-scale-codec", "parity-util-mem", "polkadot-core-primitives", @@ -6395,8 +6728,8 @@ dependencies = [ [[package]] name = "polkadot-primitives" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", "frame-system", @@ -6410,6 +6743,7 @@ dependencies = [ "sp-application-crypto", "sp-arithmetic", "sp-authority-discovery", + "sp-consensus-slots", "sp-core", "sp-inherents", "sp-io", @@ -6422,21 +6756,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polkadot-procmacro-overseer-subsystems-gen" +version = "0.1.0" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" +dependencies = [ + "assert_matches", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.68", +] + [[package]] name = "polkadot-procmacro-subsystem-dispatch-gen" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "assert_matches", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "polkadot-rpc" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -6468,8 +6813,8 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", "bitvec", @@ -6482,6 +6827,7 @@ dependencies = [ "frame-try-runtime", "hex-literal 0.3.1", "log", + "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -6543,8 +6889,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", "bitvec", @@ -6587,11 +6933,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "bitvec", - "derive_more 0.99.13", + "derive_more 0.99.11", "frame-benchmarking", "frame-support", "frame-system", @@ -6626,14 +6972,13 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-gadget", "beefy-primitives", - "frame-benchmarking", "frame-system-rpc-runtime-api", - "futures 0.3.15", + "futures 0.3.14", "hex-literal 0.3.1", "kusama-runtime", "kvdb", @@ -6647,6 +6992,7 @@ dependencies = [ "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", "polkadot-availability-recovery", + "polkadot-client", "polkadot-collator-protocol", "polkadot-gossip-support", "polkadot-network-bridge", @@ -6655,10 +7001,9 @@ dependencies = [ "polkadot-node-core-av-store", "polkadot-node-core-backing", "polkadot-node-core-bitfield-signing", - "polkadot-node-core-candidate-selection", "polkadot-node-core-candidate-validation", "polkadot-node-core-chain-api", - "polkadot-node-core-proposer", + "polkadot-node-core-parachains-inherent", "polkadot-node-core-provisioner", "polkadot-node-core-runtime-api", "polkadot-node-primitives", @@ -6673,6 +7018,7 @@ dependencies = [ "polkadot-statement-distribution", "rococo-runtime", "sc-authority-discovery", + "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -6680,6 +7026,7 @@ dependencies = [ "sc-consensus", "sc-consensus-babe", "sc-consensus-slots", + "sc-consensus-uncles 0.9.0 (git+https://github.com/paritytech/substrate?branch=master)", "sc-executor", "sc-finality-grandpa", "sc-finality-grandpa-warp-sync", @@ -6705,6 +7052,7 @@ dependencies = [ "sp-session", "sp-state-machine", "sp-storage", + "sp-timestamp", "sp-transaction-pool", "sp-trie", "substrate-prometheus-endpoint", @@ -6716,10 +7064,10 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "arrayvec 0.5.2", - "futures 0.3.15", + "futures 0.3.14", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -6728,14 +7076,16 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "sc-network", + "sp-keystore", "sp-staking", + "thiserror", "tracing", ] [[package]] name = "polkadot-statement-table" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -6744,8 +7094,8 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", "bitvec", @@ -6801,13 +7151,13 @@ dependencies = [ [[package]] name = "polkadot-test-service" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "frame-benchmarking", "frame-system", - "futures 0.1.31", - "futures 0.3.15", + "futures 0.1.30", + "futures 0.3.14", "hex", "pallet-balances", "pallet-staking", @@ -6843,7 +7193,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", - "sp-keyring", + "sp-keyring 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", "sp-runtime", "sp-state-machine", "substrate-test-client", @@ -6853,11 +7203,11 @@ dependencies = [ [[package]] name = "polling" -version = "2.0.3" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" +checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "libc", "log", "wepoll-sys", @@ -6870,7 +7220,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8" dependencies = [ - "cpuid-bool", + "cpuid-bool 0.2.0", "universal-hash", ] @@ -6880,7 +7230,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" dependencies = [ - "cpuid-bool", + "cpuid-bool 0.2.0", "opaque-debug 0.3.0", "universal-hash", ] @@ -6932,7 +7282,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "version_check", ] @@ -6955,9 +7305,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" +checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" @@ -6974,7 +7324,7 @@ version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" dependencies = [ - "unicode-xid 0.2.2", + "unicode-xid 0.2.1", ] [[package]] @@ -7029,7 +7379,7 @@ dependencies = [ "itertools 0.9.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -7053,13 +7403,13 @@ dependencies = [ [[package]] name = "pwasm-utils" -version = "0.14.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f53bc2558e8376358ebdc28301546471d67336584f6438ed4b7c7457a055fd7" +checksum = "a0e517f47d9964362883182404b68d0b6949382c0baa40aa5ffca94f5f1e3481" dependencies = [ "byteorder", "log", - "parity-wasm 0.41.0", + "parity-wasm 0.42.2", ] [[package]] @@ -7070,9 +7420,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-error" -version = "2.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" +checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" [[package]] name = "quicksink" @@ -7082,7 +7432,7 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" dependencies = [ "futures-core", "futures-sink", - "pin-project-lite 0.1.12", + "pin-project-lite 0.1.11", ] [[package]] @@ -7154,7 +7504,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.2", + "rand_core 0.6.1", "rand_hc 0.3.0", ] @@ -7175,7 +7525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.1", ] [[package]] @@ -7204,11 +7554,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" dependencies = [ - "getrandom 0.2.2", + "getrandom 0.2.1", ] [[package]] @@ -7235,7 +7585,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.1", ] [[package]] @@ -7273,7 +7623,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.4", + "crossbeam-utils 0.8.1", "lazy_static", "num_cpus", ] @@ -7295,21 +7645,32 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" dependencies = [ "bitflags", ] +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", + "rust-argon2", +] + [[package]] name = "redox_users" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.2", - "redox_syscall 0.2.8", + "getrandom 0.2.1", + "redox_syscall 0.2.4", ] [[package]] @@ -7318,7 +7679,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "fs-err", "itertools 0.10.0", "static_init", @@ -7342,7 +7703,7 @@ checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -7359,13 +7720,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", "regex-syntax", + "thread_local", ] [[package]] @@ -7380,9 +7742,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "region" @@ -7399,14 +7761,15 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "env_logger 0.8.3", - "hex-literal 0.3.1", - "jsonrpsee-http-client", + "hex", "jsonrpsee-proc-macros", + "jsonrpsee-ws-client", "log", "parity-scale-codec", + "serde_json", "sp-core", "sp-io", "sp-runtime", @@ -7439,9 +7802,9 @@ checksum = "e9c17925a9027d298a4603d286befe3f9dc0e8ed02523141914eb628798d6e5b" [[package]] name = "ring" -version = "0.16.20" +version = "0.16.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" dependencies = [ "cc", "libc", @@ -7464,9 +7827,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +checksum = "23d83c02c429044d58474eaf5ae31e062d0de894e21125b47437ec0edc1397e6" dependencies = [ "libc", "librocksdb-sys", @@ -7474,21 +7837,25 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", + "bp-rococo", + "bp-wococo", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", "hex-literal 0.3.1", "log", + "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-balances", "pallet-beefy", + "pallet-bridge-grandpa", "pallet-collective", "pallet-grandpa", "pallet-im-online", @@ -7506,7 +7873,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", - "pallet-xcm", + "pallet-xcm 0.1.0 (git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d)", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -7537,19 +7904,31 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "rust-argon2" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" +dependencies = [ + "base64 0.13.0", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils 0.8.1", +] + [[package]] name = "rustc-demangle" -version = "0.1.19" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "rustc-hash" @@ -7607,7 +7986,19 @@ dependencies = [ "openssl-probe", "rustls 0.18.1", "schannel", - "security-framework", + "security-framework 1.0.0", +] + +[[package]] +name = "rustls-native-certs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +dependencies = [ + "openssl-probe", + "rustls 0.19.1", + "schannel", + "security-framework 2.3.1", ] [[package]] @@ -7626,8 +8017,8 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.15", - "pin-project 0.4.28", + "futures 0.3.14", + "pin-project 0.4.27", "static_assertions", ] @@ -7667,12 +8058,12 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "derive_more 0.99.13", + "derive_more 0.99.11", "either", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "ip_network", "libp2p", @@ -7696,9 +8087,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -7719,7 +8110,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7735,7 +8126,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7756,22 +8147,22 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "chrono", "fdlimit", - "futures 0.3.15", + "futures 0.3.14", "hex", "libp2p", "log", @@ -7790,7 +8181,7 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", - "sp-keyring", + "sp-keyring 3.0.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", "sp-keystore", "sp-panic-handler", "sp-runtime", @@ -7799,17 +8190,17 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.25", + "tokio 0.2.24", ] [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "fnv", - "futures 0.3.15", + "futures 0.3.14", "hash-db", "kvdb", "lazy_static", @@ -7839,7 +8230,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "blake2-rfc", "hash-db", @@ -7869,7 +8260,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parking_lot 0.11.1", "sc-client-api", @@ -7878,20 +8269,51 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "sc-consensus-aura" +version = "0.9.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "async-trait", + "derive_more 0.99.11", + "futures 0.3.14", + "futures-timer 3.0.2", + "log", + "parity-scale-codec", + "sc-block-builder", + "sc-client-api", + "sc-consensus-slots", + "sc-telemetry", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-version", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "derive_more 0.99.13", + "derive_more 0.99.11", "fork-tree", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "log", "merlin", "num-bigint", - "num-rational 0.2.4", + "num-rational", "num-traits", "parity-scale-codec", "parking_lot 0.11.1", @@ -7901,7 +8323,7 @@ dependencies = [ "sc-client-api", "sc-consensus-epochs", "sc-consensus-slots", - "sc-consensus-uncles", + "sc-consensus-uncles 0.9.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", "sc-keystore", "sc-telemetry", "schnorrkel", @@ -7919,7 +8341,6 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-timestamp", "sp-utils", "sp-version", "substrate-prometheus-endpoint", @@ -7928,10 +8349,10 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -7952,7 +8373,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7965,11 +8386,12 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", + "impl-trait-for-tuples", "log", "parity-scale-codec", "sc-client-api", @@ -7992,28 +8414,36 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "log", "sc-client-api", - "sp-authorship", - "sp-consensus", - "sp-core", - "sp-inherents", + "sp-authorship 3.0.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "sc-consensus-uncles" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "sc-client-api", + "sp-authorship 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", "sp-runtime", + "thiserror", ] [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "lazy_static", "libsecp256k1", "log", "parity-scale-codec", - "parity-wasm 0.41.0", + "parity-wasm 0.42.2", "parking_lot 0.11.1", "sc-executor-common", "sc-executor-wasmi", @@ -8022,7 +8452,6 @@ dependencies = [ "sp-core", "sp-externalities", "sp-io", - "sp-maybe-compressed-blob", "sp-panic-handler", "sp-runtime-interface", "sp-serializer", @@ -8036,14 +8465,14 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "parity-scale-codec", - "parity-wasm 0.41.0", "pwasm-utils", "sp-allocator", "sp-core", + "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", @@ -8053,7 +8482,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "parity-scale-codec", @@ -8068,12 +8497,11 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "parity-scale-codec", - "parity-wasm 0.41.0", - "pwasm-utils", + "parity-wasm 0.42.2", "sc-executor-common", "scoped-tls", "sp-allocator", @@ -8086,20 +8514,20 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "derive_more 0.99.13", + "derive_more 0.99.11", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -8121,16 +8549,17 @@ dependencies = [ "sp-runtime", "sp-utils", "substrate-prometheus-endpoint", + "wasm-timer", ] [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", + "derive_more 0.99.11", "finality-grandpa", - "futures 0.3.15", + "futures 0.3.14", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -8150,10 +8579,10 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "log", "num-traits", "parity-scale-codec", @@ -8171,10 +8600,11 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.15", + "futures 0.3.14", + "futures-timer 3.0.2", "log", "parity-util-mem", "sc-client-api", @@ -8182,18 +8612,17 @@ dependencies = [ "sp-blockchain", "sp-runtime", "sp-transaction-pool", - "sp-utils", "wasm-timer", ] [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "futures-util", "hex", "merlin", @@ -8202,14 +8631,33 @@ dependencies = [ "serde_json", "sp-application-crypto", "sp-core", - "sp-keystore", - "subtle 2.4.0", + "sp-keystore", + "subtle 2.4.0", +] + +[[package]] +name = "sc-light" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "hash-db", + "lazy_static", + "parity-scale-codec", + "parking_lot 0.11.1", + "sc-client-api", + "sc-executor", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", ] [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "hash-db", "lazy_static", @@ -8228,7 +8676,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-std", "async-trait", @@ -8237,12 +8685,12 @@ dependencies = [ "bs58", "bytes 1.0.1", "cid", - "derive_more 0.99.13", + "derive_more 0.99.11", "either", "erased-serde", "fnv", "fork-tree", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "hex", "ip_network", @@ -8254,7 +8702,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "prost", "prost-build", "rand 0.7.3", @@ -8281,9 +8729,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "libp2p", "log", @@ -8298,14 +8746,14 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "hex", - "hyper 0.13.10", + "hyper 0.13.9", "hyper-rustls", "log", "num_cpus", @@ -8326,9 +8774,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "libp2p", "log", "serde_json", @@ -8339,7 +8787,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8348,9 +8796,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -8374,6 +8822,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", + "sp-tracing", "sp-transaction-pool", "sp-utils", "sp-version", @@ -8382,10 +8831,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -8399,6 +8848,7 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-version", ] @@ -8406,9 +8856,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", @@ -8424,13 +8874,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.1.31", - "futures 0.3.15", + "futures 0.1.30", + "futures 0.3.14", "futures-timer 3.0.2", "hash-db", "jsonrpc-core", @@ -8440,7 +8890,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -8449,7 +8899,7 @@ dependencies = [ "sc-executor", "sc-informant", "sc-keystore", - "sc-light", + "sc-light 3.0.0 (git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef)", "sc-network", "sc-offchain", "sc-rpc", @@ -8474,6 +8924,7 @@ dependencies = [ "sp-state-machine", "sp-tracing", "sp-transaction-pool", + "sp-transaction-storage-proof", "sp-trie", "sp-utils", "sp-version", @@ -8488,7 +8939,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "parity-scale-codec", @@ -8503,7 +8954,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8523,14 +8974,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "chrono", - "futures 0.3.15", + "futures 0.3.14", "libp2p", "log", "parking_lot 0.11.1", - "pin-project 1.0.7", + "pin-project 1.0.4", "rand 0.7.3", "serde", "serde_json", @@ -8543,7 +8994,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8554,37 +9005,47 @@ dependencies = [ "parking_lot 0.11.1", "regex", "rustc-hash", + "sc-client-api", + "sc-rpc-server", + "sc-telemetry", "sc-tracing-proc-macro", "serde", "serde_json", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-core", + "sp-rpc", + "sp-runtime", + "sp-storage", "sp-tracing", "thiserror", "tracing", - "tracing-core", "tracing-log", "tracing-subscriber", "wasm-bindgen", + "wasm-timer", "web-sys", ] [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "linked-hash-map", "log", "parity-util-mem", @@ -8603,9 +9064,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "futures-diagnose", "intervalier", "log", @@ -8644,7 +9105,7 @@ checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" dependencies = [ "arrayref", "arrayvec 0.5.2", - "curve25519-dalek 2.1.2", + "curve25519-dalek 2.1.0", "getrandom 0.1.16", "merlin", "rand 0.7.3", @@ -8678,20 +9139,20 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.10.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sct" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" dependencies = [ "ring", "untrusted", @@ -8713,10 +9174,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" dependencies = [ "bitflags", - "core-foundation", - "core-foundation-sys", + "core-foundation 0.7.0", + "core-foundation-sys 0.7.0", + "libc", + "security-framework-sys 1.0.0", +] + +[[package]] +name = "security-framework" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +dependencies = [ + "bitflags", + "core-foundation 0.9.1", + "core-foundation-sys 0.8.2", "libc", - "security-framework-sys", + "security-framework-sys 2.3.0", ] [[package]] @@ -8725,7 +9199,17 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "security-framework-sys" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +dependencies = [ + "core-foundation-sys 0.8.2", "libc", ] @@ -8789,7 +9273,7 @@ checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -8817,13 +9301,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.6" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpuid-bool 0.1.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -8842,13 +9326,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpufeatures", + "cpuid-bool 0.1.2", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -8867,11 +9351,12 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3" +checksum = "7b4921be914e16899a80adefb821f8ddb7974e3f1250223575a44ed994882127" dependencies = [ "lazy_static", + "loom", ] [[package]] @@ -8882,9 +9367,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook" -version = "0.3.8" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac" +checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" dependencies = [ "libc", "signal-hook-registry", @@ -8901,36 +9386,45 @@ dependencies = [ [[package]] name = "signature" -version = "1.3.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0242b8e50dd9accdd56170e94ca1ebd223b098eb9c83539a6e367d0f36ae68" +checksum = "29f060a7d147e33490ec10da418795238fd7545bba241504d6b31a409f2e6210" [[package]] name = "simba" -version = "0.4.0" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5132a955559188f3d13c9ba831e77c802ddc8782783f050ed0c52f5988b95f4c" +checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2" dependencies = [ - "approx 0.4.0", - "num-complex 0.3.1", + "approx", + "num-complex", "num-traits", - "paste", + "paste 0.1.18", ] [[package]] name = "slab" -version = "0.4.3" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] +name = "slog" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" +dependencies = [ + "erased-serde", +] [[package]] name = "slot-range-helper" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "enumn", "parity-scale-codec", - "paste", + "paste 1.0.4", "sp-runtime", "sp-std", ] @@ -8946,9 +9440,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "0.6.14" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" +checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" dependencies = [ "maybe-uninit", ] @@ -8972,7 +9466,7 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.5", + "sha2 0.9.2", "subtle 2.4.0", "x25519-dalek", ] @@ -9007,17 +9501,32 @@ dependencies = [ "base64 0.12.3", "bytes 0.5.6", "flate2", - "futures 0.3.15", + "futures 0.3.14", "httparse", "log", "rand 0.7.3", - "sha-1 0.9.6", + "sha-1 0.9.2", +] + +[[package]] +name = "soketto" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.1", + "futures 0.3.14", + "httparse", + "log", + "rand 0.8.3", + "sha-1 0.9.2", ] [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "sp-core", @@ -9029,7 +9538,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "hash-db", "log", @@ -9046,20 +9555,21 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "max-encoded-len", "parity-scale-codec", "serde", "sp-core", @@ -9070,7 +9580,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "integer-sqrt", "num-traits", @@ -9084,7 +9594,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-api", @@ -9096,8 +9606,21 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-inherents", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "sp-authorship" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "async-trait", "parity-scale-codec", "sp-inherents", "sp-runtime", @@ -9107,7 +9630,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-api", @@ -9119,9 +9642,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "log", "lru", "parity-scale-codec", @@ -9137,7 +9660,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "serde", "serde_json", @@ -9146,10 +9669,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "futures 0.3.15", + "futures 0.3.14", "futures-timer 3.0.2", "libp2p", "log", @@ -9170,11 +9693,29 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "sp-consensus-aura" +version = "0.9.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-api", + "sp-application-crypto", + "sp-consensus", + "sp-consensus-slots", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-timestamp", +] + [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "async-trait", "merlin", "parity-scale-codec", "serde", @@ -9194,7 +9735,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9204,7 +9745,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9216,14 +9757,14 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "base58", "blake2-rfc", "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.15", + "futures 0.3.14", "hash-db", "hash256-std-hasher", "hex", @@ -9231,6 +9772,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", + "max-encoded-len", "merlin", "num-traits", "parity-scale-codec", @@ -9242,7 +9784,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.5", + "sha2 0.9.2", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -9260,7 +9802,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9269,17 +9811,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "environmental", "parity-scale-codec", @@ -9290,7 +9832,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "finality-grandpa", "log", @@ -9307,11 +9849,13 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "async-trait", + "impl-trait-for-tuples", "parity-scale-codec", - "parking_lot 0.11.1", "sp-core", + "sp-runtime", "sp-std", "thiserror", ] @@ -9319,9 +9863,9 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "hash-db", "libsecp256k1", "log", @@ -9330,6 +9874,7 @@ dependencies = [ "sp-core", "sp-externalities", "sp-keystore", + "sp-maybe-compressed-blob", "sp-runtime-interface", "sp-state-machine", "sp-std", @@ -9343,7 +9888,18 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "lazy_static", + "sp-core", + "sp-runtime", + "strum", +] + +[[package]] +name = "sp-keyring" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "lazy_static", "sp-core", @@ -9354,11 +9910,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "merlin", "parity-scale-codec", "parking_lot 0.11.1", @@ -9371,7 +9927,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "ruzstd", "zstd", @@ -9380,7 +9936,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "serde", @@ -9393,18 +9949,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "sp-api", "sp-core", @@ -9414,7 +9970,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "backtrace", ] @@ -9422,24 +9978,27 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "rustc-hash", "serde", "sp-core", + "tracing-core", ] [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", + "max-encoded-len", "parity-scale-codec", "parity-util-mem", - "paste", + "paste 1.0.4", "rand 0.7.3", "serde", "sp-application-crypto", @@ -9452,7 +10011,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9469,19 +10028,19 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "serde", "serde_json", @@ -9490,7 +10049,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-api", @@ -9503,7 +10062,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9513,7 +10072,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "hash-db", "log", @@ -9528,6 +10087,7 @@ dependencies = [ "sp-std", "sp-trie", "thiserror", + "tracing", "trie-db", "trie-root", ] @@ -9535,12 +10095,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9553,7 +10113,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "log", "sp-core", @@ -9566,23 +10126,32 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "async-trait", + "futures-timer 3.0.2", + "log", "parity-scale-codec", "sp-api", "sp-inherents", "sp-runtime", "sp-std", + "thiserror", "wasm-timer", ] [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ + "erased-serde", "log", "parity-scale-codec", + "parking_lot 0.10.2", + "serde", + "serde_json", + "slog", "sp-std", "tracing", "tracing-core", @@ -9592,10 +10161,10 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "derive_more 0.99.13", - "futures 0.3.15", + "derive_more 0.99.11", + "futures 0.3.14", "log", "parity-scale-codec", "serde", @@ -9605,10 +10174,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-transaction-storage-proof" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "async-trait", + "log", + "parity-scale-codec", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-std", + "sp-trie", +] + [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "hash-db", "memory-db", @@ -9622,9 +10206,9 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -9634,19 +10218,32 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "impl-serde", "parity-scale-codec", "serde", "sp-runtime", "sp-std", + "sp-version-proc-macro", +] + +[[package]] +name = "sp-version-proc-macro" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" +dependencies = [ + "parity-scale-codec", + "proc-macro-crate 1.0.0", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.68", ] [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9694,16 +10291,15 @@ dependencies = [ "memchr", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "statrs" -version = "0.13.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e34b58a8f9b7462b6922e0b4e3c83d1b3c2075f7f996a56d6c66afa81590064" +checksum = "cce16f6de653e88beca7bd13780d08e09d4489dbca1f9210e041bc4852481382" dependencies = [ - "nalgebra 0.19.0", "rand 0.7.3", ] @@ -9719,9 +10315,9 @@ dependencies = [ [[package]] name = "streamunordered" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e68576e37c8a37f5372796df15202190349dd80e7ed6a79544c0232213e90e35" +checksum = "f9394ee1338fee8370bee649f8a7170b3a56917903a0956467ad192dcf8699ca" dependencies = [ "futures-core", "futures-sink", @@ -9765,7 +10361,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -9786,7 +10382,7 @@ dependencies = [ "heck", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -9805,7 +10401,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "platforms", ] @@ -9813,10 +10409,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.15", + "futures 0.3.14", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -9836,25 +10432,25 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-std", - "derive_more 0.99.13", + "derive_more 0.99.11", "futures-util", - "hyper 0.13.10", + "hyper 0.13.9", "log", "prometheus", - "tokio 0.2.25", + "tokio 0.2.24", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech/substrate?branch=master#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "async-trait", - "futures 0.1.31", - "futures 0.3.15", + "futures 0.1.30", + "futures 0.3.14", "hash-db", "hex", "parity-scale-codec", @@ -9862,7 +10458,7 @@ dependencies = [ "sc-client-db", "sc-consensus", "sc-executor", - "sc-light", + "sc-light 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", "sc-offchain", "sc-service", "serde", @@ -9870,7 +10466,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-keyring", + "sp-keyring 3.0.0 (git+https://github.com/paritytech/substrate?branch=master)", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -9885,7 +10481,7 @@ dependencies = [ "ansi_term 0.12.1", "atty", "build-helper", - "cargo_metadata", + "cargo_metadata 0.12.3", "tempfile", "toml", "walkdir", @@ -9895,12 +10491,12 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "ansi_term 0.12.1", "atty", "build-helper", - "cargo_metadata", + "cargo_metadata 0.13.1", "sp-maybe-compressed-blob", "tempfile", "toml", @@ -9933,13 +10529,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.72" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "unicode-xid 0.2.2", + "unicode-xid 0.2.1", ] [[package]] @@ -9950,8 +10546,8 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", - "unicode-xid 0.2.2", + "syn 1.0.68", + "unicode-xid 0.2.1", ] [[package]] @@ -9962,15 +10558,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" [[package]] name = "tap" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" [[package]] name = "target-lexicon" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95" +checksum = "64ae3b39281e4b14b8123bdbaddd472b7dfe215e444181f2f9d2443c2444f834" [[package]] name = "tempfile" @@ -9981,7 +10577,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.8", + "redox_syscall 0.2.4", "remove_dir_all", "winapi 0.3.9", ] @@ -10021,16 +10617,16 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] name = "thread_local" -version = "1.1.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "once_cell", + "lazy_static", ] [[package]] @@ -10078,7 +10674,7 @@ dependencies = [ "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.5", + "sha2 0.9.2", "thiserror", "unicode-normalization", "zeroize", @@ -10095,9 +10691,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -10115,7 +10711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "mio", "num_cpus", "tokio-codec", @@ -10134,9 +10730,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.25" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" dependencies = [ "bytes 0.5.6", "fnv", @@ -10148,12 +10744,22 @@ dependencies = [ "mio", "mio-uds", "num_cpus", - "pin-project-lite 0.1.12", + "pin-project-lite 0.1.11", "signal-hook-registry", "slab", "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.4", +] + [[package]] name = "tokio-buf" version = "0.1.1" @@ -10162,7 +10768,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ "bytes 0.4.12", "either", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -10172,7 +10778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "tokio-io", ] @@ -10182,7 +10788,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "tokio-executor", ] @@ -10193,7 +10799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -10202,7 +10808,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "tokio-io", "tokio-threadpool", ] @@ -10214,7 +10820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "log", ] @@ -10225,7 +10831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "mio", "mio-named-pipes", "tokio 0.1.22", @@ -10238,7 +10844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "lazy_static", "log", "mio", @@ -10258,7 +10864,19 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls 0.18.1", - "tokio 0.2.25", + "tokio 0.2.24", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" +dependencies = [ + "futures-core", + "rustls 0.19.1", + "tokio 0.2.24", "webpki", ] @@ -10268,7 +10886,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -10278,7 +10896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.31", + "futures 0.1.30", ] [[package]] @@ -10288,7 +10906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "iovec", "mio", "tokio-io", @@ -10304,7 +10922,7 @@ dependencies = [ "crossbeam-deque 0.7.3", "crossbeam-queue", "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "lazy_static", "log", "num_cpus", @@ -10319,7 +10937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.31", + "futures 0.1.30", "slab", "tokio-executor", ] @@ -10331,7 +10949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "log", "mio", "tokio-codec", @@ -10346,7 +10964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.31", + "futures 0.1.30", "iovec", "libc", "log", @@ -10365,10 +10983,11 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ "bytes 0.5.6", "futures-core", + "futures-io", "futures-sink", "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite 0.1.11", + "tokio 0.2.24", ] [[package]] @@ -10382,9 +11001,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" @@ -10394,7 +11013,7 @@ checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.4", "tracing-attributes", "tracing-core", ] @@ -10407,7 +11026,7 @@ checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", ] [[package]] @@ -10425,15 +11044,15 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.7", + "pin-project 1.0.4", "tracing", ] [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" dependencies = [ "lazy_static", "log", @@ -10452,9 +11071,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.18" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" +checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -10474,9 +11093,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.3" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec051edf7f0fc9499a2cb0947652cab2148b9d7f61cee7605e312e9f970dacaf" +checksum = "cd81fe0c8bc2b528a51c9d2c31dae4483367a26a723a3c9a4a8120311d7774e3" dependencies = [ "hash-db", "hashbrown", @@ -10496,9 +11115,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952a078337565ba39007de99b151770f41039253a31846f0a3d5cd5a4ac8eedf" +checksum = "8d57e219ba600dd96c2f6d82eb79645068e14edbc5c7e27514af40436b88150c" dependencies = [ "async-trait", "cfg-if 1.0.0", @@ -10507,7 +11126,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.2.0", "ipnet", "lazy_static", "log", @@ -10515,14 +11134,14 @@ dependencies = [ "smallvec 1.6.1", "thiserror", "tinyvec", - "url 2.2.2", + "url 2.2.0", ] [[package]] name = "trust-dns-resolver" -version = "0.20.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9c97f7d103e0f94dbe384a57908833505ae5870126492f166821b7cf685589" +checksum = "b0437eea3a6da51acc1e946545ff53d5b8fb2611ff1c3bed58522dde100536ae" dependencies = [ "cfg-if 1.0.0", "futures-util", @@ -10546,7 +11165,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate.git?branch=rococo-v1#2be8fcc4236d32786c62f6f27a98e7fe7e550807" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" dependencies = [ "frame-try-runtime", "log", @@ -10578,9 +11197,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" [[package]] name = "ucd-trie" @@ -10611,18 +11230,18 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" dependencies = [ "tinyvec", ] @@ -10647,9 +11266,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "universal-hash" @@ -10710,12 +11329,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna 0.2.0", "matches", "percent-encoding 2.1.0", ] @@ -10731,9 +11350,15 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.12" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" + +[[package]] +name = "vec-arena" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" +checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" [[package]] name = "vec_map" @@ -10743,9 +11368,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "void" @@ -10761,9 +11386,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", "winapi 0.3.9", @@ -10776,7 +11401,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ - "futures 0.1.31", + "futures 0.1.30", "log", "try-lock", ] @@ -10805,9 +11430,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -10815,24 +11440,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" dependencies = [ "bumpalo", "lazy_static", "log", "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -10842,9 +11467,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" dependencies = [ "quote 1.0.9", "wasm-bindgen-macro-support", @@ -10852,22 +11477,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" [[package]] name = "wasm-gc-api" @@ -10886,7 +11511,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "js-sys", "parking_lot 0.11.1", "pin-utils", @@ -10897,38 +11522,39 @@ dependencies = [ [[package]] name = "wasmi" -version = "0.6.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617d864d25af3587aa745529f7aaa541066c876d57e050c0d0c85c61c92aff" +checksum = "d2ee05bba3d1d994652079893941a2ef9324d2b58a63c31b40678fb7eddd7a5a" dependencies = [ + "downcast-rs", "libc", "memory_units", - "num-rational 0.2.4", + "num-rational", "num-traits", - "parity-wasm 0.41.0", + "parity-wasm 0.42.2", "wasmi-validation", ] [[package]] name = "wasmi-validation" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea78c597064ba73596099281e2f4cfc019075122a65cdda3205af94f0b264d93" +checksum = "a2eb8e860796d8be48efef530b60eebf84e74a88bce107374fffb0da97d504b8" dependencies = [ - "parity-wasm 0.41.0", + "parity-wasm 0.42.2", ] [[package]] name = "wasmparser" -version = "0.76.0" +version = "0.78.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755a9a4afe3f6cccbbe6d7e965eef44cf260b001f93e547eba84255c1d0187d8" +checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wasmtime" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718cb52a9fdb7ab12471e9b9d051c9adfa6b5c504e0a1fea045e5eabc81eedd9" +checksum = "b310b9d20fcf59385761d1ade7a3ef06aecc380e3d3172035b919eaf7465d9f7" dependencies = [ "anyhow", "backtrace", @@ -10936,9 +11562,11 @@ dependencies = [ "cfg-if 1.0.0", "cpp_demangle", "indexmap", + "lazy_static", "libc", "log", - "paste", + "paste 1.0.4", + "psm", "region", "rustc-demangle", "serde", @@ -10957,9 +11585,9 @@ dependencies = [ [[package]] name = "wasmtime-cache" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f984df56c4adeba91540f9052db9f7a8b3b00cfaac1a023bee50a972f588b0c" +checksum = "d14d500d5c3dc5f5c097158feee123d64b3097f0d836a2a27dff9c761c73c843" dependencies = [ "anyhow", "base64 0.13.0", @@ -10970,7 +11598,7 @@ dependencies = [ "libc", "log", "serde", - "sha2 0.9.5", + "sha2 0.9.2", "toml", "winapi 0.3.9", "zstd", @@ -10978,28 +11606,29 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a05abbf94e03c2c8ee02254b1949320c4d45093de5d9d6ed4d9351d536075c9" +checksum = "c525b39f062eada7db3c1298287b96dcb6e472b9f6b22501300b28d9fa7582f6" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "cranelift-wasm", + "target-lexicon", "wasmparser", "wasmtime-environ", ] [[package]] name = "wasmtime-debug" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382eecd6281c6c1d1f3c904c3c143e671fc1a9573820cbfa777fba45ce2eda9c" +checksum = "c5d2a763e7a6fc734218e0e463196762a4f409c483063d81e0e85f96343b2e0a" dependencies = [ "anyhow", - "gimli 0.23.0", + "gimli 0.24.0", "more-asserts", - "object 0.23.0", + "object 0.24.0", "target-lexicon", "thiserror", "wasmparser", @@ -11008,16 +11637,15 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81011b2b833663d7e0ce34639459a0e301e000fc7331e0298b3a27c78d0cec60" +checksum = "f64d0c2d881c31b0d65c1f2695e022d71eb60b9fbdd336aacca28208b58eac90" dependencies = [ - "anyhow", "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", "cranelift-wasm", - "gimli 0.23.0", + "gimli 0.24.0", "indexmap", "log", "more-asserts", @@ -11028,9 +11656,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92da32e31af2e3d828f485f5f24651ed4d3b7f03a46ea6555eae6940d1402cd" +checksum = "a089d44cd7e2465d41a53b840a5b4fca1bf6d1ecfebc970eac9592b34ea5f0b3" dependencies = [ "cc", "libc", @@ -11039,11 +11667,11 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5f649623859a12d361fe4cc4793de44f7c3ff34c322c5714289787e89650bb" +checksum = "4d4539ea734422b7c868107e2187d7746d8affbcaa71916d72639f53757ad707" dependencies = [ - "addr2line 0.14.1", + "addr2line 0.15.1", "anyhow", "cfg-if 1.0.0", "cranelift-codegen", @@ -11051,10 +11679,10 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.23.0", + "gimli 0.24.0", "log", "more-asserts", - "object 0.23.0", + "object 0.24.0", "rayon", "region", "serde", @@ -11072,13 +11700,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2e99cd9858f57fd062e9351e07881cedfc8597928385e02a48d9333b9e15a1" +checksum = "8e1a8ff85246d091828e2225af521a6208ed28c997bb5c39eb697366dc2e2f2b" dependencies = [ "anyhow", "more-asserts", - "object 0.23.0", + "object 0.24.0", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -11086,16 +11714,16 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46c0a590e49278ba7f79ef217af9db4ecc671b50042c185093e22d73524abb2" +checksum = "e24364d522dcd67c897c8fffc42e5bdfc57207bbb6d7eeade0da9d4a7d70105b" dependencies = [ "anyhow", "cfg-if 1.0.0", - "gimli 0.23.0", + "gimli 0.24.0", "lazy_static", "libc", - "object 0.23.0", + "object 0.24.0", "scroll", "serde", "target-lexicon", @@ -11105,10 +11733,11 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1438a09185fc7ca067caf1a80d7e5b398eefd4fb7630d94841448ade60feb3d0" +checksum = "c51e57976e8a19a18a18e002c6eb12e5769554204238e47ff155fda1809ef0f7" dependencies = [ + "anyhow", "backtrace", "cc", "cfg-if 1.0.0", @@ -11116,12 +11745,14 @@ dependencies = [ "lazy_static", "libc", "log", - "memoffset 0.6.3", + "mach", + "memoffset 0.6.1", "more-asserts", - "psm", + "rand 0.8.3", "region", "thiserror", "wasmtime-environ", + "wasmtime-fiber", "winapi 0.3.9", ] @@ -11145,9 +11776,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" dependencies = [ "js-sys", "wasm-bindgen", @@ -11165,9 +11796,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" dependencies = [ "webpki", ] @@ -11183,8 +11814,8 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "beefy-primitives", "bitvec", @@ -11197,6 +11828,7 @@ dependencies = [ "frame-try-runtime", "hex-literal 0.3.1", "log", + "max-encoded-len", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -11231,6 +11863,7 @@ dependencies = [ "pallet-treasury", "pallet-utility", "pallet-vesting", + "pallet-xcm 0.1.0 (git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d)", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -11257,16 +11890,19 @@ dependencies = [ "sp-version", "static_assertions", "substrate-wasm-builder 3.0.0", + "xcm", + "xcm-builder", + "xcm-executor", ] [[package]] name = "which" -version = "4.1.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" dependencies = [ - "either", "libc", + "thiserror", ] [[package]] @@ -11345,19 +11981,19 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "bc614d95359fd7afc321b66d2107ede58b246b844cf5d8a0adcca413e439f088" dependencies = [ - "curve25519-dalek 3.1.0", + "curve25519-dalek 3.0.0", "rand_core 0.5.1", "zeroize", ] [[package]] name = "xcm" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -11366,12 +12002,13 @@ dependencies = [ [[package]] name = "xcm-builder" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", + "pallet-transaction-payment", "parity-scale-codec", "polkadot-parachain", "sp-arithmetic", @@ -11405,8 +12042,8 @@ dependencies = [ [[package]] name = "xcm-executor" -version = "0.8.30" -source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#56d0154fcf8903c4198598a53b5ff213cffabb45" +version = "0.9.4" +source = "git+https://github.com/paritytech//polkadot?rev=a803f87252b82f66df3c3ec1c23b94b50090ef8d#a803f87252b82f66df3c3ec1c23b94b50090ef8d" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -11426,7 +12063,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" dependencies = [ - "futures 0.3.15", + "futures 0.3.14", "log", "nohash-hasher", "parking_lot 0.11.1", @@ -11436,22 +12073,22 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ "proc-macro2 1.0.26", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.68", "synstructure", ] @@ -11483,3 +12120,18 @@ dependencies = [ "cc", "libc", ] + +[[patch.unused]] +name = "pallet-aura" +version = "3.0.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" + +[[patch.unused]] +name = "sc-consensus-manual-seal" +version = "0.9.0" +source = "git+https://github.com/paritytech//substrate?rev=a2f48bf96eecbb5cd1f45bd5319ba814595eaaef#a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" + +[[patch.unused]] +name = "cumulus-pallet-aura-ext" +version = "0.1.0" +source = "git+https://github.com/paritytech//cumulus?rev=11a0bca6d7e41a584250dd2166f66a2a9ec64365#11a0bca6d7e41a584250dd2166f66a2a9ec64365" diff --git a/Cargo.toml b/Cargo.toml index 80a478869b..f87c41586e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,174 @@ members = [ 'primitives/*', 'runtime', ] + +[patch."https://github.com/paritytech/substrate"] +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-benchmarking-cli = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-election-provider-support = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-executive = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-support-procedural = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-support-procedural-tools = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-support-procedural-tools-derive = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +frame-try-runtime = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +max-encoded-len = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +max-encoded-len-derive = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-aura = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-babe = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-bounties = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-collective = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-democracy = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-grandpa = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-identity = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-im-online = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-indices = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-membership = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-mmr = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-mmr-primitives = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-mmr-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-multisig = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-nicks = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-proxy = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-recovery = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-society = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-staking-reward-curve = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-sudo = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-tips = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-transaction-payment = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-utility = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +remote-externalities = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-basic-authorship = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-block-builder = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-cli = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-client-db = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-epochs = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-executor-wasmtime = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-informant = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-keystore = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-network = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-network-gossip = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-offchain = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-rpc-api = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-service = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-sync-state-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-telemetry = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-tracing = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sc-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-block-builder = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-chain-spec = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-consensus-aura = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-consensus-babe = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-consensus-slots = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-consensus-vrf = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-finality-grandpa = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-maybe-compressed-blob = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-offchain = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-rpc = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-serializer = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-tracing = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-utils = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +substrate-build-script-utils = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +try-runtime-cli = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } +substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", rev = "a2f48bf96eecbb5cd1f45bd5319ba814595eaaef" } + +[patch."https://github.com/paritytech/polkadot"] +xcm = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-runtime-common = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +rococo-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +westend-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +kusama-runtime = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-node-network-protocol = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-node-subsystem = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-statement-table = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-overseer = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-node-primitives = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-service = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-cli = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-test-service = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } +polkadot-node-core-pvf = { git = "https://github.com/paritytech//polkadot", rev = "a803f87252b82f66df3c3ec1c23b94b50090ef8d" } + +[patch."https://github.com/paritytech/cumulus"] +cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-pallet-aura-ext = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-cli = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-collator = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-network = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-service = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +#cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-consensus-aura = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-pallet-xcm = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech//cumulus", rev = "11a0bca6d7e41a584250dd2166f66a2a9ec64365" } + diff --git a/node/Cargo.toml b/node/Cargo.toml index 1fa9c38b03..be30ffbd0f 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,224 +1,93 @@ -[dependencies] -derive_more = '0.15.0' -log = "0.4.13" -codec = { package = 'parity-scale-codec', version = '2.0.0' } -structopt = "0.3.8" -serde = { version = "1.0.119", features = ["derive"] } -hex-literal = "0.2.1" -# RPC related dependencies -jsonrpc-core = "15.1.0" - -[dependencies.frame-benchmarking] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.frame-benchmarking-cli] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' -optional = true - -[dependencies.parachain-runtime] -path = '../runtime' -version = '2.0.0' - -[dependencies.pallet-transaction-payment-rpc] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-basic-authorship] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-chain-spec] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-cli] -features = ['wasmtime'] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-client-api] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-consensus] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-executor] -features = ['wasmtime'] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-keystore] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-rpc] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-rpc-api] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-service] -features = ['wasmtime'] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sc-telemetry] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-transaction-pool] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sc-tracing] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-api] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-block-builder] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-blockchain] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-consensus] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '0.9.0' - -[dependencies.sp-core] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-inherents] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-runtime] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-timestamp] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-transaction-pool] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.sp-trie] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[dependencies.substrate-frame-rpc-system] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -[build-dependencies.substrate-build-script-utils] -git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' -version = '3.0.0' - -# Cumulus dependencies -[dependencies.cumulus-client-consensus-relay-chain] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -[dependencies.cumulus-client-collator] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -[dependencies.cumulus-client-cli] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -[dependencies.cumulus-client-network] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -[dependencies.cumulus-primitives-core] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -[dependencies.cumulus-client-service] -git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' - -# Polkadot dependencies -[dependencies.polkadot-primitives] -git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' - -[dependencies.polkadot-service] -git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' - -[dependencies.polkadot-cli] -git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' - -[dependencies.polkadot-test-service] -git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' - -[dependencies.polkadot-parachain] -git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' - [package] -authors = ['Anonymous'] -build = 'build.rs' +name = 'pint' +authors = ['ChainSafe Systems'] description = 'A new Cumulus FRAME-based Substrate node, ready for hacking.' -edition = '2018' +license = 'Unlicense' +version = '3.0.0' homepage = 'https://substrate.dev' -license = 'LGPL-3.0-only' -name = 'pint' repository = 'https://github.com/substrate-developer-hub/substrate-parachain-template' -version = '2.0.0' +edition = '2018' +build = 'build.rs' + [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] +[build-dependencies] +substrate-build-script-utils = { git = 'https://github.com/paritytech/substrate', branch = 'master' } + [features] default = [] runtime-benchmarks = [ - 'frame-benchmarking-cli', - 'parachain-runtime/runtime-benchmarks', - 'polkadot-service/runtime-benchmarks' + 'parachain-runtime/runtime-benchmarks', + 'polkadot-service/runtime-benchmarks' ] +[dependencies] +derive_more = '0.15.0' +log = '0.4.14' +codec = { package = 'parity-scale-codec', version = '2.0.0' } +structopt = '0.3.8' +serde = { version = '1.0.119', features = ['derive'] } +hex-literal = '0.2.1' + +# RPC related Dependencies +jsonrpc-core = '15.1.0' + +# Local Dependencies +parachain-runtime = { path = '../runtime' } + +# Substrate Dependencies +frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +frame-benchmarking-cli = { git = 'https://github.com/paritytech/substrate', branch = 'master' } + +pallet-transaction-payment-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' } + +substrate-frame-rpc-system = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" } + +## Substrate Client Dependencies +sc-basic-authorship = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-chain-spec = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-cli = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-client-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-executor = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-network = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-rpc = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-rpc-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-service = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '0.9.0', features = ['wasmtime'] } +sc-telemetry = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sc-tracing = { git = 'https://github.com/paritytech/substrate', branch = 'master' } + +## Substrate Primitive Dependencies +sp-api = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-block-builder = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-blockchain = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-consensus = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-inherents = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-keystore = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-offchain = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-session = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-timestamp = { git = 'https://github.com/paritytech/substrate', branch = 'master' } +sp-transaction-pool = { git = 'https://github.com/paritytech/substrate', branch = 'master' } + +# Cumulus dependencies +cumulus-client-consensus-aura = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-client-consensus-common = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-client-collator = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-client-cli = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-client-network = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-client-service = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-primitives-core = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } +cumulus-primitives-parachain-inherent = { git = 'https://github.com/paritytech/cumulus', branch = 'master' } + +# Polkadot dependencies +polkadot-primitives = { git = 'https://github.com/paritytech/polkadot', branch = 'master'} +polkadot-service = { git = 'https://github.com/paritytech/polkadot', branch = 'master'} +polkadot-cli = { git = 'https://github.com/paritytech/polkadot', branch = 'master'} +polkadot-test-service = { git = 'https://github.com/paritytech/polkadot', branch = 'master'} +polkadot-parachain = { git = 'https://github.com/paritytech/polkadot', branch = 'master'} diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 32a4152ef0..7b75516566 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LGPL-3.0-only use cumulus_primitives_core::ParaId; -use parachain_runtime::{AccountId, Signature}; +use parachain_runtime::{AccountId, AuraId, Signature}; use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup}; use sc_service::ChainType; use serde::{Deserialize, Serialize}; @@ -40,33 +40,31 @@ type AccountPublic = ::Signer; /// Helper function to generate an account ID from seed pub fn get_account_id_from_seed(seed: &str) -> AccountId -where - AccountPublic: From<::Public>, + where + AccountPublic: From<::Public>, { AccountPublic::from(get_from_seed::(seed)).into_account() } -pub fn pint_development_config(id: ParaId) -> ChainSpec { +pub fn development_config(id: ParaId) -> ChainSpec { ChainSpec::from_genesis( // Name - "PINT Development", + "Development", // ID - "pint_dev", + "dev", ChainType::Local, move || { - pint_testnet_genesis( + testnet_genesis( get_account_id_from_seed::("Alice"), vec![ - get_account_id_from_seed::("Alice"), - get_account_id_from_seed::("Bob"), - get_account_id_from_seed::("Alice//stash"), - get_account_id_from_seed::("Bob//stash"), + get_from_seed::("Alice"), + get_from_seed::("Bob"), ], 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::("Alice//stash"), + get_account_id_from_seed::("Bob//stash"), ], id, ) @@ -76,13 +74,13 @@ pub fn pint_development_config(id: ParaId) -> ChainSpec { None, None, Extensions { - relay_chain: "rococo-dev".into(), + relay_chain: "rococo-local".into(), // You MUST set this to the correct network! para_id: id.into(), }, ) } -pub fn pint_local_config(id: ParaId) -> ChainSpec { +pub fn local_testnet_config(id: ParaId) -> ChainSpec { ChainSpec::from_genesis( // Name "Local Testnet", @@ -90,8 +88,12 @@ pub fn pint_local_config(id: ParaId) -> ChainSpec { "local_testnet", ChainType::Local, move || { - pint_testnet_genesis( + testnet_genesis( get_account_id_from_seed::("Alice"), + vec![ + get_from_seed::("Alice"), + get_from_seed::("Bob"), + ], vec![ get_account_id_from_seed::("Alice"), get_account_id_from_seed::("Bob"), @@ -106,30 +108,24 @@ pub fn pint_local_config(id: ParaId) -> ChainSpec { get_account_id_from_seed::("Eve//stash"), get_account_id_from_seed::("Ferdie//stash"), ], - 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"), - ], id, ) }, - vec![], + Vec::new(), None, None, None, Extensions { - relay_chain: "rococo-local".into(), + relay_chain: "rococo-local".into(), // You MUST set this to the correct network! para_id: id.into(), }, ) } -fn pint_testnet_genesis( +fn testnet_genesis( root_key: AccountId, + initial_authorities: Vec, endowed_accounts: Vec, - council_members: Vec, id: ParaId, ) -> parachain_runtime::GenesisConfig { parachain_runtime::GenesisConfig { @@ -139,10 +135,6 @@ fn pint_testnet_genesis( .to_vec(), changes_trie_config: Default::default(), }, - pallet_committee: parachain_runtime::CommitteeConfig { - council_members, - ..Default::default() - }, pallet_balances: parachain_runtime::BalancesConfig { balances: endowed_accounts .iter() @@ -150,7 +142,15 @@ fn pint_testnet_genesis( .map(|k| (k, 1 << 60)) .collect(), }, + pallet_committee: parachain_runtime::CommitteeConfig { + council_members, + ..Default::default() + }, pallet_sudo: parachain_runtime::SudoConfig { key: root_key }, parachain_info: parachain_runtime::ParachainInfoConfig { parachain_id: id }, + pallet_aura: parachain_runtime::AuraConfig { + authorities: initial_authorities, + }, + cumulus_pallet_aura_ext: Default::default(), } } diff --git a/node/src/cli.rs b/node/src/cli.rs index 7740547298..3f0eaa2f7d 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -50,19 +50,19 @@ pub struct ExportGenesisStateCommand { #[structopt(parse(from_os_str))] pub output: Option, - /// Id of the parachain this state is for. - /// - /// Default: 200 - #[structopt(long)] - pub parachain_id: Option, + /// Id of the parachain this state is for. + /// + /// Default: 100 + #[structopt(long, conflicts_with = "chain")] + pub parachain_id: Option, /// Write output in binary. Default is to write in hex. #[structopt(short, long)] pub raw: bool, - /// The name of the chain for that the genesis state should be exported. - #[structopt(long)] - pub chain: Option, + /// The name of the chain for that the genesis state should be exported. + #[structopt(long, conflicts_with = "parachain-id")] + pub chain: Option, } /// Command for exporting the genesis wasm file. @@ -106,21 +106,15 @@ structopt::clap::AppSettings::ArgsNegateSubcommands, structopt::clap::AppSettings::SubcommandsNegateReqs, ])] pub struct Cli { - #[structopt(subcommand)] - pub subcommand: Option, + #[structopt(subcommand)] + pub subcommand: Option, - #[structopt(flatten)] - pub run: RunCmd, - - /// Run node as collator. - /// - /// Note that this is the same as running with `--validator`. - #[structopt(long, conflicts_with = "validator")] - pub collator: bool, + #[structopt(flatten)] + pub run: cumulus_client_cli::RunCmd, - /// Relaychain arguments - #[structopt(raw = true)] - pub relaychain_args: Vec, + /// Relaychain arguments + #[structopt(raw = true)] + pub relaychain_args: Vec, } #[derive(Debug)] @@ -136,21 +130,21 @@ pub struct RelayChainCli { } impl RelayChainCli { - /// Parse the relay chain CLI parameters using the para chain `Configuration`. - pub fn new<'a>( - para_config: &sc_service::Configuration, - relay_chain_args: impl Iterator, - ) -> Self { - let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); - let chain_id = extension.map(|e| e.relay_chain.clone()); - let base_path = para_config - .base_path - .as_ref() - .map(|x| x.path().join("polkadot")); - Self { - base_path, - chain_id, - base: polkadot_cli::RunCmd::from_iter(relay_chain_args), - } - } + /// Parse the relay chain CLI parameters using the para chain `Configuration`. + pub fn new<'a>( + para_config: &sc_service::Configuration, + relay_chain_args: impl Iterator, + ) -> Self { + let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); + let chain_id = extension.map(|e| e.relay_chain.clone()); + let base_path = para_config + .base_path + .as_ref() + .map(|x| x.path().join("polkadot")); + Self { + base_path, + chain_id, + base: polkadot_cli::RunCmd::from_iter(relay_chain_args), + } + } } diff --git a/node/src/command.rs b/node/src/command.rs index 64949ccf93..fe469461c5 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -4,39 +4,38 @@ #![allow(clippy::borrowed_box)] use crate::{ - chain_spec, - cli::{Cli, RelayChainCli, Subcommand}, + chain_spec, + cli::{Cli, RelayChainCli, Subcommand}, + service::{new_partial, ParachainRuntimeExecutor} }; use codec::Encode; -use cumulus_client_service::genesis::generate_genesis_block; use cumulus_primitives_core::ParaId; +use cumulus_client_service::genesis::generate_genesis_block; use log::info; -use parachain_runtime::Block; +use parachain_runtime::{RuntimeApi, Block}; use polkadot_parachain::primitives::AccountIdConversion; use sc_cli::{ - ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, - NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, + ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, + NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, }; use sc_service::{ - config::{BasePath, PrometheusConfig}, - PartialComponents, + config::{BasePath, PrometheusConfig} }; use sp_core::hexdisplay::HexDisplay; use sp_runtime::traits::Block as BlockT; use std::{io::Write, net::SocketAddr}; fn load_spec( - id: &str, - para_id: ParaId, + id: &str, + para_id: ParaId, ) -> std::result::Result, String> { - Ok(match id { - "pint-local" => Box::new(chain_spec::pint_local_config(para_id)), - "pint-dev" => Box::new(chain_spec::pint_development_config(para_id)), - path => Box::new( - chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path)) - .unwrap_or(chain_spec::pint_development_config(para_id)), - ), - }) + Ok(match id { + "dev" => Box::new(chain_spec::development_config(para_id)), + "" | "local" => Box::new(chain_spec::local_testnet_config(para_id)), + path => Box::new(chain_spec::ChainSpec::from_json_file( + std::path::PathBuf::from(path), + )?), + }) } impl SubstrateCli for Cli { @@ -108,318 +107,291 @@ impl SubstrateCli for RelayChainCli { 2017 } - fn load_spec(&self, id: &str) -> std::result::Result, String> { - polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id) - } + fn load_spec(&self, id: &str) -> std::result::Result, String> { + polkadot_cli::Cli::from_iter([RelayChainCli::executable_name().to_string()].iter()) + .load_spec(id) + } - fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { - polkadot_cli::Cli::native_runtime_version(chain_spec) - } + fn native_runtime_version(chain_spec: &Box) -> &'static RuntimeVersion { + polkadot_cli::Cli::native_runtime_version(chain_spec) + } } fn extract_genesis_wasm(chain_spec: &Box) -> Result> { - let mut storage = chain_spec.build_storage()?; + let mut storage = chain_spec.build_storage()?; - storage - .top - .remove(sp_core::storage::well_known_keys::CODE) - .ok_or_else(|| "Could not find wasm file in genesis state!".into()) + storage + .top + .remove(sp_core::storage::well_known_keys::CODE) + .ok_or_else(|| "Could not find wasm file in genesis state!".into()) } /// Parse command line arguments into service configuration. pub fn run() -> Result<()> { - let cli = Cli::from_args(); - - match &cli.subcommand { - Some(Subcommand::BuildSpec(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) - } - Some(Subcommand::CheckBlock(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - let PartialComponents { - client, - task_manager, - import_queue, - .. - } = crate::service::new_partial(&config)?; - Ok((cmd.run(client, import_queue), task_manager)) - }) - } - Some(Subcommand::ExportBlocks(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - let PartialComponents { - client, - task_manager, - .. - } = crate::service::new_partial(&config)?; - Ok((cmd.run(client, config.database), task_manager)) - }) - } - Some(Subcommand::ExportState(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - let PartialComponents { - client, - task_manager, - .. - } = crate::service::new_partial(&config)?; - Ok((cmd.run(client, config.chain_spec), task_manager)) - }) - } - Some(Subcommand::ImportBlocks(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - let PartialComponents { - client, - task_manager, - import_queue, - .. - } = crate::service::new_partial(&config)?; - Ok((cmd.run(client, import_queue), task_manager)) - }) - } - Some(Subcommand::PurgeChain(cmd)) => { - let runner = cli.create_runner(cmd)?; - - runner.sync_run(|config| { - let polkadot_cli = RelayChainCli::new( - &config, - [RelayChainCli::executable_name()] - .iter() - .chain(cli.relaychain_args.iter()), - ); - - let polkadot_config = SubstrateCli::create_configuration( - &polkadot_cli, - &polkadot_cli, - config.task_executor.clone(), - ) - .map_err(|err| format!("Relay chain argument error: {}", err))?; - - cmd.run(config, polkadot_config) - }) - } - Some(Subcommand::Revert(cmd)) => { - let runner = cli.create_runner(cmd)?; - runner.async_run(|config| { - let PartialComponents { - client, - task_manager, - backend, - .. - } = crate::service::new_partial(&config)?; - Ok((cmd.run(client, backend), task_manager)) - }) - } - Some(Subcommand::ExportGenesisState(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let block: Block = generate_genesis_block(&load_spec( - ¶ms.chain.clone().unwrap_or_default(), - params.parachain_id.unwrap_or(200).into(), - )?)?; - let raw_header = block.header().encode(); - let output_buf = if params.raw { - raw_header - } else { - format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) - } - Some(Subcommand::ExportGenesisWasm(params)) => { - let mut builder = sc_cli::LoggerBuilder::new(""); - builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); - let _ = builder.init(); - - let raw_wasm_blob = - extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?; - let output_buf = if params.raw { - raw_wasm_blob - } else { - format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes() - }; - - if let Some(output) = ¶ms.output { - std::fs::write(output, output_buf)?; - } else { - std::io::stdout().write_all(&output_buf)?; - } - - Ok(()) - } - #[cfg(feature = "runtime-benchmarks")] - Some(Subcommand::Benchmark(params)) => { - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(params)?; - - runner.sync_run(|config| params.run::(config)) - } else { - Err("Benchmarking wasn't enabled when building the node. \ - You can enable it with `--features runtime-benchmarks`." - .into()) - } - } - None => { - let runner = cli.create_runner(&*cli.run)?; - - runner.run_node_until_exit(|config| async move { - // TODO - let key = sp_core::Pair::generate().0; - - let para_id = - chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); - - let polkadot_cli = RelayChainCli::new( - &config, - [RelayChainCli::executable_name()] - .iter() - .chain(cli.relaychain_args.iter()), - ); - - let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(200)); - - let parachain_account = - AccountIdConversion::::into_account(&id); - - let block: Block = - generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; - let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); - - let task_executor = config.task_executor.clone(); - let polkadot_config = - SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor) - .map_err(|err| format!("Relay chain argument error: {}", err))?; - let collator = cli.run.base.validator || cli.collator; - - info!("Parachain id: {:?}", id); - info!("Parachain Account: {}", parachain_account); - info!("Parachain genesis state: {}", genesis_state); - info!("Is collating: {}", if collator { "yes" } else { "no" }); - - crate::service::start_node(config, key, polkadot_config, id, collator) - .await - .map(|r| r.0) - .map_err(Into::into) - }) - } - } + let cli = Cli::from_args(); + + match &cli.subcommand { + Some(Subcommand::BuildSpec(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|config| cmd.run(config.chain_spec, config.network)) + } + Some(Subcommand::CheckBlock(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.import_queue)) + }) + } + Some(Subcommand::ExportBlocks(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, config.database)) + }) + } + Some(Subcommand::ExportState(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, config.chain_spec)) + }) + } + Some(Subcommand::ImportBlocks(cmd)) => { + construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.import_queue)) + }) + } + Some(Subcommand::PurgeChain(cmd)) => { + let runner = cli.create_runner(cmd)?; + + runner.sync_run(|config| { + let polkadot_cli = RelayChainCli::new( + &config, + [RelayChainCli::executable_name().to_string()] + .iter() + .chain(cli.relaychain_args.iter()), + ); + + let polkadot_config = SubstrateCli::create_configuration( + &polkadot_cli, + &polkadot_cli, + config.task_executor.clone(), + ) + .map_err(|err| format!("Relay chain argument error: {}", err))?; + + cmd.run(config, polkadot_config) + }) + } + Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| { + Ok(cmd.run(components.client, components.backend)) + }), + Some(Subcommand::ExportGenesisState(params)) => { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); + let _ = builder.init(); + + let block: Block = generate_genesis_block(&load_spec( + ¶ms.chain.clone().unwrap_or_default(), + params.parachain_id.unwrap_or(200).into(), + )?)?; + let raw_header = block.header().encode(); + let output_buf = if params.raw { + raw_header + } else { + format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes() + }; + + if let Some(output) = ¶ms.output { + std::fs::write(output, output_buf)?; + } else { + std::io::stdout().write_all(&output_buf)?; + } + + Ok(()) + } + Some(Subcommand::ExportGenesisWasm(params)) => { + let mut builder = sc_cli::LoggerBuilder::new(""); + builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); + let _ = builder.init(); + + let raw_wasm_blob = + extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?; + let output_buf = if params.raw { + raw_wasm_blob + } else { + format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes() + }; + + if let Some(output) = ¶ms.output { + std::fs::write(output, output_buf)?; + } else { + std::io::stdout().write_all(&output_buf)?; + } + + Ok(()) + }, + Some(Subcommand::Benchmark(cmd)) => { + if cfg!(feature = "runtime-benchmarks") { + let runner = cli.create_runner(cmd)?; + + runner.sync_run(|config| cmd.run::(config)) + } else { + Err("Benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`.".into()) + } + }, + None => { + let runner = cli.create_runner(&cli.run.normalize())?; + + runner.run_node_until_exit(|config| async move { + // TODO + let key = sp_core::Pair::generate().0; + + let para_id = + chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); + + let polkadot_cli = RelayChainCli::new( + &config, + [RelayChainCli::executable_name().to_string()] + .iter() + .chain(cli.relaychain_args.iter()), + ); + + let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(200)); + + let parachain_account = + AccountIdConversion::::into_account(&id); + + let block: Block = + generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; + let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); + + let task_executor = config.task_executor.clone(); + let polkadot_config = SubstrateCli::create_configuration( + &polkadot_cli, + &polkadot_cli, + task_executor, + ) + .map_err(|err| format!("Relay chain argument error: {}", err))?; + + info!("Parachain id: {:?}", id); + info!("Parachain Account: {}", parachain_account); + info!("Parachain genesis state: {}", genesis_state); + info!( + "Is collating: {}", + if config.role.is_authority() { + "yes" + } else { + "no" + } + ); + + crate::service::start_node(config, key, polkadot_config, id) + .await + .map(|r| r.0) + .map_err(Into::into) + }) + } + } } impl DefaultConfigurationValues for RelayChainCli { - fn p2p_listen_port() -> u16 { - 30334 - } + fn p2p_listen_port() -> u16 { + 30334 + } - fn rpc_ws_listen_port() -> u16 { - 9945 - } + fn rpc_ws_listen_port() -> u16 { + 9945 + } - fn rpc_http_listen_port() -> u16 { - 9934 - } + fn rpc_http_listen_port() -> u16 { + 9934 + } - fn prometheus_listen_port() -> u16 { - 9616 - } + fn prometheus_listen_port() -> u16 { + 9616 + } } impl CliConfiguration for RelayChainCli { - fn shared_params(&self) -> &SharedParams { - self.base.base.shared_params() - } - - fn import_params(&self) -> Option<&ImportParams> { - self.base.base.import_params() - } - - fn network_params(&self) -> Option<&NetworkParams> { - self.base.base.network_params() - } - - fn keystore_params(&self) -> Option<&KeystoreParams> { - self.base.base.keystore_params() - } - - fn base_path(&self) -> Result> { - Ok(self - .shared_params() - .base_path() - .or_else(|| self.base_path.clone().map(Into::into))) - } - - fn rpc_http(&self, default_listen_port: u16) -> Result> { - self.base.base.rpc_http(default_listen_port) - } - - fn rpc_ipc(&self) -> Result> { - self.base.base.rpc_ipc() - } - - fn rpc_ws(&self, default_listen_port: u16) -> Result> { - self.base.base.rpc_ws(default_listen_port) - } - - fn prometheus_config(&self, default_listen_port: u16) -> Result> { - self.base.base.prometheus_config(default_listen_port) - } - - fn init(&self) -> Result<()> { - unreachable!("PolkadotCli is never initialized; qed"); - } - - fn chain_id(&self, is_dev: bool) -> Result { - let chain_id = self.base.base.chain_id(is_dev)?; - - Ok(if chain_id.is_empty() { - self.chain_id.clone().unwrap_or_default() - } else { - chain_id - }) - } - - fn role(&self, is_dev: bool) -> Result { - self.base.base.role(is_dev) - } - - fn transaction_pool(&self) -> Result { - self.base.base.transaction_pool() - } - - fn state_cache_child_ratio(&self) -> Result> { - self.base.base.state_cache_child_ratio() - } - - fn rpc_methods(&self) -> Result { - self.base.base.rpc_methods() - } - - fn rpc_ws_max_connections(&self) -> Result> { - self.base.base.rpc_ws_max_connections() - } - - fn rpc_cors(&self, is_dev: bool) -> Result>> { - self.base.base.rpc_cors(is_dev) - } - - fn telemetry_external_transport(&self) -> Result> { - self.base.base.telemetry_external_transport() - } - - fn default_heap_pages(&self) -> Result> { - self.base.base.default_heap_pages() - } + fn shared_params(&self) -> &SharedParams { + self.base.base.shared_params() + } + + fn import_params(&self) -> Option<&ImportParams> { + self.base.base.import_params() + } + + fn network_params(&self) -> Option<&NetworkParams> { + self.base.base.network_params() + } + + fn keystore_params(&self) -> Option<&KeystoreParams> { + self.base.base.keystore_params() + } + + fn base_path(&self) -> Result> { + Ok(self + .shared_params() + .base_path() + .or_else(|| self.base_path.clone().map(Into::into))) + } + + fn rpc_http(&self, default_listen_port: u16) -> Result> { + self.base.base.rpc_http(default_listen_port) + } + + fn rpc_ipc(&self) -> Result> { + self.base.base.rpc_ipc() + } + + fn rpc_ws(&self, default_listen_port: u16) -> Result> { + self.base.base.rpc_ws(default_listen_port) + } + + fn prometheus_config(&self, default_listen_port: u16) -> Result> { + self.base.base.prometheus_config(default_listen_port) + } + + fn init(&self) -> Result<()> { + unreachable!("PolkadotCli is never initialized; qed"); + } + + fn chain_id(&self, is_dev: bool) -> Result { + let chain_id = self.base.base.chain_id(is_dev)?; + + Ok(if chain_id.is_empty() { + self.chain_id.clone().unwrap_or_default() + } else { + chain_id + }) + } + + fn role(&self, is_dev: bool) -> Result { + self.base.base.role(is_dev) + } + + fn transaction_pool(&self) -> Result { + self.base.base.transaction_pool() + } + + fn state_cache_child_ratio(&self) -> Result> { + self.base.base.state_cache_child_ratio() + } + + fn rpc_methods(&self) -> Result { + self.base.base.rpc_methods() + } + + fn rpc_ws_max_connections(&self) -> Result> { + self.base.base.rpc_ws_max_connections() + } + + fn rpc_cors(&self, is_dev: bool) -> Result>> { + self.base.base.rpc_cors(is_dev) + } + + fn telemetry_external_transport(&self) -> Result> { + self.base.base.telemetry_external_transport() + } + + fn default_heap_pages(&self) -> Result> { + self.base.base.default_heap_pages() + } fn force_authoring(&self) -> Result { self.base.base.force_authoring() @@ -437,10 +409,10 @@ impl CliConfiguration for RelayChainCli { self.base.base.announce_block() } - fn telemetry_endpoints( - &self, - chain_spec: &Box, - ) -> Result> { - self.base.base.telemetry_endpoints(chain_spec) - } + fn telemetry_endpoints( + &self, + chain_spec: &Box, + ) -> Result> { + self.base.base.telemetry_endpoints(chain_spec) + } } diff --git a/node/src/service.rs b/node/src/service.rs index 02d665e965..363423534f 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -1,52 +1,96 @@ // Copyright 2021 ChainSafe Systems // SPDX-License-Identifier: LGPL-3.0-only -use cumulus_client_consensus_relay_chain::{ - build_relay_chain_consensus, BuildRelayChainConsensusParams, +// std +use std::sync::Arc; + +// Local Runtime Types +use parachain_runtime::RuntimeApi; + +// Cumulus Imports +use cumulus_client_consensus_aura::{ + build_aura_consensus, BuildAuraConsensusParams, SlotProportion, }; +use cumulus_client_consensus_common::ParachainConsensus; use cumulus_client_network::build_block_announce_validator; use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use cumulus_primitives_core::ParaId; -use parachain_runtime::{opaque::Block, RuntimeApi}; -use polkadot_primitives::v0::CollatorPair; -use sc_executor::native_executor_instance; + +// Polkadot Imports +use polkadot_primitives::v1::CollatorPair; + +// Substrate Imports +use sc_client_api::ExecutorProvider; pub use sc_executor::NativeExecutor; +use sc_executor::native_executor_instance; +use sc_network::NetworkService; use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager}; -use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle}; +use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle}; +use sp_api::ConstructRuntimeApi; +use sp_consensus::SlotData; +use sp_keystore::SyncCryptoStorePtr; use sp_runtime::traits::BlakeTwo256; -use sp_trie::PrefixedMemoryDB; -use std::sync::Arc; +use substrate_prometheus_endpoint::Registry; + +// Runtime type overrides +type BlockNumber = u32; +type Header = sp_runtime::generic::Header; +pub type Block = sp_runtime::generic::Block; +type Hash = sp_core::H256; // Native executor instance. native_executor_instance!( - pub Executor, - parachain_runtime::api::dispatch, - parachain_runtime::native_version, - frame_benchmarking::benchmarking::HostFunctions, + pub ParachainRuntimeExecutor, + parachain_runtime::api::dispatch, + parachain_runtime::native_version, + frame_benchmarking::benchmarking::HostFunctions, ); /// Starts a `ServiceBuilder` for a full service. /// /// Use this macro if you don't actually need the full service, but just the builder in order to /// be able to perform chain operations. -#[allow(clippy::type_complexity)] -pub fn new_partial( +pub fn new_partial( config: &Configuration, + build_import_queue: BIQ, ) -> Result< PartialComponents< TFullClient, TFullBackend, (), - sp_consensus::import_queue::BasicQueue>, + sp_consensus::DefaultImportQueue>, sc_transaction_pool::FullPool>, (Option, Option), >, sc_service::Error, -> { - let inherent_data_providers = sp_inherents::InherentDataProviders::new(); - +> + where + RuntimeApi: ConstructRuntimeApi> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, + BIQ: FnOnce( + Arc>, + &Configuration, + Option, + &TaskManager, + ) -> Result< + sp_consensus::DefaultImportQueue>, + sc_service::Error, + >, +{ let telemetry = config .telemetry_endpoints .clone() @@ -72,8 +116,6 @@ pub fn new_partial( telemetry }); - let registry = config.prometheus_registry(); - let transaction_pool = sc_transaction_pool::BasicPool::new_full( config.transaction_pool.clone(), config.role.is_authority().into(), @@ -82,12 +124,11 @@ pub fn new_partial( client.clone(), ); - let import_queue = cumulus_client_consensus_relay_chain::import_queue( - client.clone(), + let import_queue = build_import_queue( client.clone(), - inherent_data_providers.clone(), - &task_manager.spawn_essential_handle(), - registry, + config, + telemetry.as_ref().map(|telemetry| telemetry.handle()), + &task_manager, )?; let params = PartialComponents { @@ -97,7 +138,6 @@ pub fn new_partial( keystore_container, task_manager, transaction_pool, - inherent_data_providers, select_chain: (), other: (telemetry, telemetry_worker_handle), }; @@ -109,20 +149,56 @@ pub fn new_partial( /// /// This is the actual implementation that is abstract over the executor and the runtime api. #[sc_tracing::logging::prefix_logs_with("Parachain")] -async fn start_node_impl( +async fn start_node_impl( parachain_config: Configuration, collator_key: CollatorPair, polkadot_config: Configuration, id: ParaId, - validator: bool, rpc_ext_builder: RB, + build_import_queue: BIQ, + build_consensus: BIC, ) -> sc_service::error::Result<(TaskManager, Arc>)> -where - RB: Fn( + where + RuntimeApi: ConstructRuntimeApi> + + Send + + Sync + + 'static, + RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue + + sp_api::Metadata + + sp_session::SessionKeys + + sp_api::ApiExt< + Block, + StateBackend = sc_client_api::StateBackendFor, Block>, + > + sp_offchain::OffchainWorkerApi + + sp_block_builder::BlockBuilder + + cumulus_primitives_core::CollectCollationInfo, + sc_client_api::StateBackendFor, Block>: sp_api::StateBackend, + Executor: sc_executor::NativeExecutionDispatch + 'static, + RB: Fn( Arc>, ) -> jsonrpc_core::IoHandler + Send + 'static, + BIQ: FnOnce( + Arc>, + &Configuration, + Option, + &TaskManager, + ) -> Result< + sp_consensus::DefaultImportQueue>, + sc_service::Error, + >, + BIC: FnOnce( + Arc>, + Option<&Registry>, + Option, + &TaskManager, + &polkadot_service::NewFull, + Arc>>, + Arc>, + SyncCryptoStorePtr, + bool, + ) -> Result>, sc_service::Error>, { if matches!(parachain_config.role, Role::Light) { return Err("Light client not supported!".into()); @@ -130,56 +206,45 @@ where let parachain_config = prepare_node_config(parachain_config); - let params = new_partial(¶chain_config)?; - params - .inherent_data_providers - .register_provider(sp_timestamp::InherentDataProvider) - .unwrap(); + let params = new_partial::(¶chain_config, build_import_queue)?; let (mut telemetry, telemetry_worker_handle) = params.other; - let polkadot_full_node = cumulus_client_service::build_polkadot_full_node( + let relay_chain_full_node = cumulus_client_service::build_polkadot_full_node( polkadot_config, collator_key.clone(), telemetry_worker_handle, ) - .map_err(|e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - })?; + .map_err(|e| match e { + polkadot_service::Error::Sub(x) => x, + s => format!("{}", s).into(), + })?; let client = params.client.clone(); let backend = params.backend.clone(); let block_announce_validator = build_block_announce_validator( - polkadot_full_node.client.clone(), + relay_chain_full_node.client.clone(), id, - Box::new(polkadot_full_node.network.clone()), - polkadot_full_node.backend.clone(), + Box::new(relay_chain_full_node.network.clone()), + relay_chain_full_node.backend.clone(), ); + let force_authoring = parachain_config.force_authoring; + let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); let mut task_manager = params.task_manager; - let import_queue = params.import_queue; + let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); let (network, network_status_sinks, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue, + import_queue: import_queue.clone(), on_demand: None, block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)), })?; - if parachain_config.offchain_worker.enabled { - sc_service::build_offchain_workers( - ¶chain_config, - task_manager.spawn_handle(), - client.clone(), - network.clone(), - ); - } - let rpc_client = client.clone(); let rpc_extensions_builder = Box::new(move |_, _| rpc_ext_builder(rpc_client.clone())); @@ -205,23 +270,19 @@ where }; if validator { - let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( - task_manager.spawn_handle(), + let parachain_consensus = build_consensus( client.clone(), - transaction_pool, prometheus_registry.as_ref(), - telemetry.as_ref().map(|x| x.handle()), - ); - let spawner = task_manager.spawn_handle(); + telemetry.as_ref().map(|t| t.handle()), + &task_manager, + &relay_chain_full_node, + transaction_pool, + network, + params.keystore_container.sync_keystore(), + force_authoring, + )?; - let parachain_consensus = build_relay_chain_consensus(BuildRelayChainConsensusParams { - para_id: id, - proposer_factory, - inherent_data_providers: params.inherent_data_providers, - block_import: client.clone(), - relay_chain_client: polkadot_full_node.client.clone(), - relay_chain_backend: polkadot_full_node.backend.clone(), - }); + let spawner = task_manager.spawn_handle(); let params = StartCollatorParams { para_id: id, @@ -230,10 +291,10 @@ where client: client.clone(), task_manager: &mut task_manager, collator_key, - relay_chain_full_node: polkadot_full_node, + relay_chain_full_node, spawner, - backend, parachain_consensus, + import_queue, }; start_collator(params).await?; @@ -243,7 +304,7 @@ where announce_block, task_manager: &mut task_manager, para_id: id, - polkadot_full_node, + relay_chain_full_node, }; start_full_node(params)?; @@ -254,21 +315,140 @@ where Ok((task_manager, client)) } +/// Build the import queue for the the parachain runtime. +pub fn parachain_build_import_queue( + client: Arc>, + config: &Configuration, + telemetry: Option, + task_manager: &TaskManager, +) -> Result< + sp_consensus::DefaultImportQueue< + Block, + TFullClient, + >, + sc_service::Error, +> { + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + + cumulus_client_consensus_aura::import_queue::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + >(cumulus_client_consensus_aura::ImportQueueParams { + block_import: client.clone(), + client: client.clone(), + create_inherent_data_providers: move |_, _| async move { + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + Ok((time, slot)) + }, + registry: config.prometheus_registry().clone(), + can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), + spawner: &task_manager.spawn_essential_handle(), + telemetry, + }) + .map_err(Into::into) +} + /// Start a normal parachain node. pub async fn start_node( parachain_config: Configuration, collator_key: CollatorPair, polkadot_config: Configuration, id: ParaId, - validator: bool, -) -> sc_service::error::Result<(TaskManager, Arc>)> { - start_node_impl( +) -> sc_service::error::Result<(TaskManager, Arc>)> { + start_node_impl::( parachain_config, collator_key, polkadot_config, id, - validator, |_| Default::default(), + parachain_build_import_queue, + |client, + prometheus_registry, + telemetry, + task_manager, + relay_chain_node, + transaction_pool, + sync_oracle, + keystore, + force_authoring| { + let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?; + + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( + task_manager.spawn_handle(), + client.clone(), + transaction_pool, + prometheus_registry.clone(), + telemetry.clone(), + ); + + let relay_chain_backend = relay_chain_node.backend.clone(); + let relay_chain_client = relay_chain_node.client.clone(); + Ok(build_aura_consensus::< + sp_consensus_aura::sr25519::AuthorityPair, + _, + _, + _, + _, + _, + _, + _, + _, + _, + >(BuildAuraConsensusParams { + proposer_factory, + create_inherent_data_providers: move |_, (relay_parent, validation_data)| { + let parachain_inherent = + cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client( + relay_parent, + &relay_chain_client, + &*relay_chain_backend, + &validation_data, + id, + ); + async move { + let time = sp_timestamp::InherentDataProvider::from_system_time(); + + let slot = + sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration( + *time, + slot_duration.slot_duration(), + ); + + let parachain_inherent = parachain_inherent.ok_or_else(|| { + Box::::from( + "Failed to create parachain inherent", + ) + })?; + Ok((time, slot, parachain_inherent)) + } + }, + block_import: client.clone(), + relay_chain_client: relay_chain_node.client.clone(), + relay_chain_backend: relay_chain_node.backend.clone(), + para_client: client.clone(), + backoff_authoring_blocks: Option::<()>::None, + sync_oracle, + keystore, + force_authoring, + slot_duration, + // We got around 500ms for proposing + block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32), + telemetry, + })) + }, ) - .await -} + .await +} \ No newline at end of file diff --git a/pallets/asset-depository/Cargo.toml b/pallets/asset-depository/Cargo.toml index 33b2cd823d..3c8148486b 100644 --- a/pallets/asset-depository/Cargo.toml +++ b/pallets/asset-depository/Cargo.toml @@ -30,19 +30,19 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true @@ -52,19 +52,19 @@ serde = { version = "1.0.101" } [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/asset-index/Cargo.toml b/pallets/asset-index/Cargo.toml index 9e57222bd3..fa171fc465 100644 --- a/pallets/asset-index/Cargo.toml +++ b/pallets/asset-index/Cargo.toml @@ -39,42 +39,43 @@ version = '2.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate' -branch = 'rococo-v1' +branch = 'master' optional = true [dependencies.pallet-chainlink-feed] default_features = false package = 'pallet-chainlink-feed' -git = "https://github.com/ChainSafe/chainlink-polkadot" +git = "https://github.com/smartcontractkit/chainlink-polkadot" +branch = 'master' optional = true [dependencies.xcm] git = "https://github.com/paritytech/polkadot" -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.xcm-executor] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dependencies.pallet-remote-asset-manager] default-features = false @@ -96,25 +97,25 @@ serde = { version = "1.0.101" } [dev-dependencies.pallet-balances] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml index b1d4728944..3306f62037 100644 --- a/pallets/committee/Cargo.toml +++ b/pallets/committee/Cargo.toml @@ -33,26 +33,26 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.serde] @@ -65,19 +65,19 @@ version = "1.0.101" [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/local-treasury/Cargo.toml b/pallets/local-treasury/Cargo.toml index ff59cfc830..ea65217693 100644 --- a/pallets/local-treasury/Cargo.toml +++ b/pallets/local-treasury/Cargo.toml @@ -29,19 +29,19 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true @@ -51,25 +51,25 @@ serde = { version = "1.0.101" } [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/price-feed/Cargo.toml b/pallets/price-feed/Cargo.toml index adb4f81a41..d331e4c29b 100644 --- a/pallets/price-feed/Cargo.toml +++ b/pallets/price-feed/Cargo.toml @@ -32,19 +32,20 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-chainlink-feed] default_features = false package = 'pallet-chainlink-feed' -git = "https://github.com/ChainSafe/chainlink-polkadot" +git = "https://github.com/smartcontractkit/chainlink-polkadot" +branch = "master" [dependencies] serde = { version = "1.0.101", optional = true } @@ -52,32 +53,32 @@ serde = { version = "1.0.101", optional = true } [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/remote-asset-manager/Cargo.toml b/pallets/remote-asset-manager/Cargo.toml index 2e1c8dedeb..716a15f528 100644 --- a/pallets/remote-asset-manager/Cargo.toml +++ b/pallets/remote-asset-manager/Cargo.toml @@ -41,41 +41,41 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true [dependencies.xcm] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dependencies.xcm-executor] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dependencies.cumulus-pallet-xcm] default-features = false git = 'https://github.com/paritytech/cumulus' -branch = 'rococo-v1' +branch = 'master' [dependencies.cumulus-primitives-core] default-features = false git = 'https://github.com/paritytech/cumulus' -branch = 'rococo-v1' +branch = 'master' [dependencies.xcm-calls] default-features = false @@ -84,41 +84,41 @@ version = '0.0.1' [dev-dependencies.pallet-staking] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-proxy] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.xcm-builder] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/saft-registry/Cargo.toml b/pallets/saft-registry/Cargo.toml index 0293c4cb4d..3b14ce8102 100644 --- a/pallets/saft-registry/Cargo.toml +++ b/pallets/saft-registry/Cargo.toml @@ -35,19 +35,19 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true @@ -57,25 +57,25 @@ serde = { version = "1.0.101" } [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/xcm-asset-support/Cargo.toml b/pallets/xcm-asset-support/Cargo.toml index d81a12f04f..c753c494a8 100644 --- a/pallets/xcm-asset-support/Cargo.toml +++ b/pallets/xcm-asset-support/Cargo.toml @@ -32,31 +32,31 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' optional = true [dependencies.xcm] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dependencies.xcm-executor] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dev-dependencies] serde = { version = "1.0.101" } @@ -64,30 +64,30 @@ serde = { version = "1.0.101" } [dev-dependencies.xcm-builder] default-features = false git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [package.metadata.docs.rs] diff --git a/pallets/xcm-asset-support/src/lib.rs b/pallets/xcm-asset-support/src/lib.rs index 65b28a2946..8e43aeb18e 100644 --- a/pallets/xcm-asset-support/src/lib.rs +++ b/pallets/xcm-asset-support/src/lib.rs @@ -125,8 +125,8 @@ impl XcmAssetExecutor { ) -> Xcm { let mut reanchored_dest = dest.clone(); if reserve == Junction::Parent.into() { - if let MultiLocation::X2(Junction::Parent, Junction::Parachain { id }) = dest { - reanchored_dest = Junction::Parachain { id }.into(); + if let MultiLocation::X2(Junction::Parent, Junction::Parachain(id)) = dest { + reanchored_dest = Junction::Parachain(id).into(); } } @@ -161,11 +161,11 @@ impl XcmAssetExecutor { location: &MultiLocation, ) -> (Option, Option) { let chain_location = match (location.first(), location.at(1)) { - (Some(Junction::Parent), Some(Junction::Parachain { id })) => { - Some((Junction::Parent, Junction::Parachain { id: *id }).into()) + (Some(Junction::Parent), Some(Junction::Parachain ( id ))) => { + Some((Junction::Parent, Junction::Parachain ( *id )).into()) } (Some(Junction::Parent), _) => Some(Junction::Parent.into()), - (Some(Junction::Parachain { id }), _) => Some(Junction::Parachain { id: *id }.into()), + (Some(Junction::Parachain ( id )), _) => Some(Junction::Parachain ( *id ).into()), _ => None, }; @@ -175,7 +175,7 @@ impl XcmAssetExecutor { .into_iter() .filter(|_| { path.iter().all(|junction| { - matches!(junction, Junction::Parent | Junction::Parachain { id: _ }) + matches!(junction, Junction::Parent | Junction::Parachain(_)) }) }) .map(Into::into) diff --git a/primitives/xcm-calls/Cargo.toml b/primitives/xcm-calls/Cargo.toml index d9d0ad5f55..df6b8e0845 100644 --- a/primitives/xcm-calls/Cargo.toml +++ b/primitives/xcm-calls/Cargo.toml @@ -31,71 +31,71 @@ version = '2.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-staking] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-proxy] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.sp-staking] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-staking-reward-curve] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-timestamp] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.pallet-session] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.frame-election-provider-support] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dev-dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' [package.metadata.docs.rs] targets = ['x86_64-unknown-linux-gnu'] \ No newline at end of file diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 9b75ca57f2..d4f8a9d104 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -1,6 +1,6 @@ [build-dependencies.substrate-wasm-builder] git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '4.0.0' [package] @@ -25,38 +25,38 @@ version = '2.0.0' default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-executive] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-support] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system-benchmarking] default-features = false git = 'https://github.com/paritytech/substrate.git' optional = true -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.frame-system-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.hex-literal] @@ -66,37 +66,37 @@ version = '0.3.1' [dependencies.pallet-balances] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-randomness-collective-flip] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-sudo] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-timestamp] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-transaction-payment] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-transaction-payment-rpc-runtime-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.serde] @@ -107,67 +107,67 @@ version = '1.0.119' [dependencies.sp-api] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-block-builder] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-core] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-inherents] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-io] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-offchain] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-runtime] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-session] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-std] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-transaction-pool] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.sp-version] default-features = false git = 'https://github.com/paritytech/substrate.git' -branch = 'rococo-v1' +branch = 'master' version = '3.0.0' [dependencies.pallet-asset-depository] @@ -208,7 +208,8 @@ version = '0.0.1' [dependencies.pallet-chainlink-feed] default_features = false package = 'pallet-chainlink-feed' -git = "https://github.com/ChainSafe/chainlink-polkadot" +git = "https://github.com/smartcontractkit/chainlink-polkadot" +branch = "master" [dependencies.xcm-calls] default-features = false @@ -219,58 +220,63 @@ version = '0.0.1' [dependencies.parachain-info] default-features = false git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' version = '0.1.0' [dependencies.cumulus-pallet-parachain-system] git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.cumulus-primitives-core] git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.cumulus-pallet-xcm] git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.cumulus-pallet-xcmp-queue] git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' +default-features = false + +[dependencies.cumulus-pallet-dmp-queue] +git = 'https://github.com/paritytech/cumulus.git' +branch = 'master' default-features = false [dependencies.cumulus-primitives-utility] git = 'https://github.com/paritytech/cumulus.git' -branch = 'rococo-v1' +branch = 'master' default-features = false # Polkadot dependencies [dependencies.polkadot-parachain] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.xcm-builder] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.xcm-executor] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' default-features = false [dependencies.pallet-xcm] git = 'https://github.com/paritytech/polkadot' -branch = 'rococo-v1' +branch = 'master' default-features = false [features] @@ -326,6 +332,7 @@ std = [ 'xcm-executor/std', 'cumulus-pallet-xcm/std', 'cumulus-pallet-xcmp-queue/std', + 'cumulus-pallet-dmp-queue/std', 'cumulus-primitives-utility/std', 'pallet-asset-depository/std', 'pallet-asset-index/std', diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 7fffd47c03..b805f7e98c 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -33,13 +33,8 @@ use frame_system::{ // Polkadot imports use cumulus_primitives_core::ParaId; use polkadot_parachain::primitives::Sibling; -use xcm::v0::{Junction, MultiAsset, MultiLocation, NetworkId}; -use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, NativeAsset, ParentIsDefault, - RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SovereignSignedViaLocation, TakeWeightCredit, -}; +use xcm::v0::{Junction, MultiAsset, MultiLocation, NetworkId, Xcm}; +use xcm_builder::{AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, NativeAsset, ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, SignedToAccountId32}; use xcm_executor::{traits::Convert, Config, XcmExecutor}; // A few exports that help ease life for downstream crates. @@ -271,6 +266,7 @@ parameter_types! { /// Same as Polkadot Relay Chain. pub const ExistentialDeposit: Balance = 500; pub const MaxLocks: u32 = 50; + pub const MaxReserves: u32 = 50; } impl pallet_balances::Config for Runtime { @@ -283,6 +279,8 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = pallet_balances::weights::SubstrateWeight; + type MaxReserves = MaxReserves; + type ReserveIdentifier = [u8; 8]; } parameter_types! { @@ -303,18 +301,16 @@ impl pallet_sudo::Config for Runtime { parameter_types! { pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; + pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4; } impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; type OnValidationData = (); type SelfParaId = parachain_info::Pallet; - type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent< - MaxDownwardMessageWeight, - XcmExecutor, - Call, - >; type OutboundXcmpMessageSource = XcmpQueue; + type DmpMessageHandler = DmpQueue; + type ReservedDmpWeight = ReservedDmpWeight; type XcmpMessageHandler = XcmpQueue; type ReservedXcmpWeight = ReservedXcmpWeight; } @@ -322,12 +318,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} parameter_types! { - pub const RococoLocation: MultiLocation = MultiLocation::X1(Junction::Parent); - pub const RococoNetwork: NetworkId = NetworkId::Polkadot; + pub const RelayLocation: MultiLocation = MultiLocation::X1(Junction::Parent); + pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayChainOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into(); - pub Ancestry: MultiLocation = Junction::Parachain { - id: ParachainInfo::parachain_id().into() - }.into(); + pub Ancestry: MultiLocation = Junction::Parachain( + ParachainInfo::parachain_id().into() + ).into(); } /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used @@ -339,7 +335,7 @@ pub type LocationToAccountId = ( // Sibling parachain origins convert to AccountId via the `ParaId::into`. SiblingParachainConvertsVia, // Straight up local `AccountId32` origins just alias directly to `AccountId`. - AccountId32Aliases, + AccountId32Aliases, ); /// Means for transacting assets on this chain. @@ -378,7 +374,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( SiblingParachainAsNative, // Native signed account converter; this just converts an `AccountId32` origin into a normal // `Origin::Signed` origin of the same 32-byte value. - SignedAccountId32AsNative, + SignedAccountId32AsNative, ); parameter_types! { @@ -395,7 +391,8 @@ parameter_types! { pub type Barrier = ( TakeWeightCredit, AllowTopLevelPaidExecutionFrom>, - AllowUnpaidExecutionFrom>, // <- Parent gets free execution + AllowUnpaidExecutionFrom>, + // <- Parent gets free execution ); pub struct XcmConfig; @@ -410,7 +407,7 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = UsingComponents, RelayLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. } @@ -418,8 +415,7 @@ parameter_types! { pub const MaxDownwardMessageWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10; } -/// No local origins on this chain are allowed to dispatch XCM sends/executions. -pub type LocalOriginToLocation = (); +pub type LocalOriginToLocation = (SignedToAccountId32,); /// The means for routing XCM messages which are not for local execution into the right message /// queues. @@ -435,10 +431,17 @@ impl pallet_xcm::Config for Runtime { type SendXcmOrigin = EnsureXcmOrigin; type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; + type XcmExecuteFilter = All<(MultiLocation, Xcm)>; type XcmExecutor = XcmExecutor; + type XcmTeleportFilter = All<(MultiLocation, Vec)>; + type XcmReserveTransferFilter = (); + type Weigher = FixedWeightBounds; } -impl cumulus_pallet_xcm::Config for Runtime {} +impl cumulus_pallet_xcm::Config for Runtime { + type Event = Event; + type XcmExecutor = XcmExecutor; +} impl cumulus_pallet_xcmp_queue::Config for Runtime { type Event = Event; @@ -446,6 +449,12 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime { type ChannelInfo = ParachainSystem; } +impl cumulus_pallet_dmp_queue::Config for Runtime { + type Event = Event; + type XcmExecutor = XcmExecutor; + type ExecuteOverweightOrigin = frame_system::EnsureRoot; +} + parameter_types! { pub const TreasuryPalletId: PalletId = PalletId(*b"12345678"); } @@ -525,8 +534,6 @@ parameter_types! { pub const OracleLimit: u32 = 10; // Maximum number of feeds pub const FeedLimit: u16 = 10; - // Free for valid submission - pub const PaysFeeConf: pallet_chainlink_feed::SubmitterPaysFee = pallet_chainlink_feed::SubmitterPaysFee::FreeForValidSubmission; } impl pallet_chainlink_feed::Config for Runtime { @@ -540,8 +547,7 @@ impl pallet_chainlink_feed::Config for Runtime { type OracleCountLimit = OracleLimit; type FeedLimit = FeedLimit; type OnAnswerHandler = (); - type SubmitterPaysFee = PaysFeeConf; - type WeightInfo = pallet_chainlink_feed::default_weights::WeightInfo; + type WeightInfo = (); } parameter_types! { @@ -573,7 +579,7 @@ impl pallet_asset_index::Config for Runtime { parameter_types! { pub const RelayChainAssetId: AssetId = 0; pub const PINTAssetId: AssetId = 1; - pub SelfLocation: MultiLocation = MultiLocation::X2(Junction::Parent, Junction::Parachain { id: ParachainInfo::parachain_id().into() }); + pub SelfLocation: MultiLocation = MultiLocation::X2(Junction::Parent, Junction::Parachain(ParachainInfo::parachain_id().into())); } pub struct AssetIdConvert; @@ -588,7 +594,7 @@ impl Convert for AssetIdConvert { MultiLocation::X1(Junction::Parent) => return Ok(RelayChainAssetId::get()), MultiLocation::X3( Junction::Parent, - Junction::Parachain { id }, + Junction::Parachain (id) , Junction::GeneralKey(key), ) if ParaId::from(*id) == ParachainInfo::parachain_id().into() => { // decode the general key @@ -717,8 +723,9 @@ construct_runtime!( // XCM helpers XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event}, + DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event}, PolkadotXcm: pallet_xcm::{Pallet, Call, Event, Origin}, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Origin}, + CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} } ); @@ -795,10 +802,6 @@ impl_runtime_apis! { ) -> sp_inherents::CheckInherentsResult { data.check_extrinsics(&block) } - - fn random_seed() -> ::Hash { - RandomnessCollectiveFlip::random_seed().0 - } } impl sp_transaction_pool::runtime_api::TaggedTransactionQueue for Runtime {