diff --git a/Cargo.lock b/Cargo.lock index f5437ec5e8016..4855698ca48d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -34,14 +34,14 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" dependencies = [ - "gimli 0.23.0", + "gimli", ] [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" @@ -112,6 +112,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "always-assert" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11" + [[package]] name = "ansi_term" version = "0.11.0" @@ -132,9 +138,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" +checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767" [[package]] name = "approx" @@ -142,7 +148,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -181,8 +187,8 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502" dependencies = [ - "quote 1.0.8", - "syn 1.0.60", + "quote", + "syn", ] [[package]] @@ -201,15 +207,15 @@ dependencies = [ [[package]] name = "assert_matches" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695579f0f2520f3774bb40461e5adb066459d4e0af4d59d20175484fb8e9edf1" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" dependencies = [ "concurrent-queue", "event-listener", @@ -226,21 +232,24 @@ dependencies = [ "concurrent-queue", "fastrand", "futures-lite", - "once_cell 1.5.2", + "once_cell 1.7.2", "vec-arena", ] [[package]] name = "async-global-executor" -version = "1.4.3" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04" +checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" dependencies = [ + "async-channel", "async-executor", "async-io", + "async-mutex", + "blocking", "futures-lite", "num_cpus", - "once_cell 1.5.2", + "once_cell 1.7.2", ] [[package]] @@ -255,7 +264,7 @@ dependencies = [ "libc", "log", "nb-connect", - "once_cell 1.5.2", + "once_cell 1.7.2", "parking", "polling", "vec-arena", @@ -263,6 +272,15 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "async-lock" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb" +dependencies = [ + "event-listener", +] + [[package]] name = "async-mutex" version = "1.4.0" @@ -274,33 +292,32 @@ dependencies = [ [[package]] name = "async-process" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8cea09c1fb10a317d1b5af8024eeba256d6554763e85ecd90ff8df31c7bbda" +checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b" dependencies = [ "async-io", "blocking", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "event-listener", "futures-lite", - "once_cell 1.5.2", + "once_cell 1.7.2", "signal-hook", "winapi 0.3.9", ] [[package]] name = "async-std" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f84f1280a2b436a2c77c2582602732b6c2f4321d5494d6e799e6c367859a8" +checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" dependencies = [ "async-channel", "async-global-executor", "async-io", - "async-mutex", + "async-lock", "async-process", - "blocking", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "futures-channel", "futures-core", "futures-io", @@ -310,8 +327,8 @@ dependencies = [ "log", "memchr", "num_cpus", - "once_cell 1.5.2", - "pin-project-lite 0.2.4", + "once_cell 1.7.2", + "pin-project-lite 0.2.6", "pin-utils", "slab", "wasm-bindgen-futures", @@ -325,13 +342,13 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -344,7 +361,20 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", +] + +[[package]] +name = "asynchronous-codec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" +dependencies = [ + "bytes 1.0.1", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite 0.2.6", ] [[package]] @@ -380,6 +410,7 @@ dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "serde", "sp-authorship", "sp-core", "sp-inherents", @@ -402,18 +433,24 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" +checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" dependencies = [ "addr2line", "cfg-if 1.0.0", "libc", "miniz_oxide", - "object 0.22.0", + "object 0.23.0", "rustc-demangle", ] +[[package]] +name = "base-x" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + [[package]] name = "base58" version = "0.1.0" @@ -434,9 +471,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bincode" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d" +checksum = "d175dfa69e619905c4c3cdb7c3c203fa3bdd5d51184e3afdb2742c0280493772" dependencies = [ "byteorder", "serde", @@ -453,13 +490,13 @@ dependencies = [ "cfg-if 0.1.10", "clang-sys", "clap", - "env_logger", + "env_logger 0.7.1", "lazy_static", "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.24", - "quote 1.0.8", + "proc-macro2", + "quote", "regex", "rustc-hash", "shlex", @@ -474,9 +511,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d" +checksum = "1f682656975d3a682daff957be4ddeb65d6ad656737cd821f2d00685ae466af1" dependencies = [ "funty", "radium", @@ -516,6 +553,32 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake2s_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "constant_time_eq", +] + +[[package]] +name = "blake3" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9ff35b701f3914bdb8fad3368d822c766ef2858b2583198e41639b936f09d3f" +dependencies = [ + "arrayref", + "arrayvec 0.5.2", + "cc", + "cfg-if 0.1.10", + "constant_time_eq", + "crypto-mac 0.8.0", + "digest 0.9.0", +] + [[package]] name = "block-buffer" version = "0.7.3" @@ -525,7 +588,7 @@ dependencies = [ "block-padding 0.1.5", "byte-tools", "byteorder", - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -573,7 +636,7 @@ dependencies = [ "atomic-waker", "fastrand", "futures-lite", - "once_cell 1.5.2", + "once_cell 1.7.2", ] [[package]] @@ -584,9 +647,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" dependencies = [ "memchr", ] @@ -602,9 +665,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" [[package]] name = "byte-slice-cast" @@ -620,9 +683,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.4.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "bytes" @@ -664,9 +727,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a47b6286279a9998588ef7050d1ebc2500c69892a557c90fe5d071c64415dc" +checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" dependencies = [ "cargo-platform", "semver 0.11.0", @@ -677,9 +740,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" dependencies = [ "jobserver", ] @@ -705,6 +768,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.5.0" @@ -736,11 +805,22 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.14", + "num-traits", "time", "winapi 0.3.9", ] +[[package]] +name = "cid" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +dependencies = [ + "multibase", + "multihash", + "unsigned-varint 0.5.1", +] + [[package]] name = "cipher" version = "0.2.5" @@ -794,18 +874,18 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "const_fn" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" - [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "core-foundation" version = "0.7.0" @@ -822,6 +902,16 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +[[package]] +name = "cpp_demangle" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44919ecaf6f99e8e737bc239408931c9a01e9a6c74814fee8242dd2506b65390" +dependencies = [ + "cfg-if 1.0.0", + "glob", +] + [[package]] name = "cpuid-bool" version = "0.1.2" @@ -836,25 +926,25 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "cranelift-bforest" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dcc286b052ee24a1e5a222e7c1125e6010ad35b0f248709b9b3737a8fedcfdf" +checksum = "4066fd63b502d73eb8c5fa6bcab9c7962b05cd580f6b149ee83a8e730d8ce7fb" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9badfe36176cb653506091693bc2bb1970c9bddfcd6ec7fac404f7eaec6f38" +checksum = "1a54e4beb833a3c873a18a8fe735d73d732044004c7539a072c8faa35ccb0c60" dependencies = [ "byteorder", "cranelift-bforest", "cranelift-codegen-meta", "cranelift-codegen-shared", "cranelift-entity", - "gimli 0.21.0", + "gimli", "log", "regalloc", "serde", @@ -865,9 +955,9 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f460031861e4f4ad510be62b2ae50bba6cc886b598a36f9c0a970feab9598" +checksum = "c54cac7cacb443658d8f0ff36a3545822613fa202c946c0891897843bc933810" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -875,24 +965,24 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ad12409e922e7697cd0bdc7dc26992f64a77c31880dfe5e3c7722f4710206d" +checksum = "a109760aff76788b2cdaeefad6875a73c2b450be13906524f6c2a81e05b8d83c" [[package]] name = "cranelift-entity" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97cdc58972ea065d107872cfb9079f4c92ade78a8af85aaff519a65b5d13f71" +checksum = "3b044234aa32531f89a08b487630ddc6744696ec04c8123a1ad388de837f5de3" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef419efb4f94ecc02e5d9fbcc910d2bb7f0040e2de570e63a454f883bc891d6" +checksum = "5452b3e4e97538ee5ef2cc071301c69a86c7adf2770916b9d04e9727096abd93" dependencies = [ "cranelift-codegen", "log", @@ -902,9 +992,9 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e69d44d59826eef6794066ac2c0f4ad3975f02d97030c60dbc04e3886adf36e" +checksum = "f68035c10b2e80f26cc29c32fa824380877f38483504c2a47b54e7da311caaf3" dependencies = [ "cranelift-codegen", "raw-cpuid", @@ -913,17 +1003,19 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.66.0" +version = "0.69.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979df666b1304624abe99738e9e0e7c7479ee5523ba4b8b237df9ff49996acbb" +checksum = "a530eb9d1c95b3309deb24c3d179d8b0ba5837ed98914a429787c395f614949d" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", + "itertools 0.9.0", "log", "serde", + "smallvec 1.6.1", "thiserror", - "wasmparser 0.59.0", + "wasmparser", ] [[package]] @@ -942,7 +1034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", ] [[package]] @@ -963,8 +1055,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.1", - "crossbeam-utils 0.8.1", + "crossbeam-epoch 0.9.3", + "crossbeam-utils 0.8.3", ] [[package]] @@ -984,13 +1076,12 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" +checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" dependencies = [ "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "lazy_static", "memoffset 0.6.1", "scopeguard 1.1.0", @@ -1020,9 +1111,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" dependencies = [ "autocfg 1.0.1", "cfg-if 1.0.0", @@ -1041,7 +1132,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", "subtle 1.0.0", ] @@ -1064,6 +1155,16 @@ dependencies = [ "sct", ] +[[package]] +name = "ctor" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "cuckoofilter" version = "0.5.0" @@ -1076,40 +1177,37 @@ dependencies = [ ] [[package]] -name = "cumulus-collator" +name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "cumulus-network", - "cumulus-primitives", - "cumulus-runtime", - "futures 0.3.12", - "log", + "cumulus-client-consensus-common", + "cumulus-client-network", + "cumulus-primitives-core", + "futures 0.3.13", "parity-scale-codec", "parking_lot 0.9.0", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-parachain", "polkadot-primitives", - "polkadot-service", - "sc-cli", "sc-client-api", - "sp-api", "sp-consensus", "sp-core", - "sp-inherents", "sp-io", "sp-runtime", "sp-state-machine", + "tracing", ] [[package]] -name = "cumulus-consensus" +name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "futures 0.3.12", + "async-trait", + "dyn-clone", + "futures 0.3.13", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime", @@ -1121,26 +1219,48 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", + "sp-trie", "substrate-prometheus-endpoint", "tokio 0.1.22", "tracing", ] [[package]] -name = "cumulus-network" +name = "cumulus-client-consensus-relay-chain" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" +dependencies = [ + "async-trait", + "cumulus-client-consensus-common", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "futures 0.3.13", + "parity-scale-codec", + "parking_lot 0.9.0", + "polkadot-service", + "sc-client-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "cumulus-primitives", - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "futures-timer 3.0.2", - "log", "parity-scale-codec", "parking_lot 0.10.2", "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-overseer", "polkadot-parachain", "polkadot-primitives", "polkadot-service", @@ -1151,23 +1271,53 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", + "tracing", ] [[package]] -name = "cumulus-parachain-system" +name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "cumulus-primitives", - "cumulus-runtime", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-primitives-core", + "futures 0.3.13", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-service", + "sc-chain-spec", + "sc-client-api", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "tracing", +] + +[[package]] +name = "cumulus-pallet-parachain-system" +version = "0.1.0" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "environmental", "frame-support", "frame-system", "hash-db", + "log", + "memory-db", "pallet-balances", "parity-scale-codec", "polkadot-parachain", "serde", "sp-core", + "sp-externalities", "sp-inherents", "sp-io", "sp-runtime", @@ -1175,77 +1325,48 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", + "trie-db", ] [[package]] -name = "cumulus-primitives" +name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "impl-trait-for-tuples 0.1.3", + "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "polkadot-core-primitives", "polkadot-parachain", "polkadot-primitives", - "sc-chain-spec", - "sp-core", - "sp-inherents", "sp-runtime", "sp-std", "sp-trie", ] [[package]] -name = "cumulus-runtime" +name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "cumulus-primitives", - "frame-executive", - "hash-db", - "memory-db", + "cumulus-primitives-core", "parity-scale-codec", - "polkadot-parachain", - "sp-core", - "sp-externalities", - "sp-io", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "trie-db", -] - -[[package]] -name = "cumulus-service" -version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" -dependencies = [ - "cumulus-collator", - "cumulus-consensus", - "cumulus-primitives", - "futures 0.3.12", - "polkadot-overseer", - "polkadot-primitives", - "polkadot-service", "sc-client-api", - "sc-service", - "sc-tracing", "sp-api", - "sp-blockchain", - "sp-consensus", "sp-core", "sp-inherents", "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", "tracing", ] [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus#6438d328b8ac09f43d19df65a2cf8e31a524d78f" +source = "git+https://github.com/paritytech/cumulus?branch=rococo-v1#10887b728c563329845192915069a094b3f06139" dependencies = [ - "cumulus-primitives", + "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", "sp-runtime", @@ -1281,33 +1402,40 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] -name = "derive_more" -version = "0.15.0" +name = "data-encoding-macro" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a141330240c921ec6d074a3e188a7c7ef95668bb95e7d44fa0e5778ec2a7afe" +checksum = "0a94feec3d2ba66c0b6621bca8bc6f68415b1e5c69af3586fdd0af9fd9f29b17" dependencies = [ - "lazy_static", - "proc-macro2 0.4.30", - "quote 0.6.13", - "regex", - "rustc_version", - "syn 0.15.44", + "data-encoding", + "data-encoding-macro-internal", +] + +[[package]] +name = "data-encoding-macro-internal" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f83e699727abca3c56e187945f303389590305ab2f0185ea445aa66e8d5f2a" +dependencies = [ + "data-encoding", + "syn", ] [[package]] name = "derive_more" -version = "0.99.11" +version = "0.99.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" +checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "convert_case", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1322,7 +1450,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -1336,21 +1464,21 @@ dependencies = [ [[package]] name = "directories" -version = "2.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" +checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" dependencies = [ - "cfg-if 0.1.10", "dirs-sys", ] [[package]] -name = "directories" -version = "3.0.1" +name = "directories-next" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] @@ -1360,7 +1488,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", - "redox_users", + "redox_users 0.3.5", + "winapi 0.3.9", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users 0.4.0", "winapi 0.3.9", ] @@ -1396,9 +1535,9 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1426,7 +1565,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2 0.9.2", + "sha2 0.9.3", "zeroize", ] @@ -1436,15 +1575,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "enum_primitive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" -dependencies = [ - "num-traits 0.1.43", -] - [[package]] name = "enumflags2" version = "0.6.4" @@ -1460,9 +1590,9 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1472,7 +1602,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime", + "humantime 1.3.0", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +dependencies = [ + "atty", + "humantime 2.1.0", "log", "regex", "termcolor", @@ -1516,12 +1659,12 @@ dependencies = [ [[package]] name = "escargot" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d" +checksum = "ab01c2450bed354679e78bedbff1484e02910ef1be96755086a36cadd1247efa" dependencies = [ - "lazy_static", "log", + "once_cell 1.7.2", "serde", "serde_json", ] @@ -1542,10 +1685,12 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.6.0" -source = "git+https://github.com/notlesh/ethereum?branch=notlesh-moonbeam-v0.6#ea1b9e405a17f92fc7d27028136915604ccb948a" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567ce064a8232c16e2b2c2173a936b91fbe35c2f2c5278871f5a1a31688b42e9" dependencies = [ "ethereum-types", + "funty", "hash-db", "hash256-std-hasher", "parity-scale-codec", @@ -1579,8 +1724,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "evm" -version = "0.23.0" -source = "git+https://github.com/notlesh/evm?branch=notlesh-moonbeam-v0.6#123f5c7778befd201887bc58125f0e479589b56f" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b4bd1fb06a4962a243c8be285d8a9b2493ffa79acb32633ad07a0bc523b1acd" dependencies = [ "ethereum", "evm-core", @@ -1596,9 +1742,11 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.23.0" -source = "git+https://github.com/notlesh/evm?branch=notlesh-moonbeam-v0.6#123f5c7778befd201887bc58125f0e479589b56f" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4eea3882c798813a6f92e8855ec1fc3f5ababd8b274cb81d4bedee701b478e" dependencies = [ + "funty", "parity-scale-codec", "primitive-types", "serde", @@ -1606,8 +1754,9 @@ dependencies = [ [[package]] name = "evm-gasometer" -version = "0.23.0" -source = "git+https://github.com/notlesh/evm?branch=notlesh-moonbeam-v0.6#123f5c7778befd201887bc58125f0e479589b56f" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a8f04dcc8b0296652eabfa443a08ebed6071a1178e0f42a7f7b63a612bddf0b" dependencies = [ "evm-core", "evm-runtime", @@ -1616,8 +1765,9 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.23.0" -source = "git+https://github.com/notlesh/evm?branch=notlesh-moonbeam-v0.6#123f5c7778befd201887bc58125f0e479589b56f" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c302f29ca8bba82a382aa52d427869964179e4f24eae57bde70958ce9b7607" dependencies = [ "evm-core", "primitive-types", @@ -1630,7 +1780,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8013f441e38e31c670e7f34ec8f1d5d3a2bd9d303c1ff83976ca886005e8f48" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "parking_lot 0.7.1", ] @@ -1640,7 +1790,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", ] [[package]] @@ -1659,9 +1809,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "synstructure", ] @@ -1687,39 +1837,76 @@ dependencies = [ ] [[package]] -name = "fc-consensus" +name = "fc-consensus" +version = "0.1.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" +dependencies = [ + "derive_more", + "fc-db", + "fp-consensus", + "fp-rpc", + "futures 0.3.13", + "log", + "parity-scale-codec", + "sc-client-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-timestamp", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "fc-db" +version = "0.1.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" +dependencies = [ + "kvdb", + "kvdb-rocksdb", + "parity-scale-codec", + "parking_lot 0.11.1", + "sp-core", + "sp-database", + "sp-runtime", +] + +[[package]] +name = "fc-mapping-sync" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ - "derive_more 0.99.11", + "fc-consensus", + "fc-db", "fp-consensus", "fp-rpc", - "futures 0.3.12", + "futures 0.3.13", + "futures-timer 3.0.2", "log", - "parity-scale-codec", "sc-client-api", "sp-api", - "sp-block-builder", "sp-blockchain", - "sp-consensus", - "sp-core", - "sp-inherents", "sp-runtime", - "sp-timestamp", - "substrate-prometheus-endpoint", ] [[package]] name = "fc-rpc" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "ethereum", "ethereum-types", "fc-consensus", + "fc-db", "fc-rpc-core", + "fp-consensus", + "fp-evm", "fp-rpc", - "futures 0.3.12", + "fp-storage", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 14.2.0", "jsonrpc-derive 14.2.2", @@ -1749,7 +1936,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "ethereum-types", "jsonrpc-core 15.1.0", @@ -1776,21 +1963,21 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126" dependencies = [ - "env_logger", + "env_logger 0.7.1", "log", ] [[package]] name = "finality-grandpa" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd795898c348a8ec9edc66ec9e014031c764d4c88cc26d09b492cd93eb41339" +checksum = "c6447e2f8178843749e8c8003206def83ec124a7859475395777a28b5338647c" dependencies = [ "either", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "log", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "parking_lot 0.11.1", ] @@ -1815,9 +2002,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -1834,17 +2021,17 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", "percent-encoding 2.1.0", @@ -1853,9 +2040,12 @@ dependencies = [ [[package]] name = "fp-consensus" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ + "ethereum", "parity-scale-codec", + "rlp", + "sha3 0.8.2", "sp-core", "sp-runtime", "sp-std", @@ -1864,7 +2054,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "0.8.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "evm", "impl-trait-for-tuples 0.1.3", @@ -1877,7 +2067,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "ethereum", "ethereum-types", @@ -1890,16 +2080,32 @@ dependencies = [ "sp-std", ] +[[package]] +name = "fp-storage" +version = "0.1.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" +dependencies = [ + "ethereum", + "ethereum-types", + "fp-evm", + "parity-scale-codec", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "frame-benchmarking" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.1.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", "linregress", + "log", "parity-scale-codec", - "paste", + "paste 1.0.5", "sp-api", "sp-io", "sp-runtime", @@ -1910,8 +2116,8 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "Inflector", "chrono", @@ -1931,10 +2137,23 @@ dependencies = [ "structopt", ] +[[package]] +name = "frame-election-provider-support" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "sp-arithmetic", + "sp-npos-elections", + "sp-std", +] + [[package]] name = "frame-executive" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -1949,8 +2168,8 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "12.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "13.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "serde", @@ -1960,17 +2179,17 @@ dependencies = [ [[package]] name = "frame-support" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "log", - "once_cell 1.5.2", + "once_cell 1.7.2", "parity-scale-codec", - "paste", + "paste 1.0.5", "serde", "smallvec 1.6.1", "sp-arithmetic", @@ -1978,6 +2197,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", + "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", @@ -1985,45 +2205,46 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "Inflector", "frame-support-procedural-tools", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "frame-support-procedural-tools" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "frame-system" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", + "log", "parity-scale-codec", "serde", "sp-core", @@ -2035,18 +2256,36 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" +dependencies = [ + "parity-scale-codec", + "sp-api", +] + +[[package]] +name = "frame-try-runtime" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ + "frame-support", "parity-scale-codec", "sp-api", + "sp-runtime", + "sp-std", ] +[[package]] +name = "fs-err" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431" + [[package]] name = "fs-swap" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5839fda247e24ca4919c87c71dd5ca658f1f39e4f06829f80e3f15c3bafcfc2c" +checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" dependencies = [ "lazy_static", "libc", @@ -2054,6 +2293,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -2084,15 +2333,15 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150" +checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1" dependencies = [ "futures-channel", "futures-core", @@ -2105,9 +2354,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" +checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" dependencies = [ "futures-core", "futures-sink", @@ -2115,9 +2364,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" +checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" [[package]] name = "futures-cpupool" @@ -2125,7 +2374,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "num_cpus", ] @@ -2135,8 +2384,8 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdcef58a173af8148b182684c9f2d5250875adbcaff7b5794073894f9d8634a9" dependencies = [ - "futures 0.1.30", - "futures 0.3.12", + "futures 0.1.31", + "futures 0.3.13", "lazy_static", "log", "parking_lot 0.9.0", @@ -2147,9 +2396,9 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" +checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" dependencies = [ "futures-core", "futures-task", @@ -2159,9 +2408,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" +checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" [[package]] name = "futures-lite" @@ -2174,20 +2423,20 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd" +checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2203,18 +2452,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6" +checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3" [[package]] name = "futures-task" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" -dependencies = [ - "once_cell 1.5.2", -] +checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" [[package]] name = "futures-timer" @@ -2230,11 +2476,11 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" +checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -2242,7 +2488,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2257,18 +2503,18 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] [[package]] name = "generic-array" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd" +checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309" dependencies = [ "typenum", ] @@ -2296,13 +2542,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.1+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -2317,21 +2563,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" dependencies = [ "fallible-iterator", "indexmap", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" - [[package]] name = "glob" version = "0.3.0" @@ -2373,7 +2613,7 @@ dependencies = [ "byteorder", "bytes 0.4.12", "fnv", - "futures 0.1.30", + "futures 0.1.31", "http 0.1.21", "indexmap", "log", @@ -2396,7 +2636,7 @@ dependencies = [ "http 0.2.3", "indexmap", "slab", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -2404,9 +2644,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "3.5.2" +version = "3.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964d0e99a61fe9b1b347389b77ebf8b7e1587b70293676aaca7d27e59b9073b2" +checksum = "cdb0867bbc5a3da37a753e78021d5fcf8a4db00e18dd2dd90fd36e24190e162d" dependencies = [ "log", "pest", @@ -2461,18 +2701,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-literal" @@ -2513,7 +2753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b" dependencies = [ "digest 0.8.1", - "generic-array 0.12.3", + "generic-array 0.12.4", "hmac 0.7.1", ] @@ -2546,7 +2786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "http 0.1.21", "tokio-buf", ] @@ -2563,9 +2803,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.3.4" +version = "1.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" [[package]] name = "httpdate" @@ -2582,14 +2822,20 @@ dependencies = [ "quick-error 1.2.3", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" -version = "0.12.35" +version = "0.12.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" +checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "futures-cpupool", "h2 0.1.26", "http 0.1.21", @@ -2614,9 +2860,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.9" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ "bytes 0.5.6", "futures-channel", @@ -2628,9 +2874,9 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 1.0.4", - "socket2", - "tokio 0.2.24", + "pin-project 1.0.5", + "socket2 0.3.19", + "tokio 0.2.25", "tower-service", "tracing", "want 0.3.0", @@ -2645,11 +2891,11 @@ dependencies = [ "bytes 0.5.6", "ct-logs", "futures-util", - "hyper 0.13.9", + "hyper 0.13.10", "log", "rustls 0.18.1", "rustls-native-certs", - "tokio 0.2.24", + "tokio 0.2.25", "tokio-rustls", "webpki", ] @@ -2667,9 +2913,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" dependencies = [ "matches", "unicode-bidi", @@ -2699,12 +2945,12 @@ dependencies = [ [[package]] name = "if-watch" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d7c5e361e6b05c882b4847dd98992534cebc6fcde7f4bc98225bcf10fd6d0d" +checksum = "97b8538953a3f0d0d3868f0a706eb4273535e10d72acb5c82c1c23ae48835c85" dependencies = [ "async-io", - "futures 0.3.12", + "futures 0.3.13", "futures-lite", "if-addrs", "ipnet", @@ -2746,27 +2992,27 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "impl-trait-for-tuples" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f65a8ecf74feeacdab8d38cb129e550ca871cccaa7d1921d8636ecd75534903" +checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "indexmap" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg 1.0.1", "hashbrown 0.9.1", @@ -2784,9 +3030,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6104619c35f8835695e517cfb80fb7142139ee4b53f4d0fa4c8dca6e98fbc66" +checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" [[package]] name = "integer-sqrt" @@ -2794,7 +3040,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2803,7 +3049,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 2.0.2", ] @@ -2830,18 +3076,18 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" [[package]] name = "itertools" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" dependencies = [ "either", ] @@ -2863,9 +3109,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.46" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" +checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" dependencies = [ "wasm-bindgen", ] @@ -2877,7 +3123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2773fa94a2a1fd51efb89a8f45b8861023dbb415d18d3c9235ae9388d780f9ec" dependencies = [ "failure", - "futures 0.1.30", + "futures 0.1.31", "jsonrpc-core 14.2.0", "jsonrpc-pubsub 14.2.0", "log", @@ -2893,7 +3139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "489b9c612e60c766f751ab40fcb43cbb55a1e10bb44a9b4307ed510ca598cbd7" dependencies = [ "failure", - "futures 0.1.30", + "futures 0.1.31", "jsonrpc-core 15.1.0", "jsonrpc-pubsub 15.1.0", "log", @@ -2908,7 +3154,7 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "log", "serde", "serde_derive", @@ -2921,7 +3167,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "log", "serde", "serde_derive", @@ -2952,10 +3198,10 @@ version = "14.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e77e8812f02155b85a677a96e1d16b60181950c0636199bc4528524fba98dc" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2964,10 +3210,10 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2976,7 +3222,7 @@ version = "15.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb5c4513b7b542f42da107942b7b759f27120b5cc894729f88254b28dff44b7" dependencies = [ - "hyper 0.12.35", + "hyper 0.12.36", "jsonrpc-core 15.1.0", "jsonrpc-server-utils", "log", @@ -3055,6 +3301,68 @@ dependencies = [ "slab", ] +[[package]] +name = "jsonrpsee-http-client" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b15fc3a0ef2e02d770aa1a221d3412443dcaedc43e27d80c957dd5bbd65321b" +dependencies = [ + "async-trait", + "futures 0.3.13", + "hyper 0.13.10", + "hyper-rustls", + "jsonrpsee-types", + "jsonrpsee-utils", + "log", + "serde", + "serde_json", + "thiserror", + "unicase", + "url 2.2.1", +] + +[[package]] +name = "jsonrpsee-proc-macros" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb4afbda476e2ee11cc6245055c498c116fc8002d2d60fe8338b6ee15d84c3a" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42a82588b5f7830e94341bb7e79d15f46070ab6f64dde1e3b3719721b61c5bf" +dependencies = [ + "async-trait", + "futures 0.3.13", + "log", + "serde", + "serde_json", + "smallvec 1.6.1", + "thiserror", +] + +[[package]] +name = "jsonrpsee-utils" +version = "0.2.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e65c77838fce96bc554b4a3a159d0b9a2497319ae9305c66ee853998c7ed2fd3" +dependencies = [ + "futures 0.3.13", + "globset", + "hyper 0.13.10", + "jsonrpsee-types", + "lazy_static", + "log", + "unicase", +] + [[package]] name = "keccak" version = "0.1.0" @@ -3073,14 +3381,15 @@ dependencies = [ [[package]] name = "kusama-runtime" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", + "frame-try-runtime", "log", "pallet-authority-discovery", "pallet-authorship", @@ -3089,6 +3398,7 @@ dependencies = [ "pallet-bounties", "pallet-collective", "pallet-democracy", + "pallet-election-provider-multi-phase", "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", @@ -3135,7 +3445,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-wasm-builder 3.0.0", ] [[package]] @@ -3206,9 +3516,9 @@ checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] name = "libc" -version = "0.2.82" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" [[package]] name = "libloading" @@ -3228,16 +3538,15 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.34.0" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5133112ce42be9482f6a87be92a605dd6bbc9e93c297aee77d172ff06908f3a" +checksum = "adc225a49973cf9ab10d0cdd6a4b8f0cda299df9b760824bbb623f15f8f0c95a" dependencies = [ "atomic", "bytes 1.0.1", - "futures 0.3.12", + "futures 0.3.13", "lazy_static", "libp2p-core", - "libp2p-core-derive", "libp2p-deflate", "libp2p-dns", "libp2p-floodsub", @@ -3252,6 +3561,7 @@ dependencies = [ "libp2p-pnet", "libp2p-request-response", "libp2p-swarm", + "libp2p-swarm-derive", "libp2p-tcp", "libp2p-uds", "libp2p-wasm-ext", @@ -3259,23 +3569,23 @@ dependencies = [ "libp2p-yamux", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.4", + "pin-project 1.0.5", "smallvec 1.6.1", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad04d3cef6c1df366a6ab58c9cf8b06497699e335d83ac2174783946ff847d6" +checksum = "8a2d56aadc2c2bf22cd7797f86e56a65b5b3994a0136b65be3106938acae7a26" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "lazy_static", "libsecp256k1", @@ -3284,30 +3594,20 @@ dependencies = [ "multistream-select", "parity-multiaddr", "parking_lot 0.11.1", - "pin-project 1.0.4", - "prost 0.7.0", + "pin-project 1.0.5", + "prost", "prost-build", "rand 0.7.3", "ring", "rw-stream-sink", - "sha2 0.9.2", + "sha2 0.9.3", "smallvec 1.6.1", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "void", "zeroize", ] -[[package]] -name = "libp2p-core-derive" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4bc40943156e42138d22ed3c57ff0e1a147237742715937622a99b10fbe0156" -dependencies = [ - "quote 1.0.8", - "syn 1.0.60", -] - [[package]] name = "libp2p-deflate" version = "0.27.1" @@ -3315,7 +3615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d42eed63305f0420736fa487f9acef720c4528bd7852a6a760f5ccde4813345" dependencies = [ "flate2", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", ] @@ -3325,7 +3625,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5153b6db68fd4baa3b304e377db744dd8fea8ff4e4504509ee636abcde88d3e3" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "log", ] @@ -3338,11 +3638,11 @@ checksum = "b3c63dfa06581b24b1d12bf9815b43689a784424be217d6545c800c7c75a207f" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", + "prost", "prost-build", "rand 0.7.3", "smallvec 1.6.1", @@ -3350,27 +3650,27 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12451ba9493e87c91baf2a6dffce9ddf1fbc807a0861532d7cf477954f8ebbee" +checksum = "502dc5fcbfec4aa1c63ef3f7307ffe20e90c1a1387bf23ed0bec087f2dde58a1" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", "bytes 1.0.1", "fnv", - "futures 0.3.12", + "futures 0.3.13", "hex_fmt", "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", + "prost", "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.2", + "sha2 0.9.3", "smallvec 1.6.1", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "wasm-timer", ] @@ -3380,11 +3680,11 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b40fb36a059b7a8cce1514bd8b546fa612e006c9937caa7f5950cb20021fe91e" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", + "prost", "prost-build", "smallvec 1.6.1", "wasm-timer", @@ -3392,40 +3692,40 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456f5de8e283d7800ca848b9b9a4e2a578b790bd8ae582b885e831353cf0e5df" +checksum = "cf3da6c9acbcc05f93235d201d7d45ef4e8b88a45d8836f98becd8b4d443f066" dependencies = [ "arrayvec 0.5.2", - "asynchronous-codec", + "asynchronous-codec 0.6.0", "bytes 1.0.1", "either", "fnv", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "libp2p-swarm", "log", - "prost 0.7.0", + "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.2", + "sha2 0.9.3", "smallvec 1.6.1", "uint", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "void", "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b974db63233fc0e199f4ede7794294aae285c96f4b6010f853eac4099ef08590" +checksum = "0e9e6374814d1b118d97ccabdfc975c8910bd16dc38a8bc058eeb08bf2080fe1" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.12", + "futures 0.3.13", "if-watch", "lazy_static", "libp2p-core", @@ -3433,26 +3733,26 @@ dependencies = [ "log", "rand 0.7.3", "smallvec 1.6.1", - "socket2", + "socket2 0.3.19", "void", ] [[package]] name = "libp2p-mplex" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2705dc94b01ab9e3779b42a09bbf3712e637ed213e875c30face247291a85af0" +checksum = "350ce8b3923594aedabd5d6e3f875d058435052a29c3f32df378bc70d10be464" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "log", "nohash-hasher", "parking_lot 0.11.1", "rand 0.7.3", "smallvec 1.6.1", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", ] [[package]] @@ -3463,14 +3763,14 @@ checksum = "4aca322b52a0c5136142a7c3971446fb1e9964923a526c9cc6ef3b7c94e57778" dependencies = [ "bytes 1.0.1", "curve25519-dalek 3.0.2", - "futures 0.3.12", + "futures 0.3.13", "lazy_static", "libp2p-core", "log", - "prost 0.7.0", + "prost", "prost-build", "rand 0.7.3", - "sha2 0.9.2", + "sha2 0.9.3", "snow", "static_assertions", "x25519-dalek", @@ -3483,7 +3783,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f3813276d0708c8db0f500d8beda1bda9ad955723b9cb272c41f4727256f73c" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "libp2p-swarm", "log", @@ -3494,18 +3794,18 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e8c1ec305c9949351925cdc7196b9570f4330477f5e47fbf5bb340b57e26ed" +checksum = "9d58defcadb646ae4b033e130b48d87410bf76394dc3335496cae99dac803e61" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.0", "bytes 1.0.1", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "log", - "prost 0.7.0", + "prost", "prost-build", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "void", ] @@ -3515,9 +3815,9 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce3374f3b28162db9d3442c9347c4f14cb01e8290052615c7d341d40eae0599" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "log", - "pin-project 1.0.4", + "pin-project 1.0.5", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -3525,13 +3825,13 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37637a4b33b5390322ccc068a33897d0aa541daf4fec99f6a7efbf37295346e" +checksum = "10e5552827c33d8326502682da73a0ba4bfa40c1b55b216af3c303f32169dd89" dependencies = [ "async-trait", "bytes 1.0.1", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "libp2p-swarm", "log", @@ -3539,18 +3839,18 @@ dependencies = [ "minicbor", "rand 0.7.3", "smallvec 1.6.1", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", "wasm-timer", ] [[package]] name = "libp2p-swarm" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f89ebb4d8953bda12623e9871959fe728dea3bf6eae0421dc9c42dc821e488" +checksum = "7955b973e1fd2bd61ffd43ce261c1223f61f4aacd5bae362a924993f9a25fd98" dependencies = [ "either", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "log", "rand 0.7.3", @@ -3559,21 +3859,31 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "libp2p-swarm-derive" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c564ebaa36a64839f51eaddb0243aaaa29ce64affb56129193cc3248b72af273" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "libp2p-tcp" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbd3d7076a478ac5a6aca55e74bdc250ac539b95de09b9d09915e0b8d01a6b2" +checksum = "88a5aef80e519a6cb8e2663605142f97baaaea1a252eecbf8756184765f7471b" dependencies = [ "async-io", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "if-watch", "ipnet", "libc", "libp2p-core", "log", - "socket2", + "socket2 0.3.19", ] [[package]] @@ -3583,7 +3893,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80ac51ce419f60be966e02103c17f67ff5dc4422ba83ba54d251d6c62a4ed487" dependencies = [ "async-std", - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "log", ] @@ -3594,7 +3904,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6149c46cb76935c80bc8be6ec6e3ebd5f5e1679765a255fb34331d54610f15dd" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -3609,24 +3919,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3b1c6a3431045da8b925ed83384e4c5163e14b990572307fca9c507435d4d22" dependencies = [ "either", - "futures 0.3.12", + "futures 0.3.13", "futures-rustls", "libp2p-core", "log", "quicksink", "rw-stream-sink", "soketto", - "url 2.2.0", + "url 2.2.1", "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490b8b27fc40fe35212df1b6a3d14bffaa4117cbff956fdc2892168a371102ad" +checksum = "4819358c542a86ff95f6ae691efb4b94ddaf477079b01a686f5705b79bfc232a" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "libp2p-core", "parking_lot 0.11.1", "thiserror", @@ -3727,18 +4037,19 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "value-bag", ] [[package]] name = "lru" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aae342b73d57ad0b8b364bd12584819f2c1fe9114285dfcf8b0722607671635" +checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba" dependencies = [ "hashbrown 0.9.1", ] @@ -3795,13 +4106,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] -name = "memmap" -version = "0.7.0" +name = "memmap2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6" dependencies = [ "libc", - "winapi 0.3.9", ] [[package]] @@ -3848,15 +4158,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" -[[package]] -name = "memrange" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc29ba65898edc4fdc252cb31cd3925f37c1a8ba25bb46eec883569984976530" -dependencies = [ - "rustc-serialize", -] - [[package]] name = "memzero" version = "0.1.0" @@ -3878,9 +4179,9 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", ] @@ -3890,36 +4191,36 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c023c3f16109e7f33aa451f773fd61070e265b4977d0b6e344a51049296dd7df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "rand 0.7.3", "thrift", ] [[package]] name = "minicbor" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0164190d1771b1458c3742075b057ed55d25cd9dfb930aade99315a1eb1fe12d" +checksum = "1c2b2c73f9640fccab53947e2b3474d5071fcbc8f82cac51ddf6c8041a30a9ea" dependencies = [ "minicbor-derive", ] [[package]] name = "minicbor-derive" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e071b3159835ee91df62dbdbfdd7ec366b7ea77c838f43aff4acda6b61bcfb9" +checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg 1.0.1", @@ -3964,7 +4265,7 @@ checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", "mio", - "miow 0.3.6", + "miow 0.3.7", "winapi 0.3.9", ] @@ -3993,36 +4294,39 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi 0.3.9", ] [[package]] name = "moonbeam" -version = "0.6.1" +version = "0.7.0" dependencies = [ "ansi_term 0.12.1", "assert_cmd", "async-io", "author-inherent", - "cumulus-collator", - "cumulus-consensus", - "cumulus-network", - "cumulus-primitives", - "cumulus-service", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-network", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", "cumulus-test-relay-sproof-builder", - "derive_more 0.15.0", + "derive_more", "exit-future 0.1.4", "fc-consensus", + "fc-db", + "fc-mapping-sync", "fc-rpc", "fc-rpc-core", "fp-consensus", "fp-rpc", - "futures 0.3.12", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-pubsub 15.1.0", "log", @@ -4083,7 +4387,7 @@ dependencies = [ "substrate-test-runtime-client", "tiny-bip39 0.6.2", "tiny-hderive", - "tokio 0.2.24", + "tokio 0.2.25", "trie-root 0.15.2", ] @@ -4138,9 +4442,8 @@ version = "0.6.0" dependencies = [ "account", "author-inherent", - "cumulus-parachain-system", - "cumulus-primitives", - "cumulus-runtime", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", "fp-rpc", "frame-executive", "frame-support", @@ -4178,7 +4481,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder 3.0.0 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder 4.0.0", ] [[package]] @@ -4187,16 +4490,31 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238" +[[package]] +name = "multibase" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +dependencies = [ + "base-x", + "data-encoding", + "data-encoding-macro", +] + [[package]] name = "multihash" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", "digest 0.9.0", "generic-array 0.14.4", "multihash-derive", - "sha2 0.9.2", + "sha2 0.9.3", + "sha3 0.9.1", "unsigned-varint 0.5.1", ] @@ -4206,32 +4524,32 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "synstructure", ] [[package]] name = "multimap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1255076139a83bb467426e7f8d0134968a8118844faa755985e077cf31850333" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ddc0eb0117736f19d556355464fc87efc8ad98b29e3fd84f02531eb6e90840" +checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" dependencies = [ "bytes 1.0.1", - "futures 0.3.12", + "futures 0.3.13", "log", - "pin-project 1.0.4", + "pin-project 1.0.5", "smallvec 1.6.1", - "unsigned-varint 0.6.0", + "unsigned-varint 0.7.0", ] [[package]] @@ -4241,11 +4559,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b6147c3d50b4f3cdabfe2ecc94a0191fd3d6ad58aefd9664cf396285883486" dependencies = [ "approx", - "generic-array 0.13.2", + "generic-array 0.13.3", "matrixmultiply", "num-complex 0.2.4", "num-rational 0.2.4", - "num-traits 0.2.14", + "num-traits", "rand 0.7.3", "rand_distr", "simba", @@ -4263,12 +4581,12 @@ dependencies = [ [[package]] name = "nb-connect" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998" +checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d" dependencies = [ "libc", - "winapi 0.3.9", + "socket2 0.4.0", ] [[package]] @@ -4284,29 +4602,27 @@ dependencies = [ [[package]] name = "nix" -version = "0.10.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7fd5681d13fda646462cfbd4e5f2051279a89a544d50eb98c365b507246839f" +checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" dependencies = [ "bitflags", - "bytes 0.4.12", + "cc", "cfg-if 0.1.10", - "gcc", "libc", "void", ] [[package]] name = "nix" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ "bitflags", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "void", ] [[package]] @@ -4337,12 +4653,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" dependencies = [ - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-complex 0.3.1", "num-integer", "num-iter", "num-rational 0.3.2", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4353,18 +4669,18 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.1", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] name = "num-bigint" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" dependencies = [ "autocfg 1.0.1", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4374,7 +4690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4383,7 +4699,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4393,7 +4709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg 1.0.1", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4404,7 +4720,7 @@ checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ "autocfg 1.0.1", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4416,7 +4732,7 @@ dependencies = [ "autocfg 1.0.1", "num-bigint 0.2.6", "num-integer", - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4426,18 +4742,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.0.1", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4462,26 +4769,19 @@ dependencies = [ [[package]] name = "object" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2" - -[[package]] -name = "object" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" +checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" dependencies = [ "crc32fast", "indexmap", - "wasmparser 0.57.0", ] [[package]] name = "object" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" @@ -4494,9 +4794,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.5.2" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" dependencies = [ "parking_lot 0.11.1", ] @@ -4531,7 +4831,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -4548,7 +4848,7 @@ name = "pallet-author-filter" version = "0.6.0" dependencies = [ "author-inherent", - "cumulus-parachain-system", + "cumulus-pallet-parachain-system", "frame-support", "frame-system", "parachain-staking", @@ -4559,8 +4859,8 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4575,12 +4875,12 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "sp-authorship", "sp-inherents", @@ -4590,12 +4890,13 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "pallet-timestamp", @@ -4604,23 +4905,22 @@ dependencies = [ "sp-application-crypto", "sp-consensus-babe", "sp-consensus-vrf", - "sp-inherents", "sp-io", "sp-runtime", "sp-session", "sp-staking", "sp-std", - "sp-timestamp", ] [[package]] name = "pallet-balances" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-runtime", @@ -4629,8 +4929,8 @@ dependencies = [ [[package]] name = "pallet-bounties" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4643,11 +4943,12 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-core", @@ -4658,8 +4959,8 @@ dependencies = [ [[package]] name = "pallet-democracy" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", @@ -4671,13 +4972,33 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-election-provider-multi-phase" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "serde", + "sp-arithmetic", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-std", + "static_assertions", +] + [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-npos-elections", @@ -4688,7 +5009,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "0.1.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "ethereum", "ethereum-types", @@ -4696,6 +5017,7 @@ dependencies = [ "fp-consensus", "fp-evm", "fp-rpc", + "fp-storage", "frame-support", "frame-system", "libsecp256k1", @@ -4724,8 +5046,8 @@ dependencies = [ [[package]] name = "pallet-evm" -version = "2.0.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +version = "3.0.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "evm", "evm-gasometer", @@ -4748,8 +5070,8 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" -version = "2.0.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +version = "3.0.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "evm", "fp-evm", @@ -4762,8 +5084,8 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" -version = "2.0.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +version = "3.0.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "evm", "fp-evm", @@ -4774,8 +5096,8 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" -version = "2.0.0" -source = "git+https://github.com/purestake/frontier?branch=v0.6-moonbeam#677548ce782afd28174548dc4badbedf064e8bae" +version = "3.0.0" +source = "git+https://github.com/purestake/frontier?branch=notlesh-moonbeam-v0.7#c6d3c7acc7aa33d69f3adba0752104cfbbc04482" dependencies = [ "evm", "fp-evm", @@ -4786,12 +5108,13 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -4807,8 +5130,8 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4823,13 +5146,13 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", + "log", "pallet-authorship", - "pallet-session", "parity-scale-codec", "serde", "sp-application-crypto", @@ -4842,8 +5165,8 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4858,8 +5181,8 @@ dependencies = [ [[package]] name = "pallet-membership" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4872,8 +5195,8 @@ dependencies = [ [[package]] name = "pallet-multisig" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4887,8 +5210,8 @@ dependencies = [ [[package]] name = "pallet-nicks" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4901,11 +5224,12 @@ dependencies = [ [[package]] name = "pallet-offences" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", + "log", "pallet-balances", "parity-scale-codec", "serde", @@ -4916,8 +5240,8 @@ dependencies = [ [[package]] name = "pallet-proxy" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4931,8 +5255,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -4944,8 +5268,8 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "enumflags2", "frame-support", @@ -4959,12 +5283,13 @@ dependencies = [ [[package]] name = "pallet-scheduler" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-io", @@ -4974,12 +5299,12 @@ dependencies = [ [[package]] name = "pallet-session" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", - "impl-trait-for-tuples 0.1.3", + "impl-trait-for-tuples 0.2.1", "pallet-timestamp", "parity-scale-codec", "serde", @@ -4994,8 +5319,8 @@ dependencies = [ [[package]] name = "pallet-society" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -5008,14 +5333,17 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ + "frame-election-provider-support", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", + "paste 1.0.5", "serde", "sp-application-crypto", "sp-io", @@ -5028,19 +5356,19 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "pallet-sudo" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -5053,13 +5381,14 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", + "log", "parity-scale-codec", "serde", "sp-inherents", @@ -5070,8 +5399,8 @@ dependencies = [ [[package]] name = "pallet-tips" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -5084,8 +5413,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -5100,8 +5429,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", @@ -5117,8 +5446,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5128,12 +5457,12 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "pallet-balances", "parity-scale-codec", "serde", @@ -5143,8 +5472,8 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-support", "frame-system", @@ -5158,8 +5487,8 @@ dependencies = [ [[package]] name = "pallet-vesting" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "enumflags2", "frame-support", @@ -5174,7 +5503,7 @@ dependencies = [ name = "parachain-info" version = "0.6.0" dependencies = [ - "cumulus-primitives", + "cumulus-primitives-core", "frame-support", "frame-system", "parity-scale-codec", @@ -5199,23 +5528,26 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.1.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d595e372d119261593297debbe4193811a4dc811d2a1ccbb8caaa6666ad7ab" +checksum = "495197c078e54b8735181aa35c00a327f7f3a3cc00a1ee8c95926dd010f0ec6b" dependencies = [ "blake2-rfc", "crc32fast", + "fs2", + "hex", "libc", "log", - "memmap", - "parking_lot 0.10.2", + "memmap2", + "parking_lot 0.11.1", + "rand 0.8.3", ] [[package]] name = "parity-multiaddr" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bfda2e46fc5e14122649e2645645a81ee5844e0fb2e727ef560cc71a8b2d801" +checksum = "58341485071825827b7f03cf7efd1cb21e6a709bea778fb50227fd45d2f361b4" dependencies = [ "arrayref", "bs58", @@ -5225,15 +5557,15 @@ dependencies = [ "percent-encoding 2.1.0", "serde", "static_assertions", - "unsigned-varint 0.6.0", - "url 2.2.0", + "unsigned-varint 0.7.0", + "url 2.2.1", ] [[package]] name = "parity-scale-codec" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c823fdae1bb5ff5708ee61a62697e6296175dc671710876871c853f48592b3" +checksum = "0cd3dab59b5cf4bc81069ade0fc470341a1ef3ad5fa73e5a8943bed2ec12b2e8" dependencies = [ "arrayvec 0.5.2", "bitvec", @@ -5244,14 +5576,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214" +checksum = "fa04976a81fde04924b40cc4036c4d12841e8bb04325a5cf2ada75731a150a7d" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 0.1.5", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -5267,11 +5599,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e57fea504fea33f9fbb5f49f378359030e7e026a6ab849bb9e8f0787376f1bf" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "libc", "log", "mio-named-pipes", - "miow 0.3.6", + "miow 0.3.7", "rand 0.7.3", "tokio 0.1.22", "tokio-named-pipes", @@ -5288,7 +5620,7 @@ dependencies = [ "cfg-if 1.0.0", "ethereum-types", "hashbrown 0.9.1", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "lru", "parity-util-mem-derive", "parking_lot 0.11.1", @@ -5303,8 +5635,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2 1.0.24", - "syn 1.0.60", + "proc-macro2", + "syn", "synstructure", ] @@ -5338,7 +5670,7 @@ dependencies = [ "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.2.0", + "url 2.2.1", ] [[package]] @@ -5386,7 +5718,7 @@ checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", "lock_api 0.4.2", - "parking_lot_core 0.8.2", + "parking_lot_core 0.8.3", ] [[package]] @@ -5433,14 +5765,14 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.1.57", + "redox_syscall 0.2.5", "smallvec 1.6.1", "winapi 0.3.9", ] @@ -5455,6 +5787,12 @@ dependencies = [ "proc-macro-hack", ] +[[package]] +name = "paste" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" + [[package]] name = "paste-impl" version = "0.1.18" @@ -5534,9 +5872,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -5571,11 +5909,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b70b68509f17aa2857863b6fa00bf21fc93674c7a8893de2f469f6aa7ca2f2" +checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63" dependencies = [ - "pin-project-internal 1.0.4", + "pin-project-internal 1.0.5", ] [[package]] @@ -5584,33 +5922,33 @@ version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "pin-project-internal" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa25a6393f22ce819b0f50e0be89287292fda8d425be38ee0ca14c4931d9e71" +checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -5626,65 +5964,66 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "platforms" -version = "0.2.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb3b2b1033b8a60b4da6ee470325f887758c95d5320f52f9ce0df055a55940e" +checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", + "lru", "parity-scale-codec", "polkadot-erasure-coding", + "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", + "rand 0.8.3", + "sp-application-crypto", "sp-core", "sp-keystore", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-availability-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "lru", "polkadot-erasure-coding", @@ -5696,16 +6035,15 @@ dependencies = [ "streamunordered", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-cli" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-benchmarking-cli", - "futures 0.3.12", + "futures 0.3.13", "log", "polkadot-parachain", "polkadot-service", @@ -5716,28 +6054,30 @@ dependencies = [ "structopt", "substrate-build-script-utils", "thiserror", - "tracing-futures", + "try-runtime-cli", ] [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "always-assert", + "futures 0.3.13", + "futures-timer 3.0.2", "polkadot-node-network-protocol", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-core-primitives" version = "0.7.30" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -5748,40 +6088,54 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "parity-scale-codec", "polkadot-primitives", - "reed-solomon-erasure", + "reed-solomon-novelpoly", "sp-core", "sp-trie", "thiserror", ] +[[package]] +name = "polkadot-gossip-support" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" +dependencies = [ + "futures 0.3.13", + "polkadot-node-network-protocol", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "rand 0.8.3", + "tracing", +] + [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "async-trait", - "futures 0.3.12", + "futures 0.3.13", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-primitives", "sc-authority-discovery", "sc-network", + "strum", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -5790,16 +6144,44 @@ dependencies = [ "sp-core", "thiserror", "tracing", - "tracing-futures", +] + +[[package]] +name = "polkadot-node-core-approval-voting" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" +dependencies = [ + "bitvec", + "derive_more", + "futures 0.3.13", + "futures-timer 3.0.2", + "kvdb", + "kvdb-rocksdb", + "merlin", + "parity-scale-codec", + "polkadot-node-jaeger", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sc-client-api", + "sc-keystore", + "schnorrkel", + "sp-application-crypto", + "sp-blockchain", + "sp-consensus-slots", + "sp-runtime", + "tracing", ] [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "kvdb", "kvdb-rocksdb", @@ -5812,16 +6194,15 @@ dependencies = [ "sc-service", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", - "futures 0.3.12", + "futures 0.3.13", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -5831,46 +6212,44 @@ dependencies = [ "sp-keystore", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", "thiserror", "tracing", - "tracing-futures", "wasm-timer", ] [[package]] name = "polkadot-node-core-candidate-selection" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", + "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-keystore", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -5879,29 +6258,27 @@ dependencies = [ "polkadot-primitives", "sp-core", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-blockchain", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-proposer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "polkadot-node-subsystem", "polkadot-overseer", @@ -5909,6 +6286,7 @@ dependencies = [ "sc-basic-authorship", "sc-block-builder", "sc-client-api", + "sc-telemetry", "sp-api", "sp-blockchain", "sp-consensus", @@ -5923,45 +6301,45 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "sp-api", + "sp-consensus-babe", "sp-core", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-jaeger" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "async-std", "lazy_static", "log", "mick-jaeger", + "parity-scale-codec", "parking_lot 0.11.1", "polkadot-primitives", "sc-network", @@ -5972,53 +6350,56 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ + "futures 0.3.13", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", "sc-network", - "strum 0.20.0", - "thiserror", - "zstd", + "strum", ] [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "parity-scale-codec", "polkadot-primitives", "polkadot-statement-table", - "sp-consensus-slots", + "schnorrkel", + "sp-application-crypto", + "sp-consensus-babe", "sp-consensus-vrf", "sp-core", "sp-runtime", + "thiserror", ] [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "async-std", "async-trait", - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "futures-timer 3.0.2", "lazy_static", "log", "mick-jaeger", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 1.0.4", + "pin-project 1.0.5", "polkadot-node-jaeger", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-primitives", + "polkadot-procmacro-subsystem-dispatch-gen", "polkadot-statement-table", "sc-network", "smallvec 1.6.1", @@ -6026,21 +6407,21 @@ dependencies = [ "substrate-prometheus-endpoint", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "async-trait", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "metered-channel", "parity-scale-codec", - "pin-project 1.0.4", + "pin-project 1.0.5", "polkadot-node-jaeger", + "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-primitives", @@ -6052,16 +6433,15 @@ dependencies = [ "substrate-prometheus-endpoint", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "async-trait", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "oorandom", "polkadot-node-primitives", @@ -6070,21 +6450,22 @@ dependencies = [ "polkadot-primitives", "sc-client-api", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-parachain" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", + "libc", "log", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", "polkadot-core-primitives", + "raw_sync", "sc-executor", "serde", "shared_memory", @@ -6094,28 +6475,28 @@ dependencies = [ "sp-runtime", "sp-std", "sp-wasm-interface", + "static_assertions", "thiserror", ] [[package]] name = "polkadot-pov-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", "thiserror", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-primitives" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", "frame-system", @@ -6138,12 +6519,25 @@ dependencies = [ "sp-std", "sp-trie", "sp-version", + "thiserror", + "zstd", +] + +[[package]] +name = "polkadot-procmacro-subsystem-dispatch-gen" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" +dependencies = [ + "assert_matches", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "polkadot-rpc" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "jsonrpc-core 15.1.0", "pallet-transaction-payment-rpc", @@ -6172,14 +6566,15 @@ dependencies = [ [[package]] name = "polkadot-runtime" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", + "frame-try-runtime", "log", "pallet-authority-discovery", "pallet-authorship", @@ -6188,6 +6583,7 @@ dependencies = [ "pallet-bounties", "pallet-collective", "pallet-democracy", + "pallet-election-provider-multi-phase", "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", @@ -6232,17 +6628,18 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-wasm-builder 3.0.0", ] [[package]] name = "polkadot-runtime-common" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", "frame-support", "frame-system", + "impl-trait-for-tuples 0.2.1", "log", "pallet-authorship", "pallet-balances", @@ -6274,10 +6671,10 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.8.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", - "derive_more 0.99.11", + "derive_more", "frame-support", "frame-system", "log", @@ -6311,11 +6708,11 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.8.3" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-benchmarking", "frame-system-rpc-runtime-api", - "futures 0.3.12", + "futures 0.3.13", "hex-literal", "kusama-runtime", "pallet-babe", @@ -6327,8 +6724,10 @@ dependencies = [ "polkadot-availability-distribution", "polkadot-availability-recovery", "polkadot-collator-protocol", + "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", + "polkadot-node-core-approval-voting", "polkadot-node-core-av-store", "polkadot-node-core-backing", "polkadot-node-core-bitfield-signing", @@ -6360,6 +6759,7 @@ dependencies = [ "sc-executor", "sc-finality-grandpa", "sc-finality-grandpa-warp-sync", + "sc-keystore", "sc-network", "sc-service", "sc-telemetry", @@ -6386,17 +6786,16 @@ dependencies = [ "substrate-prometheus-endpoint", "thiserror", "tracing", - "tracing-futures", "westend-runtime", ] [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "arrayvec 0.5.2", - "futures 0.3.12", + "futures 0.3.13", "indexmap", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -6405,13 +6804,12 @@ dependencies = [ "polkadot-primitives", "sp-staking", "tracing", - "tracing-futures", ] [[package]] name = "polkadot-statement-table" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -6420,10 +6818,11 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", + "frame-election-provider-support", "frame-executive", "frame-support", "frame-system", @@ -6469,18 +6868,18 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-wasm-builder 3.0.0", ] [[package]] name = "polkadot-test-service" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-benchmarking", "frame-system", - "futures 0.1.30", - "futures 0.3.12", + "futures 0.1.31", + "futures 0.3.13", "hex", "pallet-balances", "pallet-staking", @@ -6522,16 +6921,15 @@ dependencies = [ "substrate-test-client", "tempfile", "tracing", - "tracing-futures", ] [[package]] name = "polling" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" +checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "log", "wepoll-sys", @@ -6581,9 +6979,9 @@ dependencies = [ [[package]] name = "predicates" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73dd9b7b200044694dfede9edf907c1ca19630908443e9447e624993700c6932" +checksum = "eeb433456c1a57cc93554dea3ce40b4c19c4057e41c55d4a0f3d84ea71c325aa" dependencies = [ "difference", "predicates-core", @@ -6591,15 +6989,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3dbeaaf793584e29c58c7e3a82bbb3c7c06b63cea68d13b0e3cddc124104dc" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" dependencies = [ "predicates-core", "treeline", @@ -6627,6 +7025,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -6634,9 +7042,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "version_check", ] @@ -6646,8 +7054,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", + "proc-macro2", + "quote", "version_check", ] @@ -6663,31 +7071,22 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ - "unicode-xid 0.2.1", + "unicode-xid", ] [[package]] name = "prometheus" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d70cf4412832bcac9cffe27906f4a66e450d323525e977168c70d1b36120ae" +checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "fnv", "lazy_static", "parking_lot 0.11.1", @@ -6695,16 +7094,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212" -dependencies = [ - "bytes 0.5.6", - "prost-derive 0.6.1", -] - [[package]] name = "prost" version = "0.7.0" @@ -6712,7 +7101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" dependencies = [ "bytes 1.0.1", - "prost-derive 0.7.0", + "prost-derive", ] [[package]] @@ -6727,25 +7116,12 @@ dependencies = [ "log", "multimap", "petgraph", - "prost 0.7.0", + "prost", "prost-types", "tempfile", "which 4.0.2", ] -[[package]] -name = "prost-derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72" -dependencies = [ - "anyhow", - "itertools 0.8.2", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", -] - [[package]] name = "prost-derive" version = "0.7.0" @@ -6754,9 +7130,9 @@ checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", "itertools 0.9.0", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -6766,7 +7142,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb" dependencies = [ "bytes 1.0.1", - "prost 0.7.0", + "prost", +] + +[[package]] +name = "psm" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3abf49e5417290756acfd26501536358560c4a5cc4a0934d390939acb3e7083a" +dependencies = [ + "cc", ] [[package]] @@ -6800,25 +7185,16 @@ checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" dependencies = [ "futures-core", "futures-sink", - "pin-project-lite 0.1.11", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", + "pin-project-lite 0.1.12", ] [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 1.0.24", + "proc-macro2", ] [[package]] @@ -6891,7 +7267,7 @@ checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" dependencies = [ "libc", "rand_chacha 0.3.0", - "rand_core 0.6.1", + "rand_core 0.6.2", "rand_hc 0.3.0", ] @@ -6922,7 +7298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" dependencies = [ "ppv-lite86", - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -6951,11 +7327,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" dependencies = [ - "getrandom 0.2.1", + "getrandom 0.2.2", ] [[package]] @@ -6991,7 +7367,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" dependencies = [ - "rand_core 0.6.1", + "rand_core 0.6.2", ] [[package]] @@ -7058,15 +7434,28 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "7.0.4" +version = "8.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb71f708fe39b2c5e98076204c3cc094ee5a4c12c4cdb119a2b72dc34164f41" +checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73" dependencies = [ "bitflags", "cc", "rustc_version", ] +[[package]] +name = "raw_sync" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a34bde3561f980a51c70495164200569a11662644fe5af017f0b5d7015688cc" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "nix 0.20.0", + "rand 0.8.3", + "winapi 0.3.9", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -7093,7 +7482,7 @@ checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ "crossbeam-channel", "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", "lazy_static", "num_cpus", ] @@ -7115,9 +7504,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" dependencies = [ "bitflags", ] @@ -7134,12 +7523,26 @@ dependencies = [ ] [[package]] -name = "reed-solomon-erasure" -version = "4.0.2" +name = "redox_users" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a415a013dd7c5d4221382329a5a3482566da675737494935cbbbcdec04662f9d" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "smallvec 1.6.1", + "getrandom 0.2.2", + "redox_syscall 0.2.5", +] + +[[package]] +name = "reed-solomon-novelpoly" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11e01a8ef53ec033daf53a9385a1d0bb266155797919096e4134118f45efe82" +dependencies = [ + "derive_more", + "fs-err", + "itertools 0.10.0", + "static_init", + "thiserror", ] [[package]] @@ -7157,16 +7560,16 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "regalloc" -version = "0.0.27" +version = "0.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ba8aaf5fe7cf307c6dbdaeed85478961d29e25e3bee5169e11b92fa9f027a8" +checksum = "571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5" dependencies = [ "log", "rustc-hash", @@ -7175,14 +7578,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.3" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] @@ -7197,9 +7599,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "region" @@ -7213,6 +7615,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "remote-externalities" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" +dependencies = [ + "env_logger 0.8.3", + "hex-literal", + "jsonrpsee-http-client", + "jsonrpsee-proc-macros", + "jsonrpsee-types", + "log", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-runtime", +] + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -7230,13 +7649,13 @@ checksum = "53552c6c49e1e13f1a203ef0080ab3bbef0beb570a528993e83df057a9d9bba1" [[package]] name = "ring" -version = "0.16.19" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", - "once_cell 1.5.2", + "once_cell 1.7.2", "spin", "untrusted", "web-sys", @@ -7270,9 +7689,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -7287,14 +7706,15 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", "hex-literal", + "log", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -7332,7 +7752,7 @@ dependencies = [ "sp-std", "sp-transaction-pool", "sp-version", - "substrate-wasm-builder 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-wasm-builder 3.0.0", "xcm", "xcm-builder", "xcm-executor", @@ -7340,9 +7760,9 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", "winapi 0.3.9", @@ -7357,7 +7777,7 @@ dependencies = [ "base64 0.13.0", "blake2b_simd", "constant_time_eq", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.3", ] [[package]] @@ -7378,12 +7798,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - [[package]] name = "rustc_version" version = "0.2.3" @@ -7437,7 +7851,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "pin-project 0.4.27", "static_assertions", ] @@ -7477,18 +7891,18 @@ dependencies = [ [[package]] name = "sc-authority-discovery" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "async-trait", - "derive_more 0.99.11", + "derive_more", "either", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "libp2p", "log", "parity-scale-codec", - "prost 0.7.0", + "prost", "prost-build", "rand 0.7.3", "sc-client-api", @@ -7505,10 +7919,10 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -7528,15 +7942,14 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-consensus", "sp-core", "sp-inherents", "sp-runtime", @@ -7545,10 +7958,10 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "sc-chain-spec-derive", "sc-consensus-babe", @@ -7566,23 +7979,23 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sc-cli" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "chrono", "fdlimit", - "futures 0.3.12", + "futures 0.3.13", "hex", "libp2p", "log", @@ -7610,17 +8023,17 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39 0.8.0", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] name = "sc-client-api" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", "fnv", - "futures 0.3.12", + "futures 0.3.13", "hash-db", "kvdb", "lazy_static", @@ -7649,8 +8062,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "blake2-rfc", "hash-db", @@ -7679,8 +8092,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7690,18 +8103,18 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", "fork-tree", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "log", "merlin", "num-bigint 0.2.6", "num-rational 0.2.4", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "parking_lot 0.11.1", "pdqselect", @@ -7736,11 +8149,11 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", @@ -7760,8 +8173,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7773,12 +8186,12 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "assert_matches", - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", @@ -7807,10 +8220,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "log", "parity-scale-codec", @@ -7827,14 +8240,15 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-timestamp", "sp-trie", "thiserror", ] [[package]] name = "sc-consensus-uncles" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "sc-client-api", @@ -7847,10 +8261,10 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", "lazy_static", "libsecp256k1", "log", @@ -7876,10 +8290,10 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", "parity-scale-codec", "parity-wasm 0.41.0", "sp-allocator", @@ -7892,8 +8306,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "parity-scale-codec", @@ -7907,8 +8321,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "parity-scale-codec", @@ -7925,19 +8339,20 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", + "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 0.4.27", + "pin-project 1.0.5", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -7963,12 +8378,12 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", + "derive_more", "finality-grandpa", - "futures 0.3.12", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", @@ -7987,31 +8402,32 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" -version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "log", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "parking_lot 0.11.1", - "prost 0.6.1", + "prost", "sc-client-api", "sc-finality-grandpa", "sc-network", "sc-service", "sp-blockchain", + "sp-finality-grandpa", "sp-runtime", ] [[package]] name = "sc-informant" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "ansi_term 0.12.1", - "futures 0.3.12", + "futures 0.3.13", "log", "parity-util-mem", "sc-client-api", @@ -8025,12 +8441,12 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "async-trait", - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "futures-util", "hex", "merlin", @@ -8045,8 +8461,8 @@ dependencies = [ [[package]] name = "sc-light" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "hash-db", "lazy_static", @@ -8064,21 +8480,22 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "async-std", "async-trait", - "asynchronous-codec", + "asynchronous-codec 0.5.0", "bitflags", "bs58", "bytes 1.0.1", - "derive_more 0.99.11", + "cid", + "derive_more", "either", "erased-serde", "fnv", "fork-tree", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "hex", "ip_network", @@ -8090,8 +8507,8 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.11.1", - "pin-project 0.4.27", - "prost 0.7.0", + "pin-project 1.0.5", + "prost", "prost-build", "rand 0.7.3", "sc-block-builder", @@ -8116,10 +8533,10 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "libp2p", "log", @@ -8127,19 +8544,21 @@ dependencies = [ "sc-network", "sp-runtime", "substrate-prometheus-endpoint", + "tracing", "wasm-timer", ] [[package]] name = "sc-offchain" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "bytes 0.5.6", "fnv", - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", - "hyper 0.13.9", + "hex", + "hyper 0.13.10", "hyper-rustls", "log", "num_cpus", @@ -8159,10 +8578,10 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "libp2p", "log", "serde_json", @@ -8172,8 +8591,8 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8181,10 +8600,10 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "hash-db", "jsonrpc-core 15.1.0", "jsonrpc-pubsub 15.1.0", @@ -8215,11 +8634,11 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", @@ -8239,10 +8658,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "jsonrpc-core 15.1.0", "jsonrpc-http-server", "jsonrpc-ipc-server", @@ -8257,13 +8676,13 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "directories 3.0.1", + "directories", "exit-future 0.2.0", - "futures 0.1.30", - "futures 0.3.12", + "futures 0.1.31", + "futures 0.3.13", "futures-timer 3.0.2", "hash-db", "jsonrpc-core 15.1.0", @@ -8273,7 +8692,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", - "pin-project 0.4.27", + "pin-project 1.0.5", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -8320,8 +8739,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "parity-scale-codec", @@ -8335,8 +8754,8 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", @@ -8355,41 +8774,38 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "chrono", - "futures 0.3.12", + "futures 0.3.13", "libp2p", "log", "parking_lot 0.11.1", - "pin-project 0.4.27", + "pin-project 1.0.5", "rand 0.7.3", "serde", "serde_json", - "sp-utils", "take_mut", - "tracing", - "tracing-subscriber", + "thiserror", "void", "wasm-timer", ] [[package]] name = "sc-tracing" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "ansi_term 0.12.1", "atty", "erased-serde", "lazy_static", "log", - "once_cell 1.5.2", + "once_cell 1.7.2", "parking_lot 0.11.1", "regex", "rustc-hash", - "sc-telemetry", "sc-tracing-proc-macro", "serde", "serde_json", @@ -8405,22 +8821,22 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sc-transaction-graph" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "linked-hash-map", "log", "parity-util-mem", @@ -8438,10 +8854,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-diagnose", "intervalier", "log", @@ -8520,13 +8936,13 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12bd20b94c7cdfda8c7ba9b92ad0d9a56e3fa018c25fca83b51aa664c9b4c0d" +checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -8616,29 +9032,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" +checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.123" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" +checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -8659,9 +9075,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" +checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -8684,9 +9100,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" +checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -8731,34 +9147,18 @@ dependencies = [ [[package]] name = "shared_memory" -version = "0.10.0" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3ab0cdff84d6c66fc9e268010ea6508e58ee942575afb66f2cf194bb218bb4" +checksum = "b854a362375dfe8ab12ea8a98228040d37293c988f85fbac9fa0f83336387966" dependencies = [ "cfg-if 0.1.10", - "enum_primitive", "libc", - "log", - "memrange", - "nix 0.10.0", - "quick-error 1.2.3", - "rand 0.4.6", - "shared_memory_derive", - "theban_interval_tree", + "nix 0.20.0", + "quick-error 2.0.0", + "rand 0.8.3", "winapi 0.3.9", ] -[[package]] -name = "shared_memory_derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767a14f1304be2f0b04e69860252f8ae9cfae0afaa9cc07b675147c43425dd3a" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", -] - [[package]] name = "shlex" version = "0.1.1" @@ -8767,9 +9167,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "signal-hook" -version = "0.1.17" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" +checksum = "6aa894ef3fade0ee7243422f4fbbd6c2b48e6de767e621d37ef65f2310f53cea" dependencies = [ "libc", "signal-hook-registry", @@ -8798,8 +9198,8 @@ checksum = "fb931b1367faadea6b1ab1c306a860ec17aaa5fa39f367d0c744e69d971a1fb2" dependencies = [ "approx", "num-complex 0.2.4", - "num-traits 0.2.14", - "paste", + "num-traits", + "paste 0.1.18", ] [[package]] @@ -8836,7 +9236,7 @@ dependencies = [ "rand_core 0.5.1", "ring", "rustc_version", - "sha2 0.9.2", + "sha2 0.9.3", "subtle 2.4.0", "x25519-dalek", ] @@ -8852,6 +9252,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "soketto" version = "0.4.2" @@ -8861,17 +9271,17 @@ dependencies = [ "base64 0.12.3", "bytes 0.5.6", "flate2", - "futures 0.3.12", + "futures 0.3.13", "httparse", "log", "rand 0.7.3", - "sha-1 0.9.2", + "sha-1 0.9.4", ] [[package]] name = "sp-allocator" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "sp-core", @@ -8882,10 +9292,11 @@ dependencies = [ [[package]] name = "sp-api" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "hash-db", + "log", "parity-scale-codec", "sp-api-proc-macro", "sp-core", @@ -8898,20 +9309,20 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "blake2-rfc", - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-application-crypto" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "serde", @@ -8922,11 +9333,11 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "integer-sqrt", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "serde", "sp-debug-derive", @@ -8935,8 +9346,8 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-api", @@ -8947,8 +9358,8 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8958,8 +9369,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-api", @@ -8970,10 +9381,10 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "log", "lru", "parity-scale-codec", @@ -8988,8 +9399,8 @@ dependencies = [ [[package]] name = "sp-chain-spec" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "serde", "serde_json", @@ -8997,10 +9408,10 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-timer 3.0.2", "libp2p", "log", @@ -9023,12 +9434,13 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-api", "sp-application-crypto", + "sp-consensus", "sp-consensus-slots", "sp-inherents", "sp-runtime", @@ -9038,11 +9450,12 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "merlin", "parity-scale-codec", + "serde", "sp-api", "sp-application-crypto", "sp-consensus", @@ -9058,8 +9471,8 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9068,8 +9481,8 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9080,15 +9493,15 @@ dependencies = [ [[package]] name = "sp-core" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "base58", "blake2-rfc", "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.12", + "futures 0.3.13", "hash-db", "hash256-std-hasher", "hex", @@ -9097,7 +9510,7 @@ dependencies = [ "libsecp256k1", "log", "merlin", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", @@ -9107,7 +9520,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.2", + "sha2 0.9.3", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -9124,8 +9537,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9133,18 +9546,18 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-externalities" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "environmental", "parity-scale-codec", @@ -9154,8 +9567,8 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "finality-grandpa", "log", @@ -9171,8 +9584,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -9183,10 +9596,10 @@ dependencies = [ [[package]] name = "sp-io" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "hash-db", "libsecp256k1", "log", @@ -9207,23 +9620,23 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "lazy_static", "sp-core", "sp-runtime", - "strum 0.16.0", + "strum", ] [[package]] name = "sp-keystore" -version = "0.8.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "async-trait", - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "merlin", "parity-scale-codec", "parking_lot 0.11.1", @@ -9235,8 +9648,8 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "serde", @@ -9248,19 +9661,19 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-offchain" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "sp-api", "sp-core", @@ -9269,16 +9682,16 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "backtrace", ] [[package]] name = "sp-rpc" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "serde", "sp-core", @@ -9286,16 +9699,16 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "either", "hash256-std-hasher", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "log", "parity-scale-codec", "parity-util-mem", - "paste", + "paste 1.0.5", "rand 0.7.3", "serde", "sp-application-crypto", @@ -9307,10 +9720,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "primitive-types", "sp-externalities", @@ -9324,20 +9737,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "Inflector", - "proc-macro-crate", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-serializer" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "serde", "serde_json", @@ -9345,8 +9758,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-api", @@ -9358,8 +9771,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9368,12 +9781,12 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "hash-db", "log", - "num-traits 0.2.14", + "num-traits", "parity-scale-codec", "parking_lot 0.11.1", "rand 0.7.3", @@ -9390,13 +9803,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" [[package]] name = "sp-storage" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9408,8 +9821,8 @@ dependencies = [ [[package]] name = "sp-tasks" -version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "sp-core", @@ -9421,10 +9834,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "impl-trait-for-tuples 0.2.0", "parity-scale-codec", "sp-api", "sp-inherents", @@ -9435,8 +9847,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "log", "parity-scale-codec", @@ -9448,11 +9860,11 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "derive_more 0.99.11", - "futures 0.3.12", + "derive_more", + "futures 0.3.13", "log", "parity-scale-codec", "serde", @@ -9464,8 +9876,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "hash-db", "memory-db", @@ -9478,10 +9890,10 @@ dependencies = [ [[package]] name = "sp-utils" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "futures-core", "futures-timer 3.0.2", "lazy_static", @@ -9490,8 +9902,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9502,10 +9914,10 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", "parity-scale-codec", "sp-std", "wasmi", @@ -9529,6 +9941,31 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_init" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11b73400442027c4adedda20a9f9b7945234a5bd8d5f7e86da22bd5d0622369c" +dependencies = [ + "cfg_aliases", + "libc", + "parking_lot 0.11.1", + "static_init_macro", +] + +[[package]] +name = "static_init_macro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf" +dependencies = [ + "cfg_aliases", + "memchr", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "statrs" version = "0.12.0" @@ -9550,9 +9987,9 @@ dependencies = [ [[package]] name = "streamunordered" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9394ee1338fee8370bee649f8a7170b3a56917903a0956467ad192dcf8699ca" +checksum = "e68576e37c8a37f5372796df15202190349dd80e7ed6a79544c0232213e90e35" dependencies = [ "futures-core", "futures-sink", @@ -9594,18 +10031,9 @@ checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", -] - -[[package]] -name = "strum" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22" -dependencies = [ - "strum_macros 0.16.0", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -9614,19 +10042,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" dependencies = [ - "strum_macros 0.20.1", -] - -[[package]] -name = "strum_macros" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81" -dependencies = [ - "heck", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "strum_macros", ] [[package]] @@ -9636,9 +10052,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" dependencies = [ "heck", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -9656,19 +10072,19 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.12", + "futures 0.3.13", "jsonrpc-core 15.1.0", "jsonrpc-core-client 15.1.0", "jsonrpc-derive 15.1.0", @@ -9687,25 +10103,25 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" -version = "0.8.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "async-std", - "derive_more 0.99.11", + "derive_more", "futures-util", - "hyper 0.13.9", + "hyper 0.13.10", "log", "prometheus", - "tokio 0.2.24", + "tokio 0.2.25", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.1.30", - "futures 0.3.12", + "futures 0.1.31", + "futures 0.3.13", "hash-db", "hex", "parity-scale-codec", @@ -9714,6 +10130,7 @@ dependencies = [ "sc-consensus", "sc-executor", "sc-light", + "sc-offchain", "sc-service", "serde", "serde_json", @@ -9729,10 +10146,9 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "cfg-if 0.1.10", - "frame-executive", + "cfg-if 1.0.0", "frame-support", "frame-system", "frame-system-rpc-runtime-api", @@ -9764,16 +10180,16 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "substrate-wasm-builder 3.0.0 (git+https://github.com/paritytech/substrate)", + "substrate-wasm-builder 4.0.0", "trie-db", ] [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "parity-scale-codec", "sc-block-builder", "sc-client-api", @@ -9807,8 +10223,8 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#965950969f3fca2d9e225e4988afbc0a6b851a56" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9834,24 +10250,13 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.60" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "unicode-xid 0.2.1", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] @@ -9860,10 +10265,10 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", - "unicode-xid 0.2.1", + "proc-macro2", + "quote", + "syn", + "unicode-xid", ] [[package]] @@ -9874,15 +10279,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" [[package]] name = "tap" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" +checksum = "422045212ea98508ae3d28025bc5aaa2bd4a9cdaecd442a08da2ee620ee9ea95" [[package]] name = "tempfile" @@ -9893,7 +10298,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "rand 0.8.3", - "redox_syscall 0.2.4", + "redox_syscall 0.2.5", "remove_dir_all", "winapi 0.3.9", ] @@ -9916,44 +10321,33 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "theban_interval_tree" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b42a5385db9a651628091edcd1d58ac9cb1c92327d8cd2a29bf8e35bdfe4ea" -dependencies = [ - "memrange", - "rand 0.3.23", - "time", -] - [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "thread_local" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ - "lazy_static", + "once_cell 1.7.2", ] [[package]] @@ -9980,11 +10374,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -10011,11 +10406,11 @@ checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" dependencies = [ "anyhow", "hmac 0.8.1", - "once_cell 1.5.2", + "once_cell 1.7.2", "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.9.2", + "sha2 0.9.3", "thiserror", "unicode-normalization", "zeroize", @@ -10045,9 +10440,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" dependencies = [ "tinyvec_macros", ] @@ -10065,7 +10460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "mio", "num_cpus", "tokio-codec", @@ -10084,9 +10479,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", "fnv", @@ -10098,7 +10493,7 @@ dependencies = [ "mio", "mio-uds", "num_cpus", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "signal-hook-registry", "slab", "tokio-macros", @@ -10113,7 +10508,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ "bytes 0.4.12", "either", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -10123,7 +10518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "tokio-io", ] @@ -10133,7 +10528,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-executor", ] @@ -10144,7 +10539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -10153,7 +10548,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-io", "tokio-threadpool", ] @@ -10165,7 +10560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "log", ] @@ -10175,9 +10570,9 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -10187,7 +10582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d282d483052288b2308ba5ee795f5673b159c9bdf63c385a05609da782a5eae" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "mio", "mio-named-pipes", "tokio 0.1.22", @@ -10200,7 +10595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static", "log", "mio", @@ -10220,7 +10615,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls 0.18.1", - "tokio 0.2.24", + "tokio 0.2.25", "webpki", ] @@ -10230,7 +10625,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -10240,7 +10635,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -10250,7 +10645,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "mio", "tokio-io", @@ -10266,7 +10661,7 @@ dependencies = [ "crossbeam-deque 0.7.3", "crossbeam-queue", "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static", "log", "num_cpus", @@ -10281,7 +10676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "slab", "tokio-executor", ] @@ -10293,7 +10688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "log", "mio", "tokio-codec", @@ -10308,7 +10703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "libc", "log", @@ -10329,8 +10724,8 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project-lite 0.1.11", - "tokio 0.2.24", + "pin-project-lite 0.1.12", + "tokio 0.2.25", ] [[package]] @@ -10344,32 +10739,32 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.4", + "pin-project-lite 0.2.6", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.11" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -10383,19 +10778,19 @@ dependencies = [ [[package]] name = "tracing-futures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 0.4.27", + "pin-project 1.0.5", "tracing", ] [[package]] name = "tracing-log" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ "lazy_static", "log", @@ -10414,9 +10809,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" +checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -10442,9 +10837,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trie-db" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc176c377eb24d652c9c69c832c832019011b6106182bf84276c66b66d5c9a6" +checksum = "ec051edf7f0fc9499a2cb0947652cab2148b9d7f61cee7605e312e9f970dacaf" dependencies = [ "hash-db", "hashbrown 0.9.1", @@ -10487,6 +10882,28 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "try-runtime-cli" +version = "0.9.0" +source = "git+https://github.com/paritytech/substrate?branch=rococo-v1#1404f2af4cbe90d35b4c8a1405a9452feb789adc" +dependencies = [ + "frame-try-runtime", + "log", + "parity-scale-codec", + "remote-externalities", + "sc-cli", + "sc-client-api", + "sc-executor", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-state-machine", + "structopt", +] + [[package]] name = "twox-hash" version = "1.6.0" @@ -10500,9 +10917,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "ucd-trie" @@ -10542,9 +10959,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" dependencies = [ "tinyvec", ] @@ -10561,12 +10978,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.1" @@ -10595,7 +11006,19 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.5.0", + "bytes 1.0.1", + "futures-io", + "futures-util", +] + +[[package]] +name = "unsigned-varint" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f" +dependencies = [ + "asynchronous-codec 0.6.0", "bytes 1.0.1", "futures-io", "futures-util", @@ -10620,16 +11043,25 @@ dependencies = [ [[package]] name = "url" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ "form_urlencoded", - "idna 0.2.0", + "idna 0.2.2", "matches", "percent-encoding 2.1.0", ] +[[package]] +name = "value-bag" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1" +dependencies = [ + "ctor", +] + [[package]] name = "vcpkg" version = "0.2.11" @@ -10638,9 +11070,9 @@ checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" [[package]] name = "vec-arena" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" +checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1" [[package]] name = "vec_map" @@ -10650,9 +11082,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "void" @@ -10677,9 +11109,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", "winapi 0.3.9", @@ -10692,7 +11124,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "log", "try-lock", ] @@ -10715,15 +11147,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.1+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.69" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" +checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -10731,24 +11163,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.69" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" +checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.19" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" +checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -10758,32 +11190,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.69" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" +checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" dependencies = [ - "quote 1.0.8", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.69" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" +checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.69" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" +checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" [[package]] name = "wasm-gc-api" @@ -10802,7 +11234,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "js-sys", "parking_lot 0.11.1", "pin-utils", @@ -10820,7 +11252,7 @@ dependencies = [ "libc", "memory_units", "num-rational 0.2.4", - "num-traits 0.2.14", + "num-traits", "parity-wasm 0.41.0", "wasmi-validation", ] @@ -10836,33 +11268,31 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" - -[[package]] -name = "wasmparser" -version = "0.59.0" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" +checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1" [[package]] name = "wasmtime" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd3c4f449382779ef6e0a7c3ec6752ae614e20a42e4100000c3efdc973100e2" +checksum = "7426055cb92bd9a1e9469b48154d8d6119cd8c498c8b70284e420342c05dc45d" dependencies = [ "anyhow", "backtrace", - "cfg-if 0.1.10", - "lazy_static", + "bincode", + "cfg-if 1.0.0", + "cpp_demangle", + "indexmap", "libc", "log", "region", "rustc-demangle", + "serde", "smallvec 1.6.1", "target-lexicon", - "wasmparser 0.59.0", + "wasmparser", + "wasmtime-cache", "wasmtime-environ", "wasmtime-jit", "wasmtime-profiling", @@ -10871,74 +11301,101 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "wasmtime-cache" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01d9287e36921e46f5887a47007824ae5dbb9b7517a2d565660ab4471478709" +dependencies = [ + "anyhow", + "base64 0.13.0", + "bincode", + "directories-next", + "errno", + "file-per-thread-logger", + "libc", + "log", + "serde", + "sha2 0.9.3", + "toml", + "winapi 0.3.9", + "zstd", +] + +[[package]] +name = "wasmtime-cranelift" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4134ed3a4316cd0de0e546c6004850afe472b0fa3fcdc2f2c15f8d449562d962" +dependencies = [ + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-wasm", + "wasmtime-environ", +] + [[package]] name = "wasmtime-debug" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634af9067a3af6cf2c7d33dc3b84767ddaf5d010ba68e80eecbcea73d4a349" +checksum = "e91fa931df6dd8af2b02606307674d3bad23f55473d5f4c809dddf7e4c4dc411" dependencies = [ "anyhow", - "gimli 0.21.0", + "gimli", "more-asserts", - "object 0.20.0", + "object 0.22.0", "target-lexicon", "thiserror", - "wasmparser 0.59.0", + "wasmparser", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f85619a94ee4034bd5bb87fc3dcf71fd2237b81c840809da1201061eec9ab3" +checksum = "a1098871dc3120aaf8190d79153e470658bb79f63ee9ca31716711e123c28220" dependencies = [ "anyhow", - "base64 0.12.3", - "bincode", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", - "cranelift-frontend", "cranelift-wasm", - "directories 2.0.2", - "errno", - "file-per-thread-logger", + "gimli", "indexmap", - "libc", "log", "more-asserts", - "rayon", "serde", - "sha2 0.8.2", "thiserror", - "toml", - "wasmparser 0.59.0", - "winapi 0.3.9", - "zstd", + "wasmparser", ] [[package]] name = "wasmtime-jit" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e914c013c7a9f15f4e429d5431f2830fb8adb56e40567661b69c5ec1d645be23" +checksum = "738bfcd1561ede8bb174215776fd7d9a95d5f0a47ca3deabe0282c55f9a89f68" dependencies = [ + "addr2line", "anyhow", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.21.0", + "gimli", "log", "more-asserts", - "object 0.20.0", + "object 0.22.0", + "rayon", "region", + "serde", "target-lexicon", "thiserror", - "wasmparser 0.59.0", + "wasmparser", + "wasmtime-cranelift", "wasmtime-debug", "wasmtime-environ", "wasmtime-obj", @@ -10949,13 +11406,13 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81d8e02e9bc9fe2da9b6d48bbc217f96e089f7df613f11a28a3958abc44641e" +checksum = "3e96d77f1801131c5e86d93e42a3cf8a35402107332c202c245c83f34888a906" dependencies = [ "anyhow", "more-asserts", - "object 0.20.0", + "object 0.22.0", "target-lexicon", "wasmtime-debug", "wasmtime-environ", @@ -10963,16 +11420,16 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8d4d1af8dd5f7096cfcc89dd668d358e52980c38cce199643372ffd6590e27" +checksum = "60bb672c9d894776d7b9250dd9b4fe890f8760201ee4f53e5f2da772b6c4debb" dependencies = [ "anyhow", - "cfg-if 0.1.10", - "gimli 0.21.0", + "cfg-if 1.0.0", + "gimli", "lazy_static", "libc", - "object 0.19.0", + "object 0.22.0", "scroll", "serde", "target-lexicon", @@ -10982,19 +11439,20 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a25f140bbbaadb07c531cba99ce1a966dba216138dc1b2a0ddecec851a01a93" +checksum = "a978086740949eeedfefcee667b57a9e98d9a7fc0de382fcfa0da30369e3530d" dependencies = [ "backtrace", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "indexmap", "lazy_static", "libc", "log", - "memoffset 0.5.6", + "memoffset 0.6.1", "more-asserts", + "psm", "region", "thiserror", "wasmtime-environ", @@ -11003,27 +11461,27 @@ dependencies = [ [[package]] name = "wast" -version = "31.0.0" +version = "35.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9beb1f6b63f08c523a1e8e76fc70058af4d2a34ef1c504f56cdac7b6970228b9" +checksum = "db5ae96da18bb5926341516fd409b5a8ce4e4714da7f0a1063d3b20ac9f9a1e1" dependencies = [ "leb128", ] [[package]] name = "wat" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b3044da73d3b84a822d955afad356759b2fee454b6882722008dace80b68e" +checksum = "0b0fa059022c5dabe129f02b429d67086400deb8277f89c975555dacc1dadbcc" dependencies = [ "wast", ] [[package]] name = "web-sys" -version = "0.3.46" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" +checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310" dependencies = [ "js-sys", "wasm-bindgen", @@ -11059,14 +11517,15 @@ dependencies = [ [[package]] name = "westend-runtime" -version = "0.8.28" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +version = "0.8.29" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "bitvec", "frame-executive", "frame-support", "frame-system", "frame-system-rpc-runtime-api", + "frame-try-runtime", "log", "pallet-authority-discovery", "pallet-authorship", @@ -11074,6 +11533,7 @@ dependencies = [ "pallet-balances", "pallet-collective", "pallet-democracy", + "pallet-election-provider-multi-phase", "pallet-elections-phragmen", "pallet-grandpa", "pallet-identity", @@ -11102,6 +11562,7 @@ dependencies = [ "polkadot-parachain", "polkadot-primitives", "polkadot-runtime-common", + "polkadot-runtime-parachains", "rustc-hex", "serde", "serde_derive", @@ -11121,7 +11582,7 @@ dependencies = [ "sp-transaction-pool", "sp-version", "static_assertions", - "substrate-wasm-builder 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-wasm-builder 3.0.0", ] [[package]] @@ -11216,7 +11677,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "parity-scale-codec", ] @@ -11224,7 +11685,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-support", "parity-scale-codec", @@ -11240,10 +11701,11 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.8.22" -source = "git+https://github.com/paritytech/polkadot#71a528e822af63b96bdb03efac9b4927fb11a25e" +source = "git+https://github.com/paritytech/polkadot?branch=rococo-v1#0c9d4c9289e017b7589cc5f761d38545b833e1df" dependencies = [ "frame-support", - "impl-trait-for-tuples 0.2.0", + "impl-trait-for-tuples 0.2.1", + "log", "parity-scale-codec", "sp-arithmetic", "sp-core", @@ -11255,11 +11717,11 @@ dependencies = [ [[package]] name = "yamux" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aeb8c4043cac71c3c299dff107171c220d179492350ea198e109a414981b83c" +checksum = "1cc7bd8c983209ed5d527f44b01c41b7dc146fd960c61cf9e1d25399841dc271" dependencies = [ - "futures 0.3.12", + "futures 0.3.13", "log", "nohash-hasher", "parking_lot 0.11.1", @@ -11282,9 +11744,9 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.8", - "syn 1.0.60", + "proc-macro2", + "quote", + "syn", "synstructure", ] diff --git a/client/rpc-core/txpool/Cargo.toml b/client/rpc-core/txpool/Cargo.toml index 231d6d67e6d47..1738c1bef7e4c 100644 --- a/client/rpc-core/txpool/Cargo.toml +++ b/client/rpc-core/txpool/Cargo.toml @@ -8,8 +8,7 @@ license = 'GPL-3.0-only' repository = 'https://github.com/PureStake/moonbeam/' [dependencies] -# ethereum = { git = "https://github.com/rust-blockchain/ethereum", branch = "master", features = ["with-codec"] } -ethereum = { git = "https://github.com/notlesh/ethereum", branch = "notlesh-moonbeam-v0.6", features = ["with-codec"] } +ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] } ethereum-types = "0.11.0" jsonrpc-core = "15.0.0" jsonrpc-core-client = "14.0.3" @@ -17,4 +16,4 @@ jsonrpc-derive = "14.0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } +fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } diff --git a/client/rpc/txpool/Cargo.toml b/client/rpc/txpool/Cargo.toml index e94ab2dee3584..b32993860ae15 100644 --- a/client/rpc/txpool/Cargo.toml +++ b/client/rpc/txpool/Cargo.toml @@ -11,16 +11,15 @@ repository = 'https://github.com/PureStake/moonbeam/' sha3 = "0.8" jsonrpc-core = "15.0.0" ethereum-types = "0.11.0" -# ethereum = { git = "https://github.com/rust-blockchain/ethereum", branch = "master", features = ["with-codec"] } -ethereum = { git = "https://github.com/notlesh/ethereum", branch = "notlesh-moonbeam-v0.6", features = ["with-codec"] } +ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] } moonbeam-rpc-core-txpool = { path = "../../rpc-core/txpool" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } serde = { version = "1.0", features = ["derive"] } moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" } diff --git a/docker/polkadot-relay.Dockerfile b/docker/polkadot-relay.Dockerfile index ecf05e8061986..06f5d0c741764 100644 --- a/docker/polkadot-relay.Dockerfile +++ b/docker/polkadot-relay.Dockerfile @@ -6,6 +6,7 @@ LABEL description="This is the build stage for Polkadot. Here we create the bina ARG PROFILE=release ARG POLKADOT_COMMIT=master +ARG POLKADOT_REPO=https://github.com/paritytech/polkadot RUN echo "Using polkadot ${POLKADOT_COMMIT}" WORKDIR / @@ -16,7 +17,7 @@ RUN apt-get update && \ # Grab the Polkadot Code # TODO how to grab the correct commit from the lock file? -RUN git clone https://github.com/paritytech/polkadot +RUN git clone ${POLKADOT_REPO} WORKDIR /polkadot RUN git checkout ${POLKADOT_COMMIT} diff --git a/moonbeam-types-bundle/package-lock.json b/moonbeam-types-bundle/package-lock.json index 4cbfd7311f7f5..e1abf161b7fc5 100644 --- a/moonbeam-types-bundle/package-lock.json +++ b/moonbeam-types-bundle/package-lock.json @@ -1,6 +1,6 @@ { "name": "moonbeam-types-bundle", - "version": "1.1.9", + "version": "1.1.10", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/node/Cargo.toml b/node/Cargo.toml index 550002ee98961..0ea8e4b19caa8 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ name = 'moonbeam' description = 'Moonbeam Collator' homepage = 'https://moonbeam.network' license = 'GPL-3.0-only' -version = '0.6.1' +version = '0.7.0' authors = ["PureStake"] build = 'build.rs' edition = '2018' @@ -14,10 +14,10 @@ path = 'src/main.rs' [dependencies] async-io = "1.3" -derive_more = '0.15.0' +derive_more = '0.99' exit-future = '0.1.4' futures = { version = "0.3.1", features = ["compat"] } -log = '0.4.8' +log = '0.4' parking_lot = '0.9.0' trie-root = '0.15.2' parity-scale-codec = '2.0.0' @@ -38,64 +38,68 @@ moonbeam-rpc-primitives-txpool = { path = "../primitives/rpc/txpool" } author-inherent = { path = "../pallets/author-inherent"} # Substrate dependencies -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-api = { 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-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-informant = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "master" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", features = ["wasmtime"] } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", features = ["wasmtime"] } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-trie = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-informant = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } -evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } +evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } -fc-consensus = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -fp-consensus = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -fc-rpc = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -fp-rpc = { git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } +fc-consensus = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fp-consensus = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fc-rpc = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fp-rpc = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fc-db = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } # Cumulus dependencies -cumulus-consensus = { git = "https://github.com/paritytech/cumulus", branch = "master" } -cumulus-collator = { git = "https://github.com/paritytech/cumulus", branch = "master" } -cumulus-network = { git = "https://github.com/paritytech/cumulus", branch = "master" } -cumulus-primitives = { git = "https://github.com/paritytech/cumulus", branch = "master" } -cumulus-service = { git = "https://github.com/paritytech/cumulus", branch = "master" } -cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "master" } +cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-client-collator = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-client-network = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-client-service = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } +cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus", branch = "rococo-v1" } # 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" } +polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } +substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } [dev-dependencies] assert_cmd = "0.12" @@ -104,11 +108,11 @@ rand = "0.7.3" tokio = { version = "0.2.13", features = ["macros"] } # Polkadot dev-dependencies -polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" } -polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } +polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } +polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1" } # Substrate dev-dependencies -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" } -substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "master" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } +substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 0c63210aa1aa3..995bce47de7a5 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -20,7 +20,7 @@ //! https://substrate.dev/docs/en/knowledgebase/integrate/chain-spec use bip39::{Language, Mnemonic, Seed}; -use cumulus_primitives::ParaId; +use cumulus_primitives_core::ParaId; use log::debug; use moonbeam_runtime::{ AccountId, Balance, BalancesConfig, DemocracyConfig, EVMConfig, EthereumChainIdConfig, @@ -231,34 +231,34 @@ fn testnet_genesis( chain_id: u64, ) -> GenesisConfig { GenesisConfig { - frame_system: Some(SystemConfig { + frame_system: SystemConfig { code: WASM_BINARY .expect("WASM binary was not build, please build it!") .to_vec(), changes_trie_config: Default::default(), - }), - pallet_balances: Some(BalancesConfig { + }, + pallet_balances: BalancesConfig { balances: endowed_accounts .iter() .cloned() .map(|k| (k, 1 << 80)) .collect(), - }), - pallet_sudo: Some(SudoConfig { key: root_key }), - parachain_info: Some(ParachainInfoConfig { + }, + pallet_sudo: SudoConfig { key: root_key }, + parachain_info: ParachainInfoConfig { parachain_id: para_id, - }), - pallet_ethereum_chain_id: Some(EthereumChainIdConfig { chain_id }), - pallet_evm: Some(EVMConfig { + }, + pallet_ethereum_chain_id: EthereumChainIdConfig { chain_id }, + pallet_evm: EVMConfig { accounts: BTreeMap::new(), - }), - pallet_ethereum: Some(EthereumConfig {}), - pallet_democracy: Some(DemocracyConfig {}), - pallet_scheduler: Some(SchedulerConfig {}), - parachain_staking: Some(ParachainStakingConfig { + }, + pallet_ethereum: EthereumConfig {}, + pallet_democracy: DemocracyConfig {}, + pallet_scheduler: SchedulerConfig {}, + parachain_staking: ParachainStakingConfig { stakers, inflation_config, - }), + }, } } diff --git a/node/src/command.rs b/node/src/command.rs index bee77797863be..4c9545dc50c4d 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -20,7 +20,8 @@ use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, }; -use cumulus_primitives::{genesis::generate_genesis_block, ParaId}; +use cumulus_client_service::genesis::generate_genesis_block; +use cumulus_primitives_core::ParaId; use log::info; use moonbeam_runtime::{AccountId, Block}; use parity_scale_codec::Encode; @@ -185,12 +186,19 @@ pub fn run() -> Result<()> { Some(Subcommand::CheckBlock(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { + let extension = chain_spec::Extensions::try_get(&*config.chain_spec); + let relay_chain_id = extension.map(|e| e.relay_chain.clone()); + let PartialComponents { client, task_manager, import_queue, .. - } = crate::service::new_partial(&config, None, false)?; + } = if cli.run.dev_service || relay_chain_id == Some("dev-service".to_string()) { + crate::service::dev_partial(&config, None, false)? + } else { + crate::service::parachain_partial(&config, None, false)? + }; Ok((cmd.run(client, import_queue), task_manager)) }) } @@ -201,7 +209,7 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = crate::service::new_partial(&config, None, false)?; + } = crate::service::parachain_partial(&config, None, false)?; Ok((cmd.run(client, config.database), task_manager)) }) } @@ -212,19 +220,26 @@ pub fn run() -> Result<()> { client, task_manager, .. - } = crate::service::new_partial(&config, None, false)?; + } = crate::service::parachain_partial(&config, None, false)?; Ok((cmd.run(client, config.chain_spec), task_manager)) }) } Some(Subcommand::ImportBlocks(cmd)) => { let runner = cli.create_runner(cmd)?; runner.async_run(|config| { + let extension = chain_spec::Extensions::try_get(&*config.chain_spec); + let relay_chain_id = extension.map(|e| e.relay_chain.clone()); + let PartialComponents { client, task_manager, import_queue, .. - } = crate::service::new_partial(&config, None, false)?; + } = if cli.run.dev_service || relay_chain_id == Some("dev-service".to_string()) { + crate::service::dev_partial(&config, None, false)? + } else { + crate::service::parachain_partial(&config, None, false)? + }; Ok((cmd.run(client, import_queue), task_manager)) }) } @@ -240,7 +255,7 @@ pub fn run() -> Result<()> { task_manager, backend, .. - } = crate::service::new_partial(&config, None, false)?; + } = crate::service::parachain_partial(&config, None, false)?; Ok((cmd.run(client, backend), task_manager)) }) } @@ -357,7 +372,6 @@ pub fn run() -> Result<()> { &polkadot_cli, &polkadot_cli, task_executor, - config.telemetry_handle.clone(), ) .map_err(|err| format!("Relay chain argument error: {}", err))?; @@ -441,7 +455,7 @@ impl CliConfiguration for RelayChainCli { self.base.base.prometheus_config(default_listen_port) } - fn init(&self) -> Result { + fn init(&self) -> Result<()> { unreachable!("PolkadotCli is never initialized; qed"); } diff --git a/node/src/inherents.rs b/node/src/inherents.rs index 1203a14b8e080..c02d64c41cdd0 100644 --- a/node/src/inherents.rs +++ b/node/src/inherents.rs @@ -24,10 +24,8 @@ //! about the external world, but can pass the runtime's checks. This is useful in testing //! for example, running the --dev service without a relay chain backbone. -use cumulus_primitives::{ - inherents::{SystemInherentData, SYSTEM_INHERENT_IDENTIFIER}, - PersistedValidationData, -}; +use cumulus_primitives_core::PersistedValidationData; +use cumulus_primitives_parachain_inherent::{ParachainInherentData, INHERENT_IDENTIFIER}; use parity_scale_codec::Encode; use sp_core::H160; use sp_inherents::{InherentData, InherentDataProviders, InherentIdentifier, ProvideInherentData}; @@ -83,7 +81,7 @@ struct MockValidationDataInherentDataProvider; impl ProvideInherentData for MockValidationDataInherentDataProvider { fn inherent_identifier(&self) -> &'static InherentIdentifier { - &SYSTEM_INHERENT_IDENTIFIER + &INHERENT_IDENTIFIER } fn provide_inherent_data( @@ -94,13 +92,11 @@ impl ProvideInherentData for MockValidationDataInherentDataProvider { let (relay_storage_root, proof) = RelayStateSproofBuilder::default().into_state_root_and_proof(); - let data = SystemInherentData { + let data = ParachainInherentData { validation_data: PersistedValidationData { parent_head: Default::default(), - block_number: Default::default(), - relay_storage_root, - hrmp_mqc_heads: Default::default(), - dmq_mqc_head: Default::default(), + relay_parent_storage_root: relay_storage_root, + relay_parent_number: Default::default(), max_pov_size: Default::default(), }, downward_messages: Default::default(), @@ -108,10 +104,10 @@ impl ProvideInherentData for MockValidationDataInherentDataProvider { relay_chain_state: proof, }; - inherent_data.put_data(SYSTEM_INHERENT_IDENTIFIER, &data) + inherent_data.put_data(INHERENT_IDENTIFIER, &data) } fn error_to_string(&self, error: &[u8]) -> Option { - InherentError::try_from(&SYSTEM_INHERENT_IDENTIFIER, error).map(|e| format!("{:?}", e)) + InherentError::try_from(&INHERENT_IDENTIFIER, error).map(|e| format!("{:?}", e)) } } diff --git a/node/src/rpc.rs b/node/src/rpc.rs index ae5a952c2bf0e..b8856783082fb 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -16,8 +16,11 @@ //! A collection of node-specific RPC methods. -use std::{fmt, sync::Arc}; +use std::collections::BTreeMap; +use std::sync::Arc; +use ethereum::EthereumStorageSchema; +use fc_rpc::{SchemaV1Override, StorageOverride}; use fc_rpc_core::types::{FilterPool, PendingTransactions}; use jsonrpc_pubsub::manager::SubscriptionManager; use moonbeam_runtime::{opaque::Block, AccountId, Balance, Hash, Index}; @@ -54,6 +57,8 @@ pub struct FullDeps { pub pending_transactions: PendingTransactions, /// EthFilterApi pool. pub filter_pool: Option, + /// Backend. + pub backend: Arc>, /// Manual seal command sink pub command_sink: Option>>, } @@ -76,7 +81,6 @@ where A: ChainApi + 'static, C::Api: fp_rpc::EthereumRuntimeRPCApi, C::Api: moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi, - ::Error: fmt::Debug, P: TransactionPool + 'static, { use fc_rpc::{ @@ -98,6 +102,7 @@ where pending_transactions, filter_pool, command_sink, + backend: frontier_backend, } = deps; io.extend_with(SystemApi::to_delegate(FullSystem::new( @@ -112,6 +117,13 @@ where // TODO: are we supporting signing? let signers = Vec::new(); + let mut overrides = BTreeMap::new(); + overrides.insert( + EthereumStorageSchema::V1, + Box::new(SchemaV1Override::new(client.clone())) + as Box + Send + Sync>, + ); + io.extend_with(EthApiServer::to_delegate(EthApi::new( client.clone(), pool.clone(), @@ -120,6 +132,8 @@ where network.clone(), pending_transactions, signers, + overrides, + frontier_backend, is_authority, ))); diff --git a/node/src/service.rs b/node/src/service.rs index 417bf3eb7971b..e7a9913c0ff0d 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -24,21 +24,27 @@ use crate::{cli::Sealing, inherents::build_inherent_data_providers}; use async_io::Timer; -use cumulus_network::build_block_announce_validator; -use cumulus_service::{ +use cumulus_client_consensus_relay_chain::{ + build_relay_chain_consensus, BuildRelayChainConsensusParams, +}; +use cumulus_client_network::build_block_announce_validator; +use cumulus_client_service::{ prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams, }; use fc_consensus::FrontierBlockImport; +use fc_mapping_sync::MappingSyncWorker; +use fc_rpc::EthTask; use fc_rpc_core::types::{FilterPool, PendingTransactions}; use futures::{Stream, StreamExt}; use moonbeam_runtime::{opaque::Block, RuntimeApi}; use polkadot_primitives::v0::CollatorPair; +use sc_cli::SubstrateCli; use sc_client_api::BlockchainEvents; use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams}; use sc_executor::native_executor_instance; pub use sc_executor::NativeExecutor; use sc_service::{ - error::Error as ServiceError, Configuration, PartialComponents, Role, TFullBackend, + error::Error as ServiceError, BasePath, Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager, }; use sp_core::{Pair, H160, H256}; @@ -56,16 +62,38 @@ native_executor_instance!( moonbeam_runtime::api::dispatch, moonbeam_runtime::native_version, ); +use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle}; type FullClient = TFullClient; type FullBackend = TFullBackend; -/// Starts a `ServiceBuilder` for a full service. +pub fn open_frontier_backend(config: &Configuration) -> Result>, String> { + let config_dir = config + .base_path + .as_ref() + .map(|base_path| base_path.config_dir(config.chain_spec.id())) + .unwrap_or_else(|| { + BasePath::from_project("", "", &crate::cli::Cli::executable_name()) + .config_dir(config.chain_spec.id()) + }); + let database_dir = config_dir.join("frontier").join("db"); + + Ok(Arc::new(fc_db::Backend::::new( + &fc_db::DatabaseSettings { + source: fc_db::DatabaseSettingsSrc::RocksDb { + path: database_dir, + cache_size: 0, + }, + }, + )?)) +} + +/// Builds the PartialComponents for a parachain service /// -/// Use this macro if you don't actually need the full service, but just the builder in order to +/// Use this function if you don't actually need the full service, but just the partial in order to /// be able to perform chain operations. #[allow(clippy::type_complexity)] -pub fn new_partial( +pub fn parachain_partial( config: &Configuration, author: Option, mock_inherents: bool, @@ -80,20 +108,44 @@ pub fn new_partial( FrontierBlockImport, FullClient>, PendingTransactions, Option, + Option, + Option, + Arc>, ), >, ServiceError, > { let inherent_data_providers = build_inherent_data_providers(author, mock_inherents)?; + let telemetry = config + .telemetry_endpoints + .clone() + .filter(|x| !x.is_empty()) + .map(|endpoints| -> Result<_, sc_telemetry::Error> { + let worker = TelemetryWorker::new(16)?; + let telemetry = worker.handle().new_telemetry(endpoints); + Ok((worker, telemetry)) + }) + .transpose()?; + let (client, backend, keystore_container, task_manager) = - sc_service::new_full_parts::(&config)?; + sc_service::new_full_parts::( + &config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + )?; + let client = Arc::new(client); - let registry = config.prometheus_registry(); + let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle()); + + let telemetry = telemetry.map(|(worker, telemetry)| { + task_manager.spawn_handle().spawn("telemetry", worker.run()); + telemetry + }); let transaction_pool = sc_transaction_pool::BasicPool::new_full( config.transaction_pool.clone(), + config.role.is_authority().into(), config.prometheus_registry(), task_manager.spawn_handle(), client.clone(), @@ -103,17 +155,17 @@ pub fn new_partial( let filter_pool: Option = Some(Arc::new(Mutex::new(BTreeMap::new()))); - let frontier_block_import = FrontierBlockImport::new(client.clone(), client.clone(), true); + let frontier_backend = open_frontier_backend(config)?; - // We build the cumulus import queue here regardless of whether we're running a parachain or - // the dev service. Either one will be fine when only partial components are necessary. - // When running the dev service, an alternate import queue will be built below. - let import_queue = cumulus_consensus::import_queue::import_queue( + let frontier_block_import = + FrontierBlockImport::new(client.clone(), client.clone(), frontier_backend.clone()); + + let import_queue = cumulus_client_consensus_relay_chain::import_queue( client.clone(), frontier_block_import.clone(), inherent_data_providers.clone(), - &task_manager.spawn_handle(), - registry, + &task_manager.spawn_essential_handle(), + config.prometheus_registry(), )?; Ok(PartialComponents { @@ -125,7 +177,14 @@ pub fn new_partial( transaction_pool, inherent_data_providers, select_chain: (), - other: (frontier_block_import, pending_transactions, filter_pool), + other: ( + frontier_block_import, + pending_transactions, + filter_pool, + telemetry, + telemetry_worker_handle, + frontier_backend, + ), }) } @@ -143,8 +202,8 @@ async fn start_node_impl( ) -> sc_service::error::Result<(TaskManager, Arc)> where RB: Fn( - Arc>, - ) -> jsonrpc_core::IoHandler + Arc>, + ) -> jsonrpc_core::IoHandler + Send + 'static, { @@ -154,15 +213,25 @@ where let parachain_config = prepare_node_config(parachain_config); - let polkadot_full_node = - cumulus_service::build_polkadot_full_node(polkadot_config, collator_key.public()).map_err( - |e| match e { - polkadot_service::Error::Sub(x) => x, - s => format!("{}", s).into(), - }, - )?; - - let params = new_partial(¶chain_config, author_id, false)?; + let params = parachain_partial(¶chain_config, author_id, false)?; + let ( + block_import, + pending_transactions, + filter_pool, + mut telemetry, + telemetry_worker_handle, + frontier_backend, + ) = params.other; + + let polkadot_full_node = cumulus_client_service::build_polkadot_full_node( + polkadot_config, + collator_key.public(), + telemetry_worker_handle, + ) + .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(); @@ -177,7 +246,6 @@ where let transaction_pool = params.transaction_pool.clone(); let mut task_manager = params.task_manager; let import_queue = params.import_queue; - let (block_import, pending_transactions, filter_pool) = params.other; let (network, network_status_sinks, system_rpc_tx, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, @@ -198,6 +266,8 @@ where let network = network.clone(); let pending = pending_transactions.clone(); let filter_pool = filter_pool.clone(); + let frontier_backend = frontier_backend.clone(); + Box::new(move |deny_unsafe, _| { let deps = crate::rpc::FullDeps { client: client.clone(), @@ -209,12 +279,25 @@ where pending_transactions: pending.clone(), filter_pool: filter_pool.clone(), command_sink: None, + backend: frontier_backend.clone(), }; crate::rpc::create_full(deps, subscription_task_executor.clone()) }) }; + task_manager.spawn_essential_handle().spawn( + "frontier-mapping-sync-worker", + MappingSyncWorker::new( + client.import_notification_stream(), + Duration::new(6, 0), + client.clone(), + backend.clone(), + frontier_backend.clone(), + ) + .for_each(|()| futures::future::ready(())), + ); + sc_service::spawn_tasks(sc_service::SpawnTasksParams { on_demand: None, remote_blockchain: None, @@ -228,108 +311,67 @@ where network: network.clone(), network_status_sinks, system_rpc_tx, + telemetry: telemetry.as_mut(), })?; // Spawn Frontier EthFilterApi maintenance task. - if filter_pool.is_some() { + if let Some(filter_pool) = filter_pool { // Each filter is allowed to stay in the pool for 100 blocks. const FILTER_RETAIN_THRESHOLD: u64 = 100; task_manager.spawn_essential_handle().spawn( "frontier-filter-pool", - client - .import_notification_stream() - .for_each(move |notification| { - if let Ok(locked) = &mut filter_pool.clone().unwrap().lock() { - let imported_number: u64 = notification.header.number as u64; - for (k, v) in locked.clone().iter() { - let lifespan_limit = v.at_block + FILTER_RETAIN_THRESHOLD; - if lifespan_limit <= imported_number { - locked.remove(&k); - } - } - } - futures::future::ready(()) - }), + EthTask::filter_pool_task(Arc::clone(&client), filter_pool, FILTER_RETAIN_THRESHOLD), ); } // Spawn Frontier pending transactions maintenance task (as essential, otherwise we leak). - if pending_transactions.is_some() { - use fp_consensus::{ConsensusLog, FRONTIER_ENGINE_ID}; - use sp_runtime::generic::OpaqueDigestItemId; - + if let Some(pending_transactions) = pending_transactions { const TRANSACTION_RETAIN_THRESHOLD: u64 = 5; task_manager.spawn_essential_handle().spawn( "frontier-pending-transactions", - client - .import_notification_stream() - .for_each(move |notification| { - if let Ok(locked) = &mut pending_transactions.clone().unwrap().lock() { - // As pending transactions have a finite lifespan anyway - // we can ignore MultiplePostRuntimeLogs error checks. - let mut frontier_log: Option<_> = None; - for log in notification.header.digest.logs.iter().rev() { - let log = log.try_to::(OpaqueDigestItemId::Consensus( - &FRONTIER_ENGINE_ID, - )); - if log.is_some() { - frontier_log = log; - break; - } - } - - let imported_number: u64 = notification.header.number as u64; - - if let Some(ConsensusLog::EndBlock { - block_hash: _, - transaction_hashes, - }) = frontier_log - { - // Retain all pending transactions that were not - // processed in the current block. - locked.retain(|&k, _| !transaction_hashes.contains(&k)); - } - locked.retain(|_, v| { - // Drop all the transactions that exceeded the given lifespan. - let lifespan_limit = v.at_block + TRANSACTION_RETAIN_THRESHOLD; - lifespan_limit > imported_number - }); - } - futures::future::ready(()) - }), + EthTask::pending_transaction_task( + Arc::clone(&client), + pending_transactions, + TRANSACTION_RETAIN_THRESHOLD, + ), ); } let announce_block = { let network = network.clone(); - Arc::new(move |hash, data| network.announce_block(hash, Some(data))) + Arc::new(move |hash, data| network.announce_block(hash, data)) }; if collator { - let proposer_factory = sc_basic_authorship::ProposerFactory::new( + let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording( task_manager.spawn_handle(), client.clone(), transaction_pool, prometheus_registry.as_ref(), + telemetry.as_ref().map(|x| x.handle()), ); let spawner = task_manager.spawn_handle(); - let polkadot_backend = polkadot_full_node.backend.clone(); - - let params = StartCollatorParams { + let parachain_consensus = build_relay_chain_consensus(BuildRelayChainConsensusParams { para_id: id, - block_import, proposer_factory, inherent_data_providers: params.inherent_data_providers, + block_import, + relay_chain_client: polkadot_full_node.client.clone(), + relay_chain_backend: polkadot_full_node.backend.clone(), + }); + + let params = StartCollatorParams { + para_id: id, block_status: client.clone(), announce_block, client: client.clone(), task_manager: &mut task_manager, collator_key, - polkadot_full_node, spawner, backend, - polkadot_backend, + relay_chain_full_node: polkadot_full_node, + parachain_consensus, }; start_collator(params).await?; @@ -371,6 +413,106 @@ pub async fn start_node( .await } +/// Builds the PartialComponents for a development service +/// +/// Use this function if you don't actually need the full service, but just the partial in order to +/// be able to perform chain operations. +#[allow(clippy::type_complexity)] +pub fn dev_partial( + config: &Configuration, + author: Option, + mock_inherents: bool, +) -> Result< + PartialComponents< + FullClient, + FullBackend, + (), + sp_consensus::import_queue::BasicQueue>, + sc_transaction_pool::FullPool, + ( + FrontierBlockImport, FullClient>, + PendingTransactions, + Option, + Option, + Option, + Arc>, + ), + >, + ServiceError, +> { + let inherent_data_providers = build_inherent_data_providers(author, mock_inherents)?; + + let telemetry = config + .telemetry_endpoints + .clone() + .filter(|x| !x.is_empty()) + .map(|endpoints| -> Result<_, sc_telemetry::Error> { + let worker = TelemetryWorker::new(16)?; + let telemetry = worker.handle().new_telemetry(endpoints); + Ok((worker, telemetry)) + }) + .transpose()?; + + let (client, backend, keystore_container, task_manager) = + sc_service::new_full_parts::( + &config, + telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + )?; + + let client = Arc::new(client); + + let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle()); + + let telemetry = telemetry.map(|(worker, telemetry)| { + task_manager.spawn_handle().spawn("telemetry", worker.run()); + telemetry + }); + + let transaction_pool = sc_transaction_pool::BasicPool::new_full( + config.transaction_pool.clone(), + config.role.is_authority().into(), + config.prometheus_registry(), + task_manager.spawn_handle(), + client.clone(), + ); + + let pending_transactions: PendingTransactions = Some(Arc::new(Mutex::new(HashMap::new()))); + + let filter_pool: Option = Some(Arc::new(Mutex::new(BTreeMap::new()))); + + let frontier_backend = open_frontier_backend(config)?; + + let frontier_block_import = + FrontierBlockImport::new(client.clone(), client.clone(), frontier_backend.clone()); + + // There is another bug in this import queue where it doesn't properly check inherents: + // https://github.com/paritytech/substrate/issues/8164 + let import_queue = sc_consensus_manual_seal::import_queue( + Box::new(frontier_block_import.clone()), + &task_manager.spawn_essential_handle(), + config.prometheus_registry(), + ); + + Ok(PartialComponents { + backend, + client, + import_queue, + keystore_container, + task_manager, + transaction_pool, + inherent_data_providers, + select_chain: (), + other: ( + frontier_block_import, + pending_transactions, + filter_pool, + telemetry, + telemetry_worker_handle, + frontier_backend, + ), + }) +} + /// Builds a new development service. This service uses manual seal, and mocks /// the parachain inherent. pub fn new_dev( @@ -383,23 +525,21 @@ pub fn new_dev( client, backend, mut task_manager, - import_queue: _, + import_queue, keystore_container, select_chain: _, transaction_pool, inherent_data_providers, - other: (block_import, pending_transactions, filter_pool), - } = new_partial(&config, author_id, true)?; - - // When running the dev service we build a manual seal import queue so that we can properly - // follow the longest chain rule. However, there is another bug in this import queue where - // it doesn't properly check inherents: - // https://github.com/paritytech/substrate/issues/8164 - let dev_import_queue = sc_consensus_manual_seal::import_queue( - Box::new(block_import.clone()), - &task_manager.spawn_handle(), - config.prometheus_registry(), - ); + other: + ( + block_import, + pending_transactions, + filter_pool, + telemetry, + _telemetry_worker_handle, + frontier_backend, + ), + } = dev_partial(&config, author_id, true)?; let (network, network_status_sinks, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams { @@ -407,7 +547,7 @@ pub fn new_dev( client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: dev_import_queue, + import_queue, on_demand: None, block_announce_validator_builder: None, })?; @@ -415,7 +555,6 @@ pub fn new_dev( if config.offchain_worker.enabled { sc_service::build_offchain_workers( &config, - backend.clone(), task_manager.spawn_handle(), client.clone(), network.clone(), @@ -433,6 +572,7 @@ pub fn new_dev( client.clone(), transaction_pool.clone(), prometheus_registry.as_ref(), + telemetry.as_ref().map(|x| x.handle()), ); let commands_stream: Box> + Send + Sync + Unpin> = @@ -494,6 +634,8 @@ pub fn new_dev( let network = network.clone(); let pending = pending_transactions.clone(); let filter_pool = filter_pool.clone(); + let frontier_backend = frontier_backend.clone(); + Box::new(move |deny_unsafe, _| { let deps = crate::rpc::FullDeps { client: client.clone(), @@ -505,12 +647,13 @@ pub fn new_dev( pending_transactions: pending.clone(), filter_pool: filter_pool.clone(), command_sink: command_sink.clone(), + backend: frontier_backend.clone(), }; crate::rpc::create_full(deps, subscription_task_executor.clone()) }) }; - sc_service::spawn_tasks(sc_service::SpawnTasksParams { + let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams { network, client: client.clone(), keystore: keystore_container.sync_keystore(), @@ -519,79 +662,45 @@ pub fn new_dev( rpc_extensions_builder, on_demand: None, remote_blockchain: None, - backend, + backend: backend.clone(), network_status_sinks, system_rpc_tx, config, + telemetry: None, })?; + task_manager.spawn_essential_handle().spawn( + "frontier-mapping-sync-worker", + MappingSyncWorker::new( + client.import_notification_stream(), + Duration::new(6, 0), + client.clone(), + backend, + frontier_backend.clone(), + ) + .for_each(|()| futures::future::ready(())), + ); + // Spawn Frontier EthFilterApi maintenance task. - if filter_pool.is_some() { + if let Some(filter_pool) = filter_pool { // Each filter is allowed to stay in the pool for 100 blocks. const FILTER_RETAIN_THRESHOLD: u64 = 100; task_manager.spawn_essential_handle().spawn( "frontier-filter-pool", - client - .import_notification_stream() - .for_each(move |notification| { - if let Ok(locked) = &mut filter_pool.clone().unwrap().lock() { - let imported_number: u64 = notification.header.number as u64; - for (k, v) in locked.clone().iter() { - let lifespan_limit = v.at_block + FILTER_RETAIN_THRESHOLD; - if lifespan_limit <= imported_number { - locked.remove(&k); - } - } - } - futures::future::ready(()) - }), + EthTask::filter_pool_task(Arc::clone(&client), filter_pool, FILTER_RETAIN_THRESHOLD), ); } // Spawn Frontier pending transactions maintenance task (as essential, otherwise we leak). - if pending_transactions.is_some() { - use fp_consensus::{ConsensusLog, FRONTIER_ENGINE_ID}; - use sp_runtime::generic::OpaqueDigestItemId; - + if let Some(pending_transactions) = pending_transactions { const TRANSACTION_RETAIN_THRESHOLD: u64 = 5; task_manager.spawn_essential_handle().spawn( "frontier-pending-transactions", - client - .import_notification_stream() - .for_each(move |notification| { - if let Ok(locked) = &mut pending_transactions.clone().unwrap().lock() { - // As pending transactions have a finite lifespan anyway - // we can ignore MultiplePostRuntimeLogs error checks. - let mut frontier_log: Option<_> = None; - for log in notification.header.digest.logs.iter().rev() { - let log = log.try_to::(OpaqueDigestItemId::Consensus( - &FRONTIER_ENGINE_ID, - )); - if log.is_some() { - frontier_log = log; - break; - } - } - - let imported_number: u64 = notification.header.number as u64; - - if let Some(ConsensusLog::EndBlock { - block_hash: _, - transaction_hashes, - }) = frontier_log - { - // Retain all pending transactions that were not - // processed in the current block. - locked.retain(|&k, _| !transaction_hashes.contains(&k)); - } - locked.retain(|_, v| { - // Drop all the transactions that exceeded the given lifespan. - let lifespan_limit = v.at_block + TRANSACTION_RETAIN_THRESHOLD; - lifespan_limit > imported_number - }); - } - futures::future::ready(()) - }), + EthTask::pending_transaction_task( + Arc::clone(&client), + pending_transactions, + TRANSACTION_RETAIN_THRESHOLD, + ), ); } diff --git a/pallets/author-filter/Cargo.toml b/pallets/author-filter/Cargo.toml index ae51e4226719c..fdf54c1fce144 100644 --- a/pallets/author-filter/Cargo.toml +++ b/pallets/author-filter/Cargo.toml @@ -7,13 +7,13 @@ version = '0.6.0' [dependencies] parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } author-inherent = { path = "../author-inherent", default-features = false } parachain-staking = { path = "../parachain-staking", default-features = false } -cumulus-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } [features] default = ["std"] @@ -25,5 +25,5 @@ std = [ "parachain-staking/std", "sp-core/std", "sp-runtime/std", - "cumulus-parachain-system/std", + "cumulus-pallet-parachain-system/std", ] diff --git a/pallets/author-filter/src/lib.rs b/pallets/author-filter/src/lib.rs index fead0bac947fc..ff1bee33ba44e 100644 --- a/pallets/author-filter/src/lib.rs +++ b/pallets/author-filter/src/lib.rs @@ -35,7 +35,7 @@ pub use pallet::*; #[pallet] pub mod pallet { - use frame_support::debug; + use frame_support::log; use frame_support::pallet_prelude::*; use frame_support::traits::Randomness; use frame_support::traits::Vec; @@ -50,12 +50,12 @@ pub mod pallet { /// Configuration trait of this pallet. #[pallet::config] pub trait Config: - frame_system::Config + parachain_staking::Config + cumulus_parachain_system::Config + frame_system::Config + parachain_staking::Config + cumulus_pallet_parachain_system::Config { /// The overarching event type type Event: From> + IsType<::Event>; /// Deterministic on-chain pseudo-randomness used to do the filtering - type RandomnessSource: Randomness; + type RandomnessSource: Randomness; } // This code will be called by the author-inherent pallet to check whether the reported author @@ -68,15 +68,15 @@ pub mod pallet { // inherent. impl author_inherent::CanAuthor for Pallet { fn can_author(account: &T::AccountId) -> bool { - let mut staked = >::selected_candidates(); + let mut staked = >::selected_candidates(); let num_eligible = EligibleRatio::::get().mul_ceil(staked.len()); let mut eligible = Vec::with_capacity(num_eligible); // Grab the relay parent height as a temporary source of relay-based entropy - let validation_data = cumulus_parachain_system::Module::::validation_data() + let validation_data = cumulus_pallet_parachain_system::Module::::validation_data() .expect("validation data was set in parachain system inherent"); - let relay_height = validation_data.block_number; + let relay_height = validation_data.relay_parent_number; for i in 0..num_eligible { // A context identifier for grabbing the randomness. Consists of three parts @@ -95,7 +95,7 @@ pub mod pallet { i as u8, relay_height as u8, ]; - let randomness = T::RandomnessSource::random(&subject); + let randomness = T::RandomnessSource::random(&subject).0; // Cast to u32 first so we get the same result on wasm and 64-bit platforms. let index = (randomness.to_low_u64_be() as u32) as usize; @@ -107,28 +107,28 @@ pub mod pallet { eligible.push(staked.remove(index % staked.len())); // Print some logs for debugging purposes. - debug::trace!(target:"author-filter", "Filtering Authors"); - debug::trace!( + log::trace!(target:"author-filter", "Filtering Authors"); + log::trace!( target:"author-filter", "The randomness was {:?}", randomness ); - debug::trace!( + log::trace!( target:"author-filter", "NOT Eligible Authors: {:?}", &staked ); - debug::trace!( + log::trace!( target:"author-filter", "Eligible Authors are: {:?}", eligible ); - debug::trace!( + log::trace!( target:"author-filter", "The id I'm checking is: {:?}", account ); - debug::trace!( + log::trace!( target:"author-filter", "Was that author eligible: {}", eligible.contains(account) diff --git a/pallets/author-inherent/Cargo.toml b/pallets/author-inherent/Cargo.toml index 506d5c7736851..6495f8c3095e7 100644 --- a/pallets/author-inherent/Cargo.toml +++ b/pallets/author-inherent/Cargo.toml @@ -7,17 +7,18 @@ edition = "2018" license = 'GPL-3.0-only' [dependencies] -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +serde = { version = "1.0.101", features = ["derive"] } [features] default = ["std"] diff --git a/pallets/author-inherent/src/lib.rs b/pallets/author-inherent/src/lib.rs index ac98e636b8a38..2e02b67a1f1a6 100644 --- a/pallets/author-inherent/src/lib.rs +++ b/pallets/author-inherent/src/lib.rs @@ -20,9 +20,8 @@ #![cfg_attr(not(feature = "std"), no_std)] -use frame_support::debug; use frame_support::{ - decl_error, decl_module, decl_storage, ensure, + decl_error, decl_module, decl_storage, ensure, log, traits::FindAuthor, weights::{DispatchClass, Weight}, }; @@ -105,14 +104,14 @@ decl_module! { DispatchClass::Mandatory )] fn set_author(origin, author: T::AccountId) { - debug::trace!(target:"author-inherent", "In the author inherent dispatchable"); + log::trace!(target:"author-inherent", "In the author inherent dispatchable"); ensure_none(origin)?; ensure!(>::get().is_none(), Error::::AuthorAlreadySet); ensure!(T::FinalCanAuthor::can_author(&author), Error::::CannotBeAuthor); // Update storage - debug::trace!( + log::trace!( target:"author-inherent", "Passed ensures. About to write claimed author to storage." ); @@ -121,7 +120,7 @@ decl_module! { // Add a digest item so Apps can detect the block author // For now we use the Consensus digest item. // Maybe this will change later. - frame_system::Module::::deposit_log(DigestItem::::Consensus( + frame_system::Pallet::::deposit_log(DigestItem::::Consensus( ENGINE_ID, author.encode(), )); @@ -131,12 +130,12 @@ decl_module! { } fn on_finalize(_n: T::BlockNumber) { - debug::trace!( + log::trace!( target:"author-inherent", "In author inherent's on finalize. About to assert author was set" ); assert!(Author::::get().is_some(), "No valid author set in block"); - debug::trace!( + log::trace!( target:"author-inherent", "Finished asserting author was set (apparently it was)" ); @@ -244,7 +243,7 @@ impl ProvideInherent for Module { fn check_inherent(call: &Self::Call, _data: &InherentData) -> Result<(), Self::Error> { // We only care to check the inherent provided by this pallet. if let Self::Call::set_author(claimed_author) = call { - debug::trace!( + log::trace!( target:"author-inherent", "In the author inherent's `check_inherent` impl" ); @@ -261,9 +260,10 @@ impl ProvideInherent for Module { #[cfg(test)] mod tests { use super::*; + use crate as author_inherent; use frame_support::{ - assert_noop, assert_ok, impl_outer_origin, parameter_types, + assert_noop, assert_ok, parameter_types, traits::{OnFinalize, OnInitialize}, }; use sp_core::H256; @@ -280,20 +280,25 @@ mod tests { TestExternalities::new(t) } - impl_outer_origin! { - pub enum Origin for Test where system = frame_system {} - } - - mod author_inherent { - pub use super::super::*; - } + type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; + type Block = frame_system::mocking::MockBlock; + + // Configure a mock runtime to test the pallet. + frame_support::construct_runtime!( + pub enum Test where + Block = Block, + NodeBlock = Block, + UncheckedExtrinsic = UncheckedExtrinsic, + { + System: frame_system::{Pallet, Call, Config, Storage, Event}, + AuthorInherent: author_inherent::{Pallet, Call, Storage, Inherent}, + } + ); - #[derive(Clone, Eq, PartialEq)] - pub struct Test; parameter_types! { pub const BlockHashCount: u64 = 250; } - impl System for Test { + impl frame_system::Config for Test { type BaseCallFilter = (); type BlockWeights = (); type BlockLength = (); @@ -301,7 +306,7 @@ mod tests { type Origin = Origin; type Index = u64; type BlockNumber = u64; - type Call = (); + type Call = Call; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; @@ -310,7 +315,7 @@ mod tests { type Event = (); type BlockHashCount = BlockHashCount; type Version = (); - type PalletInfo = (); + type PalletInfo = PalletInfo; type AccountData = (); type OnNewAccount = (); type OnKilledAccount = (); @@ -322,15 +327,13 @@ mod tests { type PreliminaryCanAuthor = (); type FinalCanAuthor = (); } - type AuthorInherent = Module; - type Sys = frame_system::Module; pub fn roll_to(n: u64) { - while Sys::block_number() < n { - Sys::on_finalize(Sys::block_number()); - Sys::set_block_number(Sys::block_number() + 1); - Sys::on_initialize(Sys::block_number()); - AuthorInherent::on_initialize(Sys::block_number()); + while System::block_number() < n { + System::on_finalize(System::block_number()); + System::set_block_number(System::block_number() + 1); + System::on_initialize(System::block_number()); + AuthorInherent::on_initialize(System::block_number()); } } diff --git a/pallets/ethereum-chain-id/Cargo.toml b/pallets/ethereum-chain-id/Cargo.toml index a4cbfcfc74f8e..2b7267eb26322 100644 --- a/pallets/ethereum-chain-id/Cargo.toml +++ b/pallets/ethereum-chain-id/Cargo.toml @@ -8,8 +8,8 @@ version = "0.6.0" parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } [features] default = ["std"] diff --git a/pallets/ethereum-chain-id/src/lib.rs b/pallets/ethereum-chain-id/src/lib.rs index 81738a09a6d7b..69b6052fa25f9 100644 --- a/pallets/ethereum-chain-id/src/lib.rs +++ b/pallets/ethereum-chain-id/src/lib.rs @@ -36,7 +36,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config {} - impl Get for Module { + impl Get for Pallet { fn get() -> u64 { Self::chain_id() } diff --git a/pallets/parachain-info/Cargo.toml b/pallets/parachain-info/Cargo.toml index 99f75dca29510..5c5daeb9cae4f 100644 --- a/pallets/parachain-info/Cargo.toml +++ b/pallets/parachain-info/Cargo.toml @@ -8,17 +8,17 @@ version = "0.6.0" parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } -cumulus-primitives = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } [features] default = ["std"] std = [ "parity-scale-codec/std", "serde", - "cumulus-primitives/std", + "cumulus-primitives-core/std", "frame-support/std", "frame-system/std", ] diff --git a/pallets/parachain-info/src/lib.rs b/pallets/parachain-info/src/lib.rs index e95cd88e381bf..0610440159bd0 100644 --- a/pallets/parachain-info/src/lib.rs +++ b/pallets/parachain-info/src/lib.rs @@ -20,7 +20,7 @@ use frame_support::{decl_module, decl_storage, traits::Get}; -use cumulus_primitives::ParaId; +use cumulus_primitives_core::ParaId; /// Configuration trait of this pallet. pub trait Config: frame_system::Config {} diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml index b5714d38aba87..bad9753660861 100644 --- a/pallets/parachain-staking/Cargo.toml +++ b/pallets/parachain-staking/Cargo.toml @@ -7,17 +7,17 @@ description = "parachain staking pallet for collator selection and reward distri [dependencies] author-inherent = { path = "../author-inherent", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } [dev-dependencies] -sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } [features] default = ["std"] diff --git a/pallets/parachain-staking/src/lib.rs b/pallets/parachain-staking/src/lib.rs index 51e6da53fa78b..178503fe116e9 100644 --- a/pallets/parachain-staking/src/lib.rs +++ b/pallets/parachain-staking/src/lib.rs @@ -1144,7 +1144,7 @@ pub mod pallet { let total_staked = >::get(round_to_payout); let issuance = Self::compute_issuance(total_staked); for (val, pts) in >::drain_prefix(round_to_payout) { - let pct_due = Perbill::from_rational_approximation(pts, total); + let pct_due = Perbill::from_rational(pts, total); let mut amt_due = pct_due * issuance; if amt_due <= T::Currency::minimum_balance() { continue; @@ -1156,7 +1156,7 @@ pub mod pallet { mint(amt_due, val.clone()); } else { // pay collator first; commission + due_portion - let val_pct = Perbill::from_rational_approximation(state.bond, state.total); + let val_pct = Perbill::from_rational(state.bond, state.total); let commission = state.fee * amt_due; let val_due = if commission > T::Currency::minimum_balance() { amt_due -= commission; @@ -1168,7 +1168,7 @@ pub mod pallet { mint(val_due, val.clone()); // pay nominators due portion for Bond { owner, amount } in state.nominators { - let percent = Perbill::from_rational_approximation(amount, state.total); + let percent = Perbill::from_rational(amount, state.total); let due = percent * amt_due; mint(due, owner); } diff --git a/pallets/parachain-staking/src/mock.rs b/pallets/parachain-staking/src/mock.rs index eb0c8f49f0ee0..c94b12d772fcf 100644 --- a/pallets/parachain-staking/src/mock.rs +++ b/pallets/parachain-staking/src/mock.rs @@ -15,9 +15,10 @@ // along with Moonbeam. If not, see . //! Test utilities -use crate::*; +use super::*; +use crate as stake; use frame_support::{ - impl_outer_event, impl_outer_origin, parameter_types, + construct_runtime, parameter_types, traits::{GenesisBuild, OnFinalize, OnInitialize}, weights::Weight, }; @@ -33,24 +34,22 @@ pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; -impl_outer_origin! { - pub enum Origin for Test where system = frame_system {} -} - -mod stake { - pub use super::super::*; -} +type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; +type Block = frame_system::mocking::MockBlock; -impl_outer_event! { - pub enum MetaEvent for Test { - frame_system, - pallet_balances, - stake, +// Configure a mock runtime to test the pallet. +construct_runtime!( + pub enum Test where + Block = Block, + NodeBlock = Block, + UncheckedExtrinsic = UncheckedExtrinsic, + { + System: frame_system::{Pallet, Call, Config, Storage, Event}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Stake: stake::{Pallet, Call, Storage, Config, Event}, } -} +); -#[derive(Clone, Eq, PartialEq, Debug)] -pub struct Test; parameter_types! { pub const BlockHashCount: u64 = 250; pub const MaximumBlockWeight: Weight = 1024; @@ -64,16 +63,16 @@ impl frame_system::Config for Test { type Origin = Origin; type Index = u64; type BlockNumber = BlockNumber; - type Call = (); + type Call = Call; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = MetaEvent; + type Event = Event; type BlockHashCount = BlockHashCount; type Version = (); - type PalletInfo = (); + type PalletInfo = PalletInfo; type AccountData = pallet_balances::AccountData; type OnNewAccount = (); type OnKilledAccount = (); @@ -88,10 +87,10 @@ parameter_types! { impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = Balance; - type Event = MetaEvent; + type Event = Event; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; - type AccountStore = frame_system::Module; + type AccountStore = System; type WeightInfo = (); } parameter_types! { @@ -106,8 +105,8 @@ parameter_types! { pub const MinNominatorStk: u128 = 5; pub const MinNomination: u128 = 3; } -impl crate::pallet::Config for Test { - type Event = MetaEvent; +impl Config for Test { + type Event = Event; type Currency = Balances; type MinBlocksPerRound = MinBlocksPerRound; type DefaultBlocksPerRound = DefaultBlocksPerRound; @@ -121,9 +120,6 @@ impl crate::pallet::Config for Test { type MinNominatorStk = MinNominatorStk; type MinNomination = MinNomination; } -pub type Balances = pallet_balances::Module; -pub type Stake = Module; -pub type Sys = frame_system::Module; fn genesis( balances: Vec<(AccountId, Balance)>, @@ -144,16 +140,17 @@ fn genesis( let mut storage = frame_system::GenesisConfig::default() .build_storage::() .unwrap(); - let genesis = pallet_balances::GenesisConfig:: { balances }; - genesis.assimilate_storage(&mut storage).unwrap(); - GenesisConfig:: { + pallet_balances::GenesisConfig:: { balances } + .assimilate_storage(&mut storage) + .unwrap(); + stake::GenesisConfig:: { stakers, inflation_config, } .assimilate_storage(&mut storage) .unwrap(); let mut ext = sp_io::TestExternalities::from(storage); - ext.execute_with(|| Sys::set_block_number(1)); + ext.execute_with(|| System::set_block_number(1)); ext } @@ -253,27 +250,27 @@ pub(crate) fn one_collator_two_nominators() -> sp_io::TestExternalities { } pub(crate) fn roll_to(n: u64) { - while Sys::block_number() < n { - Stake::on_finalize(Sys::block_number()); - Balances::on_finalize(Sys::block_number()); - Sys::on_finalize(Sys::block_number()); - Sys::set_block_number(Sys::block_number() + 1); - Sys::on_initialize(Sys::block_number()); - Balances::on_initialize(Sys::block_number()); - Stake::on_initialize(Sys::block_number()); + while System::block_number() < n { + Stake::on_finalize(System::block_number()); + Balances::on_finalize(System::block_number()); + System::on_finalize(System::block_number()); + System::set_block_number(System::block_number() + 1); + System::on_initialize(System::block_number()); + Balances::on_initialize(System::block_number()); + Stake::on_initialize(System::block_number()); } } -pub(crate) fn last_event() -> MetaEvent { - Sys::events().pop().expect("Event expected").event +pub(crate) fn last_event() -> Event { + System::events().pop().expect("Event expected").event } -pub(crate) fn events() -> Vec> { - Sys::events() +pub(crate) fn events() -> Vec> { + System::events() .into_iter() .map(|r| r.event) .filter_map(|e| { - if let MetaEvent::stake(inner) = e { + if let Event::stake(inner) = e { Some(inner) } else { None diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs index 24c8c26326296..9f3f15234a070 100644 --- a/pallets/parachain-staking/src/tests.rs +++ b/pallets/parachain-staking/src/tests.rs @@ -18,7 +18,7 @@ use crate::mock::{ events, five_collators_five_nominators, five_collators_no_nominators, last_event, one_collator_two_nominators, roll_to, set_author, two_collators_four_nominators, Balances, - MetaEvent, Origin, Stake, Sys, Test, + Event as MetaEvent, Origin, Stake, System, Test, }; use crate::{CollatorStatus, Error, Event}; use frame_support::{assert_noop, assert_ok}; @@ -27,7 +27,7 @@ use sp_runtime::{traits::Zero, DispatchError, Perbill}; #[test] fn geneses() { two_collators_four_nominators().execute_with(|| { - assert!(Sys::events().is_empty()); + assert!(System::events().is_empty()); // collators assert_eq!(Balances::reserved_balance(&1), 500); assert_eq!(Balances::free_balance(&1), 500); @@ -53,7 +53,7 @@ fn geneses() { assert_eq!(Balances::reserved_balance(&9), 0); }); five_collators_five_nominators().execute_with(|| { - assert!(Sys::events().is_empty()); + assert!(System::events().is_empty()); // collators for x in 1..5 { assert!(Stake::is_candidate(&x)); @@ -145,7 +145,7 @@ fn join_collator_candidates() { assert_noop!( Stake::join_candidates(Origin::signed(8), Perbill::from_percent(2), 10u128,), DispatchError::Module { - index: 0, + index: 1, error: 3, message: Some("InsufficientBalance") } @@ -154,7 +154,7 @@ fn join_collator_candidates() { Stake::join_candidates(Origin::signed(7), Perbill::from_percent(51), 10u128,), Error::::FeeOverMax ); - assert!(Sys::events().is_empty()); + assert!(System::events().is_empty()); assert_ok!(Stake::join_candidates( Origin::signed(7), Perbill::from_percent(3), @@ -546,7 +546,7 @@ fn multiple_nominations() { assert_noop!( Stake::nominate(Origin::signed(7), 3, 11), DispatchError::Module { - index: 0, + index: 1, error: 3, message: Some("InsufficientBalance") }, @@ -634,7 +634,7 @@ fn collators_bond() { assert_noop!( Stake::candidate_bond_more(Origin::signed(1), 40), DispatchError::Module { - index: 0, + index: 1, error: 3, message: Some("InsufficientBalance") } @@ -708,7 +708,7 @@ fn nominators_bond() { assert_noop!( Stake::nominator_bond_more(Origin::signed(6), 1, 81), DispatchError::Module { - index: 0, + index: 1, error: 3, message: Some("InsufficientBalance") } diff --git a/pallets/token-dealer/Cargo.toml b/pallets/token-dealer/Cargo.toml index d099a26177776..1bbc4e6942c77 100644 --- a/pallets/token-dealer/Cargo.toml +++ b/pallets/token-dealer/Cargo.toml @@ -7,23 +7,23 @@ version = "0.6.0" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } # Cumulus dependencies -cumulus-upward-message = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } -cumulus-primitives = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } +cumulus-upward-message = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } # Polkadot dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "rococo-v1", default-features = false } [features] default = ["std"] std = [ "codec/std", "cumulus-upward-message/std", - "cumulus-primitives/std", + "cumulus-primitives-core/std", "sp-runtime/std", "frame-support/std", "frame-system/std", diff --git a/primitives/rpc/txpool/Cargo.toml b/primitives/rpc/txpool/Cargo.toml index 2c7d4c6a308cd..262c316229fc4 100644 --- a/primitives/rpc/txpool/Cargo.toml +++ b/primitives/rpc/txpool/Cargo.toml @@ -8,12 +8,11 @@ license = 'GPL-3.0-only' repository = 'https://github.com/PureStake/moonbeam/' [dependencies] -# ethereum = { git = "https://github.com/rust-blockchain/ethereum", branch = "master", features = ["with-codec"], default-features = false } -ethereum = { git = "https://github.com/notlesh/ethereum", branch = "notlesh-moonbeam-v0.6", features = ["with-codec"], default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false } +ethereum = { version = "0.7.1", default-features = false, features = ["with-codec"] } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1", default-features = false } [features] default = ["std"] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index a33e997266149..0dafb34c5f2b4 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -10,7 +10,7 @@ edition = '2018' [dependencies] serde = { version = "1.0.101", default-features = false, optional = true, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = "0.4.8" +log = "0.4" hex-literal = "0.3.1" precompiles = { path = "precompiles/", default-features = false } @@ -20,51 +20,50 @@ parachain-staking = { path = "../pallets/parachain-staking", default-features = pallet-author-filter = { path = "../pallets/author-filter", default-features = false } # Substrate dependencies -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-offchain = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-inherents = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } -frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-executive = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-sudo = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } +pallet-utility = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } -pallet-ethereum = { default-features = false, git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } -fp-rpc = { default-features = false, git = "https://github.com/purestake/frontier", branch = "v0.6-moonbeam" } +pallet-ethereum = { default-features = false, git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } +fp-rpc = { default-features = false, git = "https://github.com/purestake/frontier", branch = "notlesh-moonbeam-v0.7" } -pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +pallet-democracy = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } moonbeam-rpc-primitives-txpool = { path = "../primitives/rpc/txpool", default-features = false } # Cumulus dependencies -cumulus-runtime = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } -cumulus-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } -cumulus-primitives = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "master" } +cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "rococo-v1" } # TODO Why can't this come directly from cumulus parachain-info = { path = "../pallets/parachain-info", default-features = false } author-inherent = { path = "../pallets/author-inherent", default-features = false } [build-dependencies] -substrate-wasm-builder = { version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master" } +substrate-wasm-builder = { version = "4.0.0", git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } [features] # By default, we build the parachain runtime @@ -107,9 +106,8 @@ std = [ "pallet-scheduler/std", "author-inherent/std", "parachain-info/std", - "cumulus-runtime/std", - "cumulus-parachain-system/std", - "cumulus-primitives/std", + "cumulus-pallet-parachain-system/std", + "cumulus-primitives-core/std", "account/std", "parachain-staking/std", "pallet-author-filter/std", @@ -119,3 +117,10 @@ std = [ runtime-wasm = [ # "cumulus-upward-message/runtime-wasm", ] + +# A feature that should be enabled when the runtime should be build for on-chain +# deployment. This will disable stuff that shouldn't be part of the on-chain wasm +# to make it smaller like logging for example. +on-chain-release-build = [ + "sp-api/disable-logging", +] diff --git a/runtime/account/Cargo.toml b/runtime/account/Cargo.toml index eab362c1e1e5b..185618c4f57e1 100644 --- a/runtime/account/Cargo.toml +++ b/runtime/account/Cargo.toml @@ -13,18 +13,18 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.101", default-features = false, optional = true, features = ["derive"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = "0.4.8" +log = "0.4" hex = { version = "0.4", default-features = false } sha3 = { version = "0.8", default-features = false } blake2-rfc = { version = "0.2.18", default-features = false, optional = true } -sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } +sp-runtime-interface = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } [features] diff --git a/runtime/precompiles/Cargo.toml b/runtime/precompiles/Cargo.toml index f287da228b334..d9cd953044541 100644 --- a/runtime/precompiles/Cargo.toml +++ b/runtime/precompiles/Cargo.toml @@ -5,16 +5,16 @@ authors = ["PureStake"] edition = "2018" [dependencies] -log = "0.4.8" +log = "0.4" rustc-hex = { version = "2.0.1", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" } -pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } -# pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } -pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } -pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } -pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", default-features = false, branch = "v0.6-moonbeam" } +sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" } +pallet-evm = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } +# pallet-evm-precompile-bn128 = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } +pallet-evm-precompile-dispatch = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } +pallet-evm-precompile-modexp = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } +pallet-evm-precompile-simple = { git = "https://github.com/purestake/frontier", default-features = false, branch = "notlesh-moonbeam-v0.7" } [features] default = [ "std" ] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 6cec411c44b7c..336c8cee9cbfe 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -110,7 +110,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("moonbeam"), impl_name: create_runtime_str!("moonbeam"), authoring_version: 3, - spec_version: 26, + spec_version: 27, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -265,6 +265,7 @@ impl pallet_evm::Config for Runtime { type Runner = pallet_evm::runner::stack::Runner; type Precompiles = precompiles::MoonbeamPrecompiles; type ChainId = EthereumChainId; + type OnChargeTransaction = (); } parameter_types! { @@ -366,7 +367,7 @@ impl pallet_ethereum::Config for Runtime { type BlockGasLimit = BlockGasLimit; } -impl cumulus_parachain_system::Config for Runtime { +impl cumulus_pallet_parachain_system::Config for Runtime { type Event = Event; type OnValidationData = (); type SelfParaId = ParachainInfo; @@ -432,25 +433,25 @@ construct_runtime! { NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic { - System: frame_system::{Module, Call, Storage, Config, Event}, - Utility: pallet_utility::{Module, Call, Event}, - Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent}, - Balances: pallet_balances::{Module, Call, Storage, Config, Event}, - Sudo: pallet_sudo::{Module, Call, Storage, Config, Event}, - RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage}, - ParachainSystem: cumulus_parachain_system::{Module, Call, Storage, Inherent, Event}, - TransactionPayment: pallet_transaction_payment::{Module, Storage}, - ParachainInfo: parachain_info::{Module, Storage, Config}, - EthereumChainId: pallet_ethereum_chain_id::{Module, Storage, Config}, - EVM: pallet_evm::{Module, Config, Call, Storage, Event}, - Ethereum: pallet_ethereum::{Module, Call, Storage, Event, Config, ValidateUnsigned}, - ParachainStaking: parachain_staking::{Module, Call, Storage, Event, Config}, - Scheduler: pallet_scheduler::{Module, Storage, Config, Event, Call}, - Democracy: pallet_democracy::{Module, Storage, Config, Event, Call}, + System: frame_system::{Pallet, Call, Storage, Config, Event}, + Utility: pallet_utility::{Pallet, Call, Event}, + Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, + Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, + Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event}, + RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Call, Storage}, + ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event}, + TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, + ParachainInfo: parachain_info::{Pallet, Storage, Config}, + EthereumChainId: pallet_ethereum_chain_id::{Pallet, Storage, Config}, + EVM: pallet_evm::{Pallet, Config, Call, Storage, Event}, + Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Config, ValidateUnsigned}, + ParachainStaking: parachain_staking::{Pallet, Call, Storage, Event, Config}, + Scheduler: pallet_scheduler::{Pallet, Storage, Config, Event, Call}, + Democracy: pallet_democracy::{Pallet, Storage, Config, Event, Call}, // The order matters here. Inherents will be included in the order specified here. // Concretely we need the author inherent to come after the parachain_upgrade inherent. - AuthorInherent: author_inherent::{Module, Call, Storage, Inherent}, - AuthorFilter: pallet_author_filter::{Module, Call, Storage, Event,} + AuthorInherent: author_inherent::{Pallet, Call, Storage, Inherent}, + AuthorFilter: pallet_author_filter::{Pallet, Call, Storage, Event,} } } @@ -478,13 +479,13 @@ pub type SignedExtra = ( pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; -/// Executive: handles dispatch to the various modules. +/// Executive: handles dispatch to the various pallets. pub type Executive = frame_executive::Executive< Runtime, Block, frame_system::ChainContext, Runtime, - AllModules, + AllPallets, >; impl_runtime_apis! { @@ -533,7 +534,7 @@ impl_runtime_apis! { } fn random_seed() -> ::Hash { - RandomnessCollectiveFlip::random_seed() + RandomnessCollectiveFlip::random_seed().0 } } @@ -599,7 +600,7 @@ impl_runtime_apis! { } fn author() -> H160 { - >::find_author() + Ethereum::find_author() } fn storage_at(address: H160, index: U256) -> H256 { @@ -715,4 +716,4 @@ impl_runtime_apis! { } } -cumulus_runtime::register_validate_block!(Block, Executive); +cumulus_pallet_parachain_system::register_validate_block!(Runtime, Executive); diff --git a/rust-toolchain b/rust-toolchain index 584e8429667f7..8895ad946554f 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-10-03 +nightly-2021-01-13 diff --git a/scripts/build-alphanet-relay-image.sh b/scripts/build-alphanet-relay-image.sh index 9d8b946fe1e4d..ccd96ac999239 100755 --- a/scripts/build-alphanet-relay-image.sh +++ b/scripts/build-alphanet-relay-image.sh @@ -2,12 +2,18 @@ # Loading binary/specs variables if [ -z "$POLKADOT_COMMIT" ]; then - POLKADOT_COMMIT=`egrep -o 'paritytech/polkadot.*#([^\"]*)' Cargo.lock | \ + POLKADOT_COMMIT=`egrep -o '/polkadot.*#([^\"]*)' Cargo.lock | \ head -1 | sed 's/.*#//' | cut -c1-8` fi -echo "Using Polkadot revision #${POLKADOT_COMMIT}" +if [ -z "$POLKADOT_REPO" ]; then + POLKADOT_REPO=`egrep -o 'https://github.com/[^\/]*/polkadot\\?branch=' Cargo.lock | \ + head -1 | sed 's/?branch=//'` +fi + +echo "Using Polkadot from $POLKADOT_REPO revision #${POLKADOT_COMMIT}" docker build . -f docker/polkadot-relay.Dockerfile \ --build-arg POLKADOT_COMMIT="$POLKADOT_COMMIT" \ + --build-arg POLKADOT_REPO="$POLKADOT_REPO" \ -t purestake/moonbase-relay-testnet:sha-$POLKADOT_COMMIT diff --git a/scripts/generate-relay-specs.sh b/scripts/generate-relay-specs.sh index 44a2b640cbd45..608a295db744c 100755 --- a/scripts/generate-relay-specs.sh +++ b/scripts/generate-relay-specs.sh @@ -2,7 +2,7 @@ source scripts/_init_var.sh if [ -z "$POLKADOT_VERSION" ]; then - POLKADOT_VERSION="sha-`egrep -o 'paritytech/polkadot.*#([^\"]*)' Cargo.lock | \ + POLKADOT_VERSION="sha-`egrep -o '/polkadot.*#([^\"]*)' Cargo.lock | \ head -1 | sed 's/.*#//' | cut -c1-8`" fi diff --git a/scripts/run-alphanet-parachain.sh b/scripts/run-alphanet-parachain.sh index c1af20bd406dd..f59cb32c81c56 100755 --- a/scripts/run-alphanet-parachain.sh +++ b/scripts/run-alphanet-parachain.sh @@ -29,7 +29,7 @@ fi # Will retrieve variable from the given network NETWORK=${NETWORK:-"alphanet"} PARACHAIN_ID=$(eval echo "\$${NETWORK^^}_PARACHAIN_ID") -STAKERS=$(eval echo "\$${NETWORK^^}_STAKERS") +STAKERS=($(eval echo "\${${NETWORK^^}_STAKERS[@]}")) if [ -z "$CHAIN" ]; then CHAIN=$(eval echo "\$${NETWORK^^}_PARACHAIN_SPEC_RAW") @@ -82,6 +82,7 @@ fi echo "parachain $PARACHAIN_INDEX ($PARACHAIN_ID) - p2p-port: $((PARACHAIN_PORT + 10)), \ http-port: $((PARACHAIN_PORT + 10 + 1)), ws-port: $((PARACHAIN_PORT + 10 + 2))" +sha256sum $CHAIN $MOONBEAM_BINARY \ --node-key ${PARACHAIN_NODE_KEYS[$PARACHAIN_INDEX]} \ --port $((PARACHAIN_PORT + 10)) \ @@ -104,4 +105,5 @@ $MOONBEAM_BINARY \ --port $((PARACHAIN_PORT)) \ --rpc-port $((PARACHAIN_PORT + 1)) \ --ws-port $((PARACHAIN_PORT + 2)) \ - --chain $ROCOCO_LOCAL_RAW_SPEC; + --chain $ROCOCO_LOCAL_RAW_SPEC \ + $RELAY_BOOTNODES_ARGS; diff --git a/scripts/run-rococo-local.sh b/scripts/run-rococo-local.sh index 4dd148ae200f5..875a5a34a7b16 100755 --- a/scripts/run-rococo-local.sh +++ b/scripts/run-rococo-local.sh @@ -41,7 +41,7 @@ echo "relay ${RELAY_INDEX} - p2p-port: $((RELAY_PORT)), \ http-port: $((RELAY_PORT + 1)) , ws-port: $((RELAY_PORT + 2))" if [ -z "$POLKADOT_VERSION" ]; then - POLKADOT_VERSION="sha-`egrep -o 'paritytech/polkadot.*#([^\"]*)' Cargo.lock | \ + POLKADOT_VERSION="sha-`egrep -o '/polkadot.*#([^\"]*)' Cargo.lock | \ head -1 | sed 's/.*#//' | cut -c1-8`" fi diff --git a/specs/alphanet/parachain-specs-template.json b/specs/alphanet/parachain-specs-template.json index 1a589434a50fc..29ac641998b16 100644 --- a/specs/alphanet/parachain-specs-template.json +++ b/specs/alphanet/parachain-specs-template.json @@ -55,7 +55,7 @@ "accounts": {} }, "palletEthereum": {}, - "stake": { + "parachainStaking": { "inflationConfig": { "expect": { "min": 100000000000000000000000, diff --git a/specs/stagenet/parachain-specs-template.json b/specs/stagenet/parachain-specs-template.json index b66b884344736..90b870f3f5081 100644 --- a/specs/stagenet/parachain-specs-template.json +++ b/specs/stagenet/parachain-specs-template.json @@ -51,7 +51,7 @@ "accounts": {} }, "palletEthereum": {}, - "stake": { + "parachainStaking": { "inflationConfig": { "expect": { "min": 100000000000000000000000, diff --git a/tests/package-lock.json b/tests/package-lock.json index 5a1e599022857..9ace4c38bf690 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@babel/runtime": { - "version": "7.13.9", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz", - "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==", + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz", + "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -74,15 +74,6 @@ "@ethersproject/bytes": "^5.0.9" } }, - "@ethersproject/basex": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@ethersproject/basex/-/basex-5.0.8.tgz", - "integrity": "sha512-PCVKZIShBQUqAXjJSvaCidThPvL0jaaQZcewJc0sf8Xx05BizaOS8r3jdPdpNdY+/qZtRDqwHTSKjvR/xssyLQ==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/properties": "^5.0.7" - } - }, "@ethersproject/bignumber": { "version": "5.0.14", "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.0.14.tgz", @@ -109,40 +100,6 @@ "@ethersproject/bignumber": "^5.0.13" } }, - "@ethersproject/contracts": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.10.tgz", - "integrity": "sha512-h9kdvllwT6B1LyUXeNQIb7Y6u6ZprP5LUiQIjSqvOehhm1sFZcaVtydsSa0LIg3SBC5QF0M7zH5p7EtI2VD0rQ==", - "requires": { - "@ethersproject/abi": "^5.0.10", - "@ethersproject/abstract-provider": "^5.0.8", - "@ethersproject/abstract-signer": "^5.0.10", - "@ethersproject/address": "^5.0.9", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/constants": "^5.0.8", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7" - }, - "dependencies": { - "@ethersproject/abi": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.11.tgz", - "integrity": "sha512-ibZswQsjdFuLSfY2lbRTZM2Uk+ci7tp+mjVK0kjxVol2V32cb7va1r6B4AJU/Ac/VTstCjxtn0KKMfbkPc002w==", - "requires": { - "@ethersproject/address": "^5.0.9", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/constants": "^5.0.8", - "@ethersproject/hash": "^5.0.10", - "@ethersproject/keccak256": "^5.0.7", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/strings": "^5.0.8" - } - } - } - }, "@ethersproject/hash": { "version": "5.0.11", "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.0.11.tgz", @@ -158,45 +115,6 @@ "@ethersproject/strings": "^5.0.8" } }, - "@ethersproject/hdnode": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.9.tgz", - "integrity": "sha512-S5UMmIC6XfFtqhUK4uTjD8GPNzSbE+sZ/0VMqFnA3zAJ+cEFZuEyhZDYnl2ItGJzjT4jsy+uEy1SIl3baYK1PQ==", - "requires": { - "@ethersproject/abstract-signer": "^5.0.10", - "@ethersproject/basex": "^5.0.7", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/pbkdf2": "^5.0.7", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/sha2": "^5.0.7", - "@ethersproject/signing-key": "^5.0.8", - "@ethersproject/strings": "^5.0.8", - "@ethersproject/transactions": "^5.0.9", - "@ethersproject/wordlists": "^5.0.8" - } - }, - "@ethersproject/json-wallets": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.11.tgz", - "integrity": "sha512-0GhWScWUlXXb4qJNp0wmkU95QS3YdN9UMOfMSEl76CRANWWrmyzxcBVSXSBu5iQ0/W8wO+xGlJJ3tpA6v3mbIw==", - "requires": { - "@ethersproject/abstract-signer": "^5.0.10", - "@ethersproject/address": "^5.0.9", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/hdnode": "^5.0.8", - "@ethersproject/keccak256": "^5.0.7", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/pbkdf2": "^5.0.7", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/random": "^5.0.7", - "@ethersproject/strings": "^5.0.8", - "@ethersproject/transactions": "^5.0.9", - "aes-js": "3.0.0", - "scrypt-js": "3.0.1" - } - }, "@ethersproject/keccak256": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.0.8.tgz", @@ -226,15 +144,6 @@ "@ethersproject/logger": "^5.0.8" } }, - "@ethersproject/pbkdf2": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@ethersproject/pbkdf2/-/pbkdf2-5.0.8.tgz", - "integrity": "sha512-UlmAMGbIPaS2xXsI38FbePVTfJMuU9jnwcqVn3p88HxPF4kD897ha+l3TNsBqJqf32UbQL5GImnf1oJkSKq4vQ==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/sha2": "^5.0.7" - } - }, "@ethersproject/properties": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.0.8.tgz", @@ -243,48 +152,6 @@ "@ethersproject/logger": "^5.0.8" } }, - "@ethersproject/providers": { - "version": "5.0.21", - "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.21.tgz", - "integrity": "sha512-KyH9TylyLqspbO/2C0ph+0ZpOnb/2GkKQtpcs7IyHZ/wHXdhbClLeaBdO0b4Fpo6zAZWjgIdN6WUOMGkyy7b6A==", - "requires": { - "@ethersproject/abstract-provider": "^5.0.8", - "@ethersproject/abstract-signer": "^5.0.10", - "@ethersproject/address": "^5.0.9", - "@ethersproject/basex": "^5.0.7", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/constants": "^5.0.8", - "@ethersproject/hash": "^5.0.10", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/networks": "^5.0.7", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/random": "^5.0.7", - "@ethersproject/rlp": "^5.0.7", - "@ethersproject/sha2": "^5.0.7", - "@ethersproject/strings": "^5.0.8", - "@ethersproject/transactions": "^5.0.9", - "@ethersproject/web": "^5.0.12", - "bech32": "1.1.4", - "ws": "7.2.3" - }, - "dependencies": { - "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" - } - } - }, - "@ethersproject/random": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@ethersproject/random/-/random-5.0.8.tgz", - "integrity": "sha512-4rHtotmd9NjklW0eDvByicEkL+qareIyFSbG1ShC8tPJJSAC0g55oQWzw+3nfdRCgBHRuEE7S8EcPcTVPvZ9cA==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/logger": "^5.0.8" - } - }, "@ethersproject/rlp": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.0.8.tgz", @@ -294,27 +161,6 @@ "@ethersproject/logger": "^5.0.8" } }, - "@ethersproject/sha2": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@ethersproject/sha2/-/sha2-5.0.8.tgz", - "integrity": "sha512-ILP1ZgyvDj4rrdE+AXrTv9V88m7x87uga2VZ/FeULKPumOEw/4bGnJz/oQ8zDnDvVYRCJ+48VaQBS2CFLbk1ww==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/logger": "^5.0.8", - "hash.js": "1.1.3" - }, - "dependencies": { - "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.0" - } - } - } - }, "@ethersproject/signing-key": { "version": "5.0.10", "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.10.tgz", @@ -326,18 +172,6 @@ "elliptic": "6.5.4" } }, - "@ethersproject/solidity": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@ethersproject/solidity/-/solidity-5.0.9.tgz", - "integrity": "sha512-LIxSAYEQgLRXE3mRPCq39ou61kqP8fDrGqEeNcaNJS3aLbmAOS8MZp56uK++WsdI9hj8sNsFh78hrAa6zR9Jag==", - "requires": { - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/keccak256": "^5.0.7", - "@ethersproject/sha2": "^5.0.7", - "@ethersproject/strings": "^5.0.8" - } - }, "@ethersproject/strings": { "version": "5.0.9", "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.0.9.tgz", @@ -364,38 +198,6 @@ "@ethersproject/signing-key": "^5.0.8" } }, - "@ethersproject/units": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.0.10.tgz", - "integrity": "sha512-eaiHi9ham5lbC7qpqxpae7OY/nHJUnRUnFFuEwi2VB5Nwe3Np468OAV+e+HR+jAK4fHXQE6PFBTxWGtnZuO37g==", - "requires": { - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/constants": "^5.0.8", - "@ethersproject/logger": "^5.0.8" - } - }, - "@ethersproject/wallet": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.11.tgz", - "integrity": "sha512-2Fg/DOvUltR7aZTOyWWlQhru+SKvq2UE3uEhXSyCFgMqDQNuc2nHXh1SHJtN65jsEbjVIppOe1Q7EQMvhmeeRw==", - "requires": { - "@ethersproject/abstract-provider": "^5.0.8", - "@ethersproject/abstract-signer": "^5.0.10", - "@ethersproject/address": "^5.0.9", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/hash": "^5.0.10", - "@ethersproject/hdnode": "^5.0.8", - "@ethersproject/json-wallets": "^5.0.10", - "@ethersproject/keccak256": "^5.0.7", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/random": "^5.0.7", - "@ethersproject/signing-key": "^5.0.8", - "@ethersproject/transactions": "^5.0.9", - "@ethersproject/wordlists": "^5.0.8" - } - }, "@ethersproject/web": { "version": "5.0.13", "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.13.tgz", @@ -408,31 +210,19 @@ "@ethersproject/strings": "^5.0.8" } }, - "@ethersproject/wordlists": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@ethersproject/wordlists/-/wordlists-5.0.9.tgz", - "integrity": "sha512-Sn6MTjZkfbriod6GG6+p43W09HOXT4gwcDVNj0YoPYlo4Zq2Fk6b1CU9KUX3c6aI17PrgYb4qwZm5BMuORyqyQ==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/hash": "^5.0.10", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/strings": "^5.0.8" - } - }, "@polkadot/api": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-4.0.3.tgz", - "integrity": "sha512-jZf/NBkj6Ao7hG3I0ay7zOyDZm21tdqNRqglagBI+9Nw3wPvPL2Dz/mnGQCaeSq/fv/frY6YZQvouj4gRQzGwQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/api/-/api-4.2.1.tgz", + "integrity": "sha512-PbXwcLnZr5V5LfKsovMS0TRG+rfJp8lJxluCyOSABDpaz2h1B5R8rdYEZCmXI3qSrT0yu2C6Pp8AjTQHRd7SAA==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/api-derive": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/api-derive": "4.2.1", "@polkadot/keyring": "^6.0.5", - "@polkadot/metadata": "4.0.3", - "@polkadot/rpc-core": "4.0.3", - "@polkadot/rpc-provider": "4.0.3", - "@polkadot/types": "4.0.3", - "@polkadot/types-known": "4.0.3", + "@polkadot/metadata": "4.2.1", + "@polkadot/rpc-core": "4.2.1", + "@polkadot/rpc-provider": "4.2.1", + "@polkadot/types": "4.2.1", + "@polkadot/types-known": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/util-crypto": "^6.0.5", "@polkadot/x-rxjs": "^6.0.5", @@ -441,14 +231,14 @@ } }, "@polkadot/api-derive": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-4.0.3.tgz", - "integrity": "sha512-ADHrIoYumHJBQuIdtDEX6LPiJVZmLGBlFvlkRGYsKL7qJzRZtkzfuNgd8i3cZVDKk9mlcpldmj1DTiN3KBjH0Q==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/api-derive/-/api-derive-4.2.1.tgz", + "integrity": "sha512-TQqhK356IEk7ksMDE/tA3ZKqFEI8O8virZItd/w+RFaBs/HfbDNP8p+xPM5+6Rif3kuBzdubMv3Bdq/OIAJc6g==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/api": "4.0.3", - "@polkadot/rpc-core": "4.0.3", - "@polkadot/types": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/api": "4.2.1", + "@polkadot/rpc-core": "4.2.1", + "@polkadot/types": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/util-crypto": "^6.0.5", "@polkadot/x-rxjs": "^6.0.5", @@ -466,13 +256,13 @@ } }, "@polkadot/metadata": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/metadata/-/metadata-4.0.3.tgz", - "integrity": "sha512-w4QRpIendx0LWINS3o93weqrNenI4X5T2iOdiPYd+DkIj1k3GI9An5BWnta9e953xEtGstwW169PF/itWMKyTw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/metadata/-/metadata-4.2.1.tgz", + "integrity": "sha512-oXuKOrKTU0wys5pedKd1OVUDWK8/NoBRCrUYN8fxq3Qq/J9Sz6lF4ZbgX3w22C75l1z2+acsebiZBwlpWgKeqw==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/types": "4.0.3", - "@polkadot/types-known": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/types": "4.2.1", + "@polkadot/types-known": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/util-crypto": "^6.0.5", "bn.js": "^4.11.9" @@ -487,25 +277,25 @@ } }, "@polkadot/rpc-core": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-4.0.3.tgz", - "integrity": "sha512-BJD5OS9uYlNMNPwRSFB0oT7az9NXBapapcafi6g1O6d4rvDwmsiptKr4+hkoLhzpuZcx6rfYSsVf7oz1v1J9/g==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-core/-/rpc-core-4.2.1.tgz", + "integrity": "sha512-A67Rt7lFpdauj7O7fRGn9yhII0SpCRJ/NkHWKo/whj8RwIAuOdxLnekGC9Qr26FPi0mAqN5DBQ8vYSDUiLFXxA==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/metadata": "4.0.3", - "@polkadot/rpc-provider": "4.0.3", - "@polkadot/types": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/metadata": "4.2.1", + "@polkadot/rpc-provider": "4.2.1", + "@polkadot/types": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/x-rxjs": "^6.0.5" } }, "@polkadot/rpc-provider": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-4.0.3.tgz", - "integrity": "sha512-xddbODw+uMQrrdWWtKb39OwFqs6VFxvBHDjKmnB8IEUzKq2CIEDJG4qe3y2FfTeVCLWWxSmtxyOj0xo3jok3uw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/rpc-provider/-/rpc-provider-4.2.1.tgz", + "integrity": "sha512-Gwfs6JAD4Sp+Uz1kEtBSt1P6C3Lwn9xZ64CupU1/6w3qj9QzTFOKHKoznnekiH5HXSh53qVz2c2OSXptSrwL0Q==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/types": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/types": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/util-crypto": "^6.0.5", "@polkadot/x-fetch": "^6.0.5", @@ -516,12 +306,12 @@ } }, "@polkadot/types": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-4.0.3.tgz", - "integrity": "sha512-aLNugf0Zyde8gAkHtPh8Pp2Rw6XJUUIDe9v/Lc3siJji6aPJuzwHW9XoJYBw8A8pl0MbmrJk3js/o3hEKqmFqg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/types/-/types-4.2.1.tgz", + "integrity": "sha512-xl8QnbXiJmSm6MUZH/U/ov3ZSXMN+KgNjsTCCzfz2xR5B3eK9ClYcstYYkNSyF12K90Gut9bnNSGZvaCfT2hNQ==", "requires": { - "@babel/runtime": "^7.13.9", - "@polkadot/metadata": "4.0.3", + "@babel/runtime": "^7.13.10", + "@polkadot/metadata": "4.2.1", "@polkadot/util": "^6.0.5", "@polkadot/util-crypto": "^6.0.5", "@polkadot/x-rxjs": "^6.0.5", @@ -530,13 +320,13 @@ } }, "@polkadot/types-known": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-4.0.3.tgz", - "integrity": "sha512-XF6Ft2L3zU0E294SpySFi0fv9JIrL0YM0ftOrvqagdXopchc9Sg9XTm3uoukrT8yVu5IVWjQHyk2NwqeAlNV4A==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@polkadot/types-known/-/types-known-4.2.1.tgz", + "integrity": "sha512-/zbvzcCiv6yLhnikVWrN03uJk/3Vuer+sbK8G/pVtLOUhRYdDLOet7VPmRnjH9CGsEGJDQebu0zqW77npg5V2Q==", "requires": { - "@babel/runtime": "^7.13.9", + "@babel/runtime": "^7.13.10", "@polkadot/networks": "^6.0.5", - "@polkadot/types": "4.0.3", + "@polkadot/types": "4.2.1", "@polkadot/util": "^6.0.5", "bn.js": "^4.11.9" } @@ -699,9 +489,9 @@ "integrity": "sha512-rYff6FI+ZTKAPkJUoyz7Udq3GaoDZnxYDEvdEdFZASiA7PoErltHezDishqQiSDWrGxvxmplH304jyzQmjp0AQ==" }, "@types/mocha": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz", - "integrity": "sha512-NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ==" + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz", + "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==" }, "@types/node": { "version": "14.14.28", @@ -755,11 +545,6 @@ "negotiator": "0.6.2" } }, - "aes-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.0.0.tgz", - "integrity": "sha1-4h3xCtbCBTKVvLuNq0Cwnb6ofk0=" - }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -908,11 +693,6 @@ } } }, - "bech32": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz", - "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" - }, "bignumber.js": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz", @@ -1026,9 +806,9 @@ }, "dependencies": { "bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==" } } }, @@ -1049,9 +829,9 @@ }, "dependencies": { "bn.js": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz", - "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==" } } }, @@ -1159,15 +939,15 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chai": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.0.tgz", - "integrity": "sha512-/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", "deep-eql": "^3.0.1", "get-func-name": "^2.0.0", - "pathval": "^1.1.0", + "pathval": "^1.1.1", "type-detect": "^4.0.5" } }, @@ -1273,9 +1053,9 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1607,26 +1387,24 @@ } }, "es-abstract": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", - "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "version": "1.18.0-next.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz", + "integrity": "sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw==", "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", - "get-intrinsic": "^1.1.1", + "get-intrinsic": "^1.0.2", "has": "^1.0.3", - "has-symbols": "^1.0.2", - "is-callable": "^1.2.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.2", - "is-string": "^1.0.5", + "is-regex": "^1.1.1", "object-inspect": "^1.9.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", - "string.prototype.trimend": "^1.0.4", - "string.prototype.trimstart": "^1.0.4", - "unbox-primitive": "^1.0.0" + "string.prototype.trimend": "^1.0.3", + "string.prototype.trimstart": "^1.0.3" } }, "es-to-primitive": { @@ -1775,103 +1553,6 @@ "rlp": "^2.2.3" } }, - "ethers": { - "version": "5.0.28", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.0.28.tgz", - "integrity": "sha512-prYYCmZMGbrhP2PEXA2re5BpNPjaCP2y5gO1dh1i+fPxdkldQOk+0c0l8KlnxwUztKq4E40xpB0gyURdcAOaAg==", - "requires": { - "@ethersproject/abi": "5.0.11", - "@ethersproject/abstract-provider": "5.0.9", - "@ethersproject/abstract-signer": "5.0.12", - "@ethersproject/address": "5.0.10", - "@ethersproject/base64": "5.0.8", - "@ethersproject/basex": "5.0.8", - "@ethersproject/bignumber": "5.0.14", - "@ethersproject/bytes": "5.0.10", - "@ethersproject/constants": "5.0.9", - "@ethersproject/contracts": "5.0.10", - "@ethersproject/hash": "5.0.11", - "@ethersproject/hdnode": "5.0.9", - "@ethersproject/json-wallets": "5.0.11", - "@ethersproject/keccak256": "5.0.8", - "@ethersproject/logger": "5.0.9", - "@ethersproject/networks": "5.0.8", - "@ethersproject/pbkdf2": "5.0.8", - "@ethersproject/properties": "5.0.8", - "@ethersproject/providers": "5.0.21", - "@ethersproject/random": "5.0.8", - "@ethersproject/rlp": "5.0.8", - "@ethersproject/sha2": "5.0.8", - "@ethersproject/signing-key": "5.0.9", - "@ethersproject/solidity": "5.0.9", - "@ethersproject/strings": "5.0.9", - "@ethersproject/transactions": "5.0.10", - "@ethersproject/units": "5.0.10", - "@ethersproject/wallet": "5.0.11", - "@ethersproject/web": "5.0.13", - "@ethersproject/wordlists": "5.0.9" - }, - "dependencies": { - "@ethersproject/abi": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.0.11.tgz", - "integrity": "sha512-ibZswQsjdFuLSfY2lbRTZM2Uk+ci7tp+mjVK0kjxVol2V32cb7va1r6B4AJU/Ac/VTstCjxtn0KKMfbkPc002w==", - "requires": { - "@ethersproject/address": "^5.0.9", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/constants": "^5.0.8", - "@ethersproject/hash": "^5.0.10", - "@ethersproject/keccak256": "^5.0.7", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7", - "@ethersproject/strings": "^5.0.8" - } - }, - "@ethersproject/abstract-signer": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.0.12.tgz", - "integrity": "sha512-qt4jAEzQGPZ31My1gFGPzzJHJveYhVycW7RHkuX0W8fvMdg7wr0uvP7mQEptMVrb+jYwsVktCf6gBGwWDpFiTA==", - "requires": { - "@ethersproject/abstract-provider": "^5.0.8", - "@ethersproject/bignumber": "^5.0.13", - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7" - } - }, - "@ethersproject/signing-key": { - "version": "5.0.9", - "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.0.9.tgz", - "integrity": "sha512-AobnsEiLv+Z4a/NbbelwB/Lsnc+qxeNejXDlEwbo/nwjijvxLpwiNN+rjx/lQGel1QnQ/d+lEv7xezyUaXdKFQ==", - "requires": { - "@ethersproject/bytes": "^5.0.9", - "@ethersproject/logger": "^5.0.8", - "@ethersproject/properties": "^5.0.7", - "elliptic": "6.5.3" - } - }, - "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "js-sha3": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.7.tgz", - "integrity": "sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc=" - } - } - }, "ethjs-unit": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", @@ -2140,9 +1821,9 @@ } }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "requires": { "is-glob": "^4.0.1" } @@ -2206,11 +1887,6 @@ "function-bind": "^1.1.1" } }, - "has-bigints": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", - "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==" - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -2222,9 +1898,9 @@ "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" }, "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" }, "has-to-string-tag-x": { "version": "1.4.1", @@ -2367,11 +2043,6 @@ "call-bind": "^1.0.0" } }, - "is-bigint": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz", - "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==" - }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -2380,14 +2051,6 @@ "binary-extensions": "^2.0.0" } }, - "is-boolean-object": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz", - "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==", - "requires": { - "call-bind": "^1.0.0" - } - }, "is-callable": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", @@ -2441,11 +2104,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, - "is-number-object": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz", - "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==" - }, "is-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", @@ -2475,11 +2133,6 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, - "is-string": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", - "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==" - }, "is-symbol": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", @@ -2743,9 +2396,9 @@ } }, "mocha": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.0.tgz", - "integrity": "sha512-TQqyC89V1J/Vxx0DhJIXlq9gbbL9XFNdeLQ1+JsnZsVaSOV1z3tWfw0qZmQJGQRIfkvZcs7snQnZnOCKoldq1Q==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz", + "integrity": "sha512-UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg==", "requires": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", @@ -3454,20 +3107,20 @@ } }, "string.prototype.trimend": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", - "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", + "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", "requires": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.0", "define-properties": "^1.1.3" } }, "string.prototype.trimstart": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", - "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", + "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", "requires": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.0", "define-properties": "^1.1.3" } }, @@ -3708,17 +3361,6 @@ "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" }, - "unbox-primitive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz", - "integrity": "sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA==", - "requires": { - "function-bind": "^1.1.1", - "has-bigints": "^1.0.0", - "has-symbols": "^1.0.0", - "which-boxed-primitive": "^1.0.1" - } - }, "underscore": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", @@ -3847,9 +3489,9 @@ }, "dependencies": { "@types/node": { - "version": "12.20.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz", - "integrity": "sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ==" + "version": "12.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.1.tgz", + "integrity": "sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==" } } }, @@ -3868,9 +3510,9 @@ }, "dependencies": { "@types/node": { - "version": "12.20.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz", - "integrity": "sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ==" + "version": "12.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.1.tgz", + "integrity": "sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==" } } }, @@ -4062,9 +3704,9 @@ }, "dependencies": { "@types/node": { - "version": "12.20.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.4.tgz", - "integrity": "sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ==" + "version": "12.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.1.tgz", + "integrity": "sha512-tCkE96/ZTO+cWbln2xfyvd6ngHLanvVlJ3e5BeirJ3BYI5GbAyubIrmV4JjjugDly5D9fHjOL5MNsqsCnqwW6g==" } } }, @@ -4174,18 +3816,6 @@ "isexe": "^2.0.0" } }, - "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" - } - }, "which-typed-array": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz", @@ -4234,9 +3864,9 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -4369,9 +3999,9 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", diff --git a/tests/package.json b/tests/package.json index efc26b84c962f..3c1b8b718fc17 100644 --- a/tests/package.json +++ b/tests/package.json @@ -10,13 +10,13 @@ "author": "", "license": "ISC", "dependencies": { - "@polkadot/api": "^4.0.3", - "@polkadot/types": "^4.0.3", + "@polkadot/api": "^4.2.1", + "@polkadot/types": "^4.2.1", "@types/chai": "^4.2.11", - "@types/mocha": "^8.0.0", - "chai": "^4.2.0", + "@types/mocha": "^8.2.2", + "chai": "^4.3.4", "ethers": "^5.0.28", - "mocha": "^8.1.3", + "mocha": "^8.3.2", "mocha-steps": "^1.3.0", "rimraf": "^3.0.2", "ts-node": "9.1", diff --git a/tests/tests/test-block.ts b/tests/tests/test-block.ts index 1480ce0a937a8..d83fa3f209a93 100644 --- a/tests/tests/test-block.ts +++ b/tests/tests/test-block.ts @@ -27,7 +27,7 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { number: 0, receiptsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - totalDifficulty: null, + totalDifficulty: "0", transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", }); @@ -97,7 +97,7 @@ describeWithMoonbeam("Moonbeam RPC (Block)", `simple-specs.json`, (context) => { //parentHash: "0x04540257811b46d103d9896e7807040e7de5080e285841c5430d1a81588a0ce4", receiptsRoot: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347", - totalDifficulty: null, + totalDifficulty: "0", //transactions: [], transactionsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", //uncles: [] diff --git a/tests/tests/test-filter-api.ts b/tests/tests/test-filter-api.ts index 0915232ddf674..0da84cc85d0f9 100644 --- a/tests/tests/test-filter-api.ts +++ b/tests/tests/test-filter-api.ts @@ -9,6 +9,10 @@ describeWithMoonbeam("Moonbeam RPC (EthFilterApi)", `simple-specs.json`, (contex const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + // This reflects the measured gas cost of the transaction at this current point in time. + // It has been known to fluctuate from release to release, so it may need adjustment. + const EXPECTED_TRANSACTION_GAS_COST = 891328; + const TEST_CONTRACT_BYTECODE = "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffff" + @@ -126,7 +130,7 @@ describeWithMoonbeam("Moonbeam RPC (EthFilterApi)", `simple-specs.json`, (contex data: TEST_CONTRACT_BYTECODE, value: "0x00", gasPrice: "0x01", - gas: "0x4F930", + gas: "0x" + EXPECTED_TRANSACTION_GAS_COST.toString(16), }, GENESIS_ACCOUNT_PRIVATE_KEY ); diff --git a/tests/tests/test-subscription.ts b/tests/tests/test-subscription.ts index e473294471059..7106a302d1bd1 100644 --- a/tests/tests/test-subscription.ts +++ b/tests/tests/test-subscription.ts @@ -21,6 +21,10 @@ describeWithMoonbeam( const GENESIS_ACCOUNT_PRIVATE_KEY = "0x99B3C12287537E38C90A9219D4CB074A89A16E9CDB20BF85728EBD97C343E342"; + // This reflects the measured gas cost of the transaction at this current point in time. + // It has been known to fluctuate from release to release, so it may need adjustment. + const EXPECTED_TRANSACTION_GAS_COST = 891328; + const TEST_CONTRACT_BYTECODE = "0x608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffff" + "ffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffff" + @@ -118,14 +122,15 @@ describeWithMoonbeam( "647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332" + "303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ff" + "abf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032"; - async function sendTransaction(context) { + async function sendTransaction(context, extraData = {}) { const tx = await context.web3.eth.accounts.signTransaction( { from: GENESIS_ACCOUNT, data: TEST_CONTRACT_BYTECODE, value: "0x00", gasPrice: "0x01", - gas: "0x4F930", + gas: "0x" + EXPECTED_TRANSACTION_GAS_COST.toString(16), + ...extraData, }, GENESIS_ACCOUNT_PRIVATE_KEY ); @@ -493,6 +498,29 @@ describeWithMoonbeam( expect(data).to.not.be.null; }); + + step("should not receive log when contract fails", async function () { + const subscription = web3Subscribe("logs", {}); + + await new Promise((resolve) => { + subscription.once("connected", resolve); + }); + + await sendTransaction(context, { + gas: "0x" + (EXPECTED_TRANSACTION_GAS_COST - 1).toString(16), // lower than expected by 1 + }); + + const data = await new Promise((resolve) => { + createAndFinalizeBlock(context.polkadotApi); + let result = null; + subscription.once("data", (d) => (result = d)); + setTimeout(() => resolve(result), 1000); + // wait for 1 second to make sure a notification would have time to arrive. + // (This one is not supposed to arrive because the transaction ran out of gas.) + }); + subscription.unsubscribe(); + expect(data).to.be.null; + }); }, "ws" ); diff --git a/tests/tests/test-web3api.ts b/tests/tests/test-web3api.ts index e7682ec5ab633..d5a35b52f990f 100644 --- a/tests/tests/test-web3api.ts +++ b/tests/tests/test-web3api.ts @@ -28,7 +28,7 @@ describeWithMoonbeam("Moonbeam RPC (Web3Api)", `simple-specs.json`, (context) => // TODO: this is really just testing that the result comes back as a string, not that it's // expressed in hex (as opposed to decimal) - expect(result.result).to.be.equal("0"); + expect(result.result).to.be.equal("0x0"); expect(typeof result.result).to.be.equal("string"); }); });