From 3e3e5337dcf89fdfeac957631693d86a5479f3c9 Mon Sep 17 00:00:00 2001 From: nanocryk <6422796+nanocryk@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:02:31 +0000 Subject: [PATCH] Update deps --- Cargo.lock | 1016 +++++++++-------- client/consensus/Cargo.toml | 22 +- client/db/Cargo.toml | 6 +- client/mapping-sync/Cargo.toml | 8 +- client/rpc/Cargo.toml | 26 +- client/rpc/src/eth.rs | 520 +++++---- client/rpc/src/eth_pubsub.rs | 20 +- frame/base-fee/Cargo.toml | 10 +- frame/dynamic-fee/Cargo.toml | 16 +- frame/dynamic-fee/src/tests.rs | 1 + frame/ethereum/Cargo.toml | 16 +- frame/ethereum/src/lib.rs | 3 +- frame/ethereum/src/mock.rs | 1 + frame/evm/Cargo.toml | 18 +- frame/evm/precompile/blake2/Cargo.toml | 4 +- frame/evm/precompile/bn128/Cargo.toml | 4 +- frame/evm/precompile/curve25519/Cargo.toml | 6 +- frame/evm/precompile/dispatch/Cargo.toml | 6 +- frame/evm/precompile/ed25519/Cargo.toml | 4 +- frame/evm/precompile/modexp/Cargo.toml | 4 +- frame/evm/precompile/sha3fips/Cargo.toml | 4 +- frame/evm/precompile/simple/Cargo.toml | 4 +- frame/evm/src/lib.rs | 1 + frame/evm/src/mock.rs | 1 + primitives/consensus/Cargo.toml | 6 +- primitives/evm/Cargo.toml | 4 +- primitives/rpc/Cargo.toml | 10 +- primitives/self-contained/Cargo.toml | 8 +- .../self-contained/src/checked_extrinsic.rs | 6 +- template/node/Cargo.toml | 62 +- template/runtime/Cargo.toml | 54 +- 31 files changed, 989 insertions(+), 882 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5890396ec0..13f8fd9bb1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -256,7 +256,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "pin-utils", "slab", "wasm-bindgen-futures", @@ -299,11 +299,11 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", ] [[package]] @@ -312,11 +312,11 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", ] [[package]] @@ -365,9 +365,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.61" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" dependencies = [ "addr2line", "cc", @@ -402,6 +402,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "bimap" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" + [[package]] name = "bindgen" version = "0.59.1" @@ -531,6 +537,15 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "block-buffer" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03588e54c62ae6d763e2a80090d50353b785795361b4ff5b3bf0a5097fc31c0b" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "block-padding" version = "0.1.5" @@ -611,15 +626,9 @@ dependencies = [ [[package]] name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cache-padded" @@ -806,6 +815,15 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "crypto-mac" version = "0.7.0" @@ -982,6 +1000,17 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.1", + "crypto-common", + "generic-array 0.14.4", +] + [[package]] name = "directories" version = "4.0.1" @@ -1018,6 +1047,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + [[package]] name = "dyn-clonable" version = "0.9.0" @@ -1112,7 +1147,7 @@ name = "ethereum" version = "0.11.1" source = "git+https://github.com/purestake/ethereum?branch=tgm-0.11.1-typeinfo-patch#42ee428264e27773da5e93f264f0aa7daf1a8a7f" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "ethereum-types", "hash-db", "hash256-std-hasher", @@ -1278,7 +1313,7 @@ dependencies = [ "fp-consensus", "fp-rpc", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "log", "sc-client-api", "sp-api", @@ -1356,7 +1391,7 @@ checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "log", "num-traits", "parity-scale-codec", @@ -1376,12 +1411,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - [[package]] name = "fixedbitset" version = "0.4.0" @@ -1410,7 +1439,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", ] @@ -1488,7 +1517,7 @@ version = "2.0.0" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "frame-support", "frame-system", @@ -1498,6 +1527,7 @@ dependencies = [ "paste", "scale-info", "sp-api", + "sp-application-crypto", "sp-io", "sp-runtime", "sp-runtime-interface", @@ -1507,9 +1537,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.0.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96616f82e069102b95a72c87de4c84d2f87ef7f0f20630e78ce3824436483110" +checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -1520,7 +1550,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "bitflags", "frame-metadata", @@ -1549,7 +1579,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1561,7 +1591,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.1.0", @@ -1573,7 +1603,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "proc-macro2", "quote", @@ -1583,7 +1613,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "frame-support", "log", @@ -1664,9 +1694,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -1674,9 +1704,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" @@ -1692,9 +1722,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -1707,18 +1737,16 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "autocfg", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -1737,21 +1765,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" - -[[package]] -name = "futures-timer" -version = "2.0.2" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-timer" @@ -1761,11 +1783,10 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "autocfg", "futures 0.1.31", "futures-channel", "futures-core", @@ -1774,10 +1795,8 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -1836,9 +1855,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "glob" @@ -1872,6 +1891,25 @@ dependencies = [ "web-sys", ] +[[package]] +name = "h2" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" +dependencies = [ + "bytes 1.1.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hash-db" version = "0.15.2" @@ -1896,6 +1934,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" +dependencies = [ + "ahash", +] + [[package]] name = "heck" version = "0.3.3" @@ -1995,9 +2042,9 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "fnv", - "itoa", + "itoa 0.4.7", ] [[package]] @@ -2006,9 +2053,9 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "http", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", ] [[package]] @@ -2025,20 +2072,21 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "hyper" -version = "0.14.14" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "httparse", "httpdate", - "itoa", - "pin-project-lite 0.2.7", + "itoa 0.4.7", + "pin-project-lite 0.2.8", "socket2 0.4.1", "tokio", "tower-service", @@ -2167,14 +2215,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "instant" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", ] @@ -2188,16 +2236,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "intervalier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64fa110ec7b8f493f416eed552740d10e7030ad5f63b2308f82c9608ec2df275" -dependencies = [ - "futures 0.3.17", - "futures-timer 2.0.2", -] - [[package]] name = "iovec" version = "0.1.4" @@ -2209,9 +2247,9 @@ dependencies = [ [[package]] name = "ip_network" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b746553d2f4a1ca26fab939943ddfb217a091f34f53571620a8e3d30691303" +checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" @@ -2246,6 +2284,12 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "jobserver" version = "0.1.24" @@ -2369,7 +2413,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "globset", "jsonrpc-core", @@ -2477,9 +2521,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.107" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "libloading" @@ -2509,12 +2553,12 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "libp2p" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9004c06878ef8f3b4b4067e69a140d87ed20bf777287f82223e49713b36ee433" +checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" dependencies = [ "atomic", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "lazy_static", "libp2p-core", @@ -2525,12 +2569,14 @@ dependencies = [ "libp2p-identify", "libp2p-kad", "libp2p-mdns", + "libp2p-metrics", "libp2p-mplex", "libp2p-noise", "libp2p-ping", "libp2p-plaintext", "libp2p-pnet", "libp2p-relay", + "libp2p-rendezvous", "libp2p-request-response", "libp2p-swarm", "libp2p-swarm-derive", @@ -2541,16 +2587,16 @@ dependencies = [ "libp2p-yamux", "multiaddr", "parking_lot", - "pin-project 1.0.8", + "pin-project 1.0.10", "smallvec", "wasm-timer", ] [[package]] name = "libp2p-core" -version = "0.29.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9b4abdeaa420593a297c8592f63fad4234f4b88dc9343b8fd8e736c35faa59" +checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c" dependencies = [ "asn1_der", "bs58", @@ -2558,18 +2604,19 @@ dependencies = [ "either", "fnv", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", + "instant", "lazy_static", - "libsecp256k1 0.5.0", + "libsecp256k1 0.7.0", "log", "multiaddr", "multihash 0.14.0", "multistream-select", "parking_lot", - "pin-project 1.0.8", - "prost 0.8.0", - "prost-build 0.8.0", - "rand 0.7.3", + "pin-project 1.0.10", + "prost", + "prost-build", + "rand 0.8.4", "ring", "rw-stream-sink", "sha2 0.9.8", @@ -2582,9 +2629,9 @@ dependencies = [ [[package]] name = "libp2p-deflate" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66097fccc0b7f8579f90a03ea76ba6196332ea049fd07fd969490a06819dcdc8" +checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" dependencies = [ "flate2", "futures 0.3.17", @@ -2593,9 +2640,9 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ff08b3196b85a17f202d80589e93b1660a574af67275706657fdc762e42c32" +checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" dependencies = [ "async-std-resolver", "futures 0.3.17", @@ -2607,9 +2654,9 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404eca8720967179dac7a5b4275eb91f904a53859c69ca8d018560ad6beb214f" +checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" dependencies = [ "cuckoofilter", "fnv", @@ -2617,30 +2664,30 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "smallvec", ] [[package]] name = "libp2p-gossipsub" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cc48709bcbc3a3321f08a73560b4bbb4166a7d56f6fdb615bc775f4f91058e" +checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" dependencies = [ "asynchronous-codec 0.6.0", "base64 0.13.0", "byteorder", - "bytes 1.0.1", + "bytes 1.1.0", "fnv", "futures 0.3.17", "hex_fmt", "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "regex", "sha2 0.9.8", @@ -2651,37 +2698,38 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b61f6cf07664fb97016c318c4d4512b3dd4cc07238607f3f0163245f99008e" +checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" dependencies = [ "futures 0.3.17", "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "lru 0.6.6", + "prost", + "prost-build", "smallvec", "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ed78489c87924235665a0ab345b298ee34dff0f7ad62c0ba6608b2144fb75e" +checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "either", "fnv", "futures 0.3.17", "libp2p-core", "libp2p-swarm", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.7.3", "sha2 0.9.8", "smallvec", @@ -2693,9 +2741,9 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a29e6cbc2a24b8471b6567e580a0e8e7b70a6d0f0ea2be0844d1e842d7d4fa33" +checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" dependencies = [ "async-io", "data-encoding", @@ -2712,14 +2760,28 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-metrics" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +dependencies = [ + "libp2p-core", + "libp2p-identify", + "libp2p-kad", + "libp2p-ping", + "libp2p-swarm", + "open-metrics-client", +] + [[package]] name = "libp2p-mplex" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313d9ea526c68df4425f580024e67a9d3ffd49f2c33de5154b1f5019816f7a99" +checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "log", @@ -2732,18 +2794,18 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1db7212f342b6ba7c981cc40e31f76e9e56cb48e65fa4c142ecaca5839523e" +checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "curve25519-dalek 3.2.0", "futures 0.3.17", "lazy_static", "libp2p-core", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "rand 0.8.4", "sha2 0.9.8", "snow", @@ -2754,9 +2816,9 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2482cfd9eb0b7a0baaf3e7b329dc4f2785181a161b1a47b7192f8d758f54a439" +checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" dependencies = [ "futures 0.3.17", "libp2p-core", @@ -2769,30 +2831,30 @@ dependencies = [ [[package]] name = "libp2p-plaintext" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b4783e5423870b9a5c199f65a7a3bc66d86ab56b2b9beebf3c338d889cf8e4" +checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "log", - "prost 0.8.0", - "prost-build 0.8.0", + "prost", + "prost-build", "unsigned-varint 0.7.0", "void", ] [[package]] name = "libp2p-pnet" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cb4dd4b917e5b40ddefe49b96b07adcd8d342e0317011d175b7b2bb1dcc974" +checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ "futures 0.3.17", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "salsa20", "sha3 0.9.1", @@ -2800,20 +2862,20 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0133f6cfd81cdc16e716de2982e012c62e6b9d4f12e41967b3ee361051c622aa" +checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "pin-project 1.0.8", - "prost 0.8.0", - "prost-build 0.8.0", + "pin-project 1.0.10", + "prost", + "prost-build", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.0", @@ -2821,20 +2883,41 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "libp2p-rendezvous" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +dependencies = [ + "asynchronous-codec 0.6.0", + "bimap", + "futures 0.3.17", + "libp2p-core", + "libp2p-swarm", + "log", + "prost", + "prost-build", + "rand 0.8.4", + "sha2 0.9.8", + "thiserror", + "unsigned-varint 0.7.0", + "void", + "wasm-timer", +] + [[package]] name = "libp2p-request-response" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cdae44b6821466123af93cbcdec7c9e6ba9534a8af9cdc296446d39416d241" +checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" dependencies = [ "async-trait", - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.6", - "minicbor", + "lru 0.7.0", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.0", @@ -2843,9 +2926,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7083861341e1555467863b4cd802bea1e8c4787c0f7b5110097d0f1f3248f9a9" +checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" dependencies = [ "either", "futures 0.3.17", @@ -2859,9 +2942,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8cb308d4fc854869f5abb54fdab0833d2cf670d407c745849dc47e6e08d79c" +checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" dependencies = [ "quote", "syn", @@ -2869,13 +2952,13 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79edd26b6b4bb5feee210dcda562dca186940dfecb0024b979c3f50824b3bf28" +checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "async-io", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "if-watch", "ipnet", "libc", @@ -2886,9 +2969,9 @@ dependencies = [ [[package]] name = "libp2p-uds" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280e793440dd4e9f273d714f4497325c72cddb0fe85a49f9a03c88f41dd20182" +checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" dependencies = [ "async-std", "futures 0.3.17", @@ -2898,9 +2981,9 @@ dependencies = [ [[package]] name = "libp2p-wasm-ext" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f553b7140fad3d7a76f50497b0ea591e26737d9607428a75509fc191e4d1b1f6" +checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" dependencies = [ "futures 0.3.17", "js-sys", @@ -2912,9 +2995,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf99dcbf5063e9d59087f61b1e85c686ceab2f5abedb472d32288065c0e5e27" +checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" dependencies = [ "either", "futures 0.3.17", @@ -2930,9 +3013,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214cc0dd9c37cbed27f0bb1eba0c41bbafdb93a8be5e9d6ae1e6b4b42cd044bf" +checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ "futures 0.3.17", "libp2p-core", @@ -2979,9 +3062,9 @@ dependencies = [ "base64 0.12.3", "digest 0.9.0", "hmac-drbg 0.3.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", + "libsecp256k1-core 0.2.2", + "libsecp256k1-gen-ecmult 0.2.1", + "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3", "serde", "sha2 0.9.8", @@ -2990,18 +3073,18 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" +checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" dependencies = [ "arrayref", - "base64 0.12.3", + "base64 0.13.0", "digest 0.9.0", "hmac-drbg 0.3.0", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand 0.7.3", + "libsecp256k1-core 0.3.0", + "libsecp256k1-gen-ecmult 0.3.0", + "libsecp256k1-gen-genmult 0.3.0", + "rand 0.8.4", "serde", "sha2 0.9.8", "typenum", @@ -3018,13 +3101,33 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle 2.4.1", +] + [[package]] name = "libsecp256k1-gen-ecmult" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -3033,7 +3136,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -3074,9 +3186,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -3097,7 +3209,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -3106,7 +3218,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -3194,12 +3306,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de006e09d04fc301a5f7e817b75aa49801c4479a8af753764416b085337ddcc5" +checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.11.2", "parity-util-mem", ] @@ -3221,26 +3333,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "minicbor" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51aa5bb0ca22415daca596a227b507f880ad1b2318a87fa9325312a5d285ca0d" -dependencies = [ - "minicbor-derive", -] - -[[package]] -name = "minicbor-derive" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54999f917cd092b13904737e26631aa2b2b88d625db68e4bab461dcd8006c788" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "miniz_oxide" version = "0.4.4" @@ -3401,10 +3493,10 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d91ec0a2440aaff5f78ec35631a7027d50386c6163aa975f7caa0d5da4b6ff8" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures 0.3.17", "log", - "pin-project 1.0.8", + "pin-project 1.0.10", "smallvec", "unsigned-varint 0.7.0", ] @@ -3616,9 +3708,9 @@ dependencies = [ [[package]] name = "object" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55827317fb4c08822499848a14237d2874d6f139828893017237e7ab93eb386" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] @@ -3641,6 +3733,29 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "open-metrics-client" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7337d80c23c2d8b1349563981bc4fb531220733743ba8115454a67b181173f0d" +dependencies = [ + "dtoa", + "itoa 0.4.7", + "open-metrics-client-derive-text-encode", + "owning_ref", +] + +[[package]] +name = "open-metrics-client-derive-text-encode" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c83b586f00268c619c1cb3340ec1a6f59dd9ba1d9833a273a68e6d5cd8ffc" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "openssl-probe" version = "0.1.4" @@ -3659,7 +3774,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3850,7 +3965,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "frame-benchmarking", "frame-support", @@ -3866,9 +3981,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb5195cb862b13055cf7f7a76c55073dc73885c2a61511e322b8c1666be7332" +checksum = "68de01cff53da5574397233383dd7f5c15ee958c348245765ea8cb09f2571e6b" dependencies = [ "blake2-rfc", "crc32fast", @@ -3937,7 +4052,7 @@ checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" dependencies = [ "cfg-if 1.0.0", "ethereum-types", - "hashbrown", + "hashbrown 0.11.2", "impl-trait-for-tuples", "lru 0.6.6", "parity-util-mem-derive", @@ -3990,9 +4105,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -4001,9 +4116,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if 1.0.0", "instant", @@ -4064,49 +4179,39 @@ dependencies = [ "ucd-trie", ] -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset 0.2.0", - "indexmap", -] - [[package]] name = "petgraph" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "fixedbitset 0.4.0", + "fixedbitset", "indexmap", ] [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.29", ] [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.8", + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -4115,9 +4220,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -4132,9 +4237,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -4247,23 +4352,11 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -4282,42 +4375,14 @@ dependencies = [ "thiserror", ] -[[package]] -name = "prost" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" -dependencies = [ - "bytes 1.0.1", - "prost-derive 0.8.0", -] - [[package]] name = "prost" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.0.1", - "prost-derive 0.9.0", -] - -[[package]] -name = "prost-build" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" -dependencies = [ - "bytes 1.0.1", - "heck", - "itertools", - "log", - "multimap", - "petgraph 0.5.1", - "prost 0.8.0", - "prost-types 0.8.0", - "tempfile", - "which", + "bytes 1.1.0", + "prost-derive", ] [[package]] @@ -4326,33 +4391,20 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "heck", "itertools", "lazy_static", "log", "multimap", - "petgraph 0.6.0", - "prost 0.9.0", - "prost-types 0.9.0", + "petgraph", + "prost", + "prost-types", "regex", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.9.0" @@ -4366,35 +4418,14 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" -dependencies = [ - "bytes 1.0.1", - "prost 0.8.0", -] - [[package]] name = "prost-types" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.0.1", - "prost 0.9.0", -] - -[[package]] -name = "pwasm-utils" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880b3384fb00b8f6ecccd5d358b93bd2201900ae3daad213791d1864f6441f5c" -dependencies = [ - "byteorder", - "log", - "parity-wasm", + "bytes 1.1.0", + "prost", ] [[package]] @@ -4664,7 +4695,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "rustc-hex", ] @@ -4748,7 +4779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ "futures 0.3.17", - "pin-project 0.4.28", + "pin-project 0.4.29", "static_assertions", ] @@ -4760,9 +4791,9 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "salsa20" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" +checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686" dependencies = [ "cipher", ] @@ -4770,7 +4801,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "log", "sp-core", @@ -4781,7 +4812,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -4797,7 +4828,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -4814,7 +4845,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -4825,7 +4856,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "fnv", "futures 0.3.17", @@ -4853,7 +4884,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "hash-db", "kvdb", @@ -4878,11 +4909,11 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "libp2p", "log", "parking_lot", @@ -4902,11 +4933,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "lazy_static", - "libsecp256k1 0.6.0", + "libsecp256k1 0.7.0", "log", + "lru 0.6.6", "parity-scale-codec", "parking_lot", "sc-executor-common", @@ -4928,25 +4960,25 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "derive_more", "environmental", "parity-scale-codec", - "pwasm-utils", "sc-allocator", "sp-core", "sp-maybe-compressed-blob", "sp-serializer", "sp-wasm-interface", "thiserror", + "wasm-instrument", "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "log", "parity-scale-codec", @@ -4962,11 +4994,11 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "ansi_term", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-util-mem", "sc-client-api", @@ -4979,7 +5011,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "derive_more", @@ -4994,20 +5026,20 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", - "bytes 1.0.1", + "bytes 1.1.0", "cid", "derive_more", "either", "fnv", "fork-tree", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "hex", "ip_network", "libp2p", @@ -5017,9 +5049,9 @@ dependencies = [ "lru 0.7.0", "parity-scale-codec", "parking_lot", - "pin-project 1.0.8", - "prost 0.8.0", - "prost-build 0.9.0", + "pin-project 1.0.10", + "prost", + "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -5045,16 +5077,15 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "fnv", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "hex", "hyper", "hyper-rustls", - "log", "num_cpus", "once_cell", "parity-scale-codec", @@ -5068,12 +5099,13 @@ dependencies = [ "sp-offchain", "sp-runtime", "threadpool", + "tracing", ] [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "libp2p", @@ -5086,7 +5118,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "hash-db", @@ -5117,7 +5149,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -5142,7 +5174,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -5159,13 +5191,13 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "directories", "exit-future", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", @@ -5173,7 +5205,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "parking_lot", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", "sc-chain-spec", @@ -5223,7 +5255,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "log", "parity-scale-codec", @@ -5237,14 +5269,14 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "chrono", "futures 0.3.17", "libp2p", "log", "parking_lot", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "serde", "serde_json", @@ -5255,7 +5287,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "ansi_term", "atty", @@ -5286,7 +5318,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", @@ -5297,10 +5329,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", - "intervalier", + "futures-timer", "linked-hash-map", "log", "parity-scale-codec", @@ -5324,7 +5356,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "derive_more", "futures 0.3.17", @@ -5338,11 +5370,12 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "lazy_static", + "parking_lot", "prometheus", ] @@ -5474,18 +5507,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.127" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -5494,11 +5527,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.68" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -5553,6 +5586,17 @@ dependencies = [ "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures 0.2.1", + "digest 0.10.1", +] + [[package]] name = "sha3" version = "0.8.2" @@ -5689,24 +5733,24 @@ dependencies = [ [[package]] name = "soketto" -version = "0.4.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88" +checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.12.3", - "bytes 0.5.6", + "base64 0.13.0", + "bytes 1.1.0", "flate2", "futures 0.3.17", "httparse", "log", - "rand 0.7.3", + "rand 0.8.4", "sha-1 0.9.7", ] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "hash-db", "log", @@ -5723,7 +5767,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "blake2-rfc", "proc-macro-crate 1.1.0", @@ -5734,8 +5778,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "scale-info", @@ -5747,8 +5791,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "integer-sqrt", "num-traits", @@ -5763,7 +5807,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "sp-api", @@ -5775,7 +5819,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "log", @@ -5793,11 +5837,11 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "futures 0.3.17", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-core", @@ -5811,8 +5855,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.1.0-dev" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "base58", "bitflags", @@ -5826,7 +5870,7 @@ dependencies = [ "hex", "impl-serde", "lazy_static", - "libsecp256k1 0.6.0", + "libsecp256k1 0.7.0", "log", "merlin", "num-traits", @@ -5840,7 +5884,7 @@ dependencies = [ "schnorrkel", "secrecy", "serde", - "sha2 0.9.8", + "sha2 0.10.1", "sp-core-hashing", "sp-debug-derive", "sp-externalities", @@ -5859,12 +5903,12 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "blake2-rfc", "byteorder", - "sha2 0.9.8", + "sha2 0.10.1", "sp-std", "tiny-keccak", "twox-hash", @@ -5873,7 +5917,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "proc-macro2", "quote", @@ -5884,7 +5928,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "kvdb", "parking_lot", @@ -5892,8 +5936,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "proc-macro2", "quote", @@ -5902,8 +5946,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "0.10.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "environmental", "parity-scale-codec", @@ -5914,7 +5958,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "finality-grandpa", "log", @@ -5932,7 +5976,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -5945,12 +5989,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "futures 0.3.17", "hash-db", - "libsecp256k1 0.6.0", + "libsecp256k1 0.7.0", "log", "parity-scale-codec", "parking_lot", @@ -5969,8 +6013,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "0.10.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "derive_more", @@ -5987,7 +6031,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "zstd", ] @@ -5995,7 +6039,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "sp-api", "sp-core", @@ -6004,8 +6048,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "backtrace", "lazy_static", @@ -6015,7 +6059,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "rustc-hash", "serde", @@ -6024,8 +6068,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.1.0-dev" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "either", "hash256-std-hasher", @@ -6046,8 +6090,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.1.0-dev" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6063,8 +6107,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "Inflector", "proc-macro-crate 1.1.0", @@ -6076,7 +6120,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "serde", "serde_json", @@ -6085,7 +6129,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "scale-info", @@ -6099,7 +6143,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "scale-info", @@ -6109,8 +6153,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "0.10.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "hash-db", "log", @@ -6132,13 +6176,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" [[package]] name = "sp-storage" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6151,7 +6195,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "log", "sp-core", @@ -6164,10 +6208,10 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", - "futures-timer 3.0.2", + "futures-timer", "log", "parity-scale-codec", "sp-api", @@ -6179,8 +6223,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "sp-std", @@ -6192,7 +6236,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "sp-api", "sp-runtime", @@ -6201,7 +6245,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-trait", "log", @@ -6216,8 +6260,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.0.0" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "hash-db", "memory-db", @@ -6232,13 +6276,14 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", + "sp-core-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -6248,7 +6293,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -6258,10 +6303,11 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "4.0.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +version = "4.1.0-dev" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "impl-trait-for-tuples", + "log", "parity-scale-codec", "sp-std", "wasmi", @@ -6275,9 +6321,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "ss58-registry" -version = "1.5.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66cd4c4bb7ee41dc5b0c13d600574ae825d3a02e8f31326b17ac71558f2c836" +checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" dependencies = [ "Inflector", "proc-macro2", @@ -6341,7 +6387,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.13#c881b9c86df5d0e4e3607921598768a3ab8ccdc8" +source = "git+https://github.com/purestake/substrate?branch=moonbeam-polkadot-v0.9.16#355a422dbe751fb6b798fb453dd32123d4ee1b3d" dependencies = [ "async-std", "derive_more", @@ -6366,9 +6412,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -6501,17 +6547,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.10.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ - "autocfg", - "bytes 1.0.1", + "bytes 1.1.0", "libc", "memchr", "mio 0.7.13", "num_cpus", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "winapi 0.3.9", ] @@ -6533,7 +6578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ "futures-core", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tokio", ] @@ -6543,11 +6588,11 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ - "bytes 1.0.1", + "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tokio", ] @@ -6573,7 +6618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.8", "tracing-attributes", "tracing-core", ] @@ -6604,7 +6649,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project 1.0.10", "tracing", ] @@ -6654,12 +6699,12 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.22.6" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac131e334e81b6b3be07399482042838adcd7957aa0010231d0813e39e02fa" +checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" dependencies = [ "hash-db", - "hashbrown", + "hashbrown 0.12.0", "log", "rustc-hex", "smallvec", @@ -6667,9 +6712,9 @@ dependencies = [ [[package]] name = "trie-root" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652931506d2c1244d7217a70b99f56718a7b4161b37f04e7cd868072a99f68cd" +checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891" dependencies = [ "hash-db", ] @@ -6741,9 +6786,9 @@ checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" [[package]] name = "twox-hash" -version = "1.6.1" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", "rand 0.8.4", @@ -6833,7 +6878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" dependencies = [ "asynchronous-codec 0.5.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures-io", "futures-util", ] @@ -6845,7 +6890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f8d425fafb8cd76bc3f22aace4af471d3156301d7508f2107e98fbeae10bc7f" dependencies = [ "asynchronous-codec 0.6.0", - "bytes 1.0.1", + "bytes 1.1.0", "futures-io", "futures-util", ] @@ -7001,6 +7046,15 @@ version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" +[[package]] +name = "wasm-instrument" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e5b0401bbb6c887f54e69b8c496ea36f704df65db73e81fd5ff8dc3e63a9f" +dependencies = [ + "parity-wasm", +] + [[package]] name = "wasm-timer" version = "0.2.5" @@ -7181,18 +7235,18 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.2" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.1.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1" +checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb" dependencies = [ "proc-macro2", "quote", diff --git a/client/consensus/Cargo.toml b/client/consensus/Cargo.toml index 35b65bb3b8..2a278c4ad3 100644 --- a/client/consensus/Cargo.toml +++ b/client/consensus/Cargo.toml @@ -9,21 +9,21 @@ repository = "https://github.com/paritytech/frontier/" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } -sp-core = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus" } fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" } fc-db = { version = "2.0.0-dev", path = "../db" } -sp-consensus = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-consensus = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } log = "0.4.8" futures = { version = "0.3.17", features = ["compat"] } -sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } derive_more = "0.99.2" -prometheus-endpoint = { version = "0.10.0-dev", package = "substrate-prometheus-endpoint", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +prometheus-endpoint = { version = "0.10.0-dev", package = "substrate-prometheus-endpoint", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } async-trait = "0.1" \ No newline at end of file diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index fa5c012046..6126317fa4 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -8,9 +8,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0" repository = "https://github.com/paritytech/frontier/" [dependencies] -sp-core = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-database = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-database = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-ethereum = { version = "4.0.0-dev", path = "../../frame/ethereum" } fp-storage = { version = "2.0.0-dev", path = "../../primitives/storage"} kvdb = "0.10.0" diff --git a/client/mapping-sync/Cargo.toml b/client/mapping-sync/Cargo.toml index 2618b54597..c030b53362 100644 --- a/client/mapping-sync/Cargo.toml +++ b/client/mapping-sync/Cargo.toml @@ -7,10 +7,10 @@ description = "Mapping sync logic for Frontier." license = "GPL-3.0-or-later WITH Classpath-exception-2.0" [dependencies] -sp-runtime = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-runtime = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus" } fc-consensus = { version = "2.0.0-dev", path = "../consensus" } fc-db = { version = "2.0.0-dev", path = "../db" } diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml index 776c9897a0..cdf5f43e0e 100644 --- a/client/rpc/Cargo.toml +++ b/client/rpc/Cargo.toml @@ -20,19 +20,19 @@ fc-rpc-core = { version = "1.1.0-dev", path = "../rpc-core" } fp-consensus = { version = "2.0.0-dev", path = "../../primitives/consensus" } fp-rpc = { version = "3.0.0-dev", path = "../../primitives/rpc" } fp-storage = { version = "2.0.0-dev", path = "../../primitives/storage"} -sp-io = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-storage = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-io = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-storage = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-evm = { version = "6.0.0-dev", path = "../../frame/evm" } fp-evm = { version = "3.0.0-dev", path = "../../primitives/evm" } pallet-ethereum = { version = "4.0.0-dev", path = "../../frame/ethereum" } diff --git a/client/rpc/src/eth.rs b/client/rpc/src/eth.rs index 0e32b12f1e..fee16be87c 100644 --- a/client/rpc/src/eth.rs +++ b/client/rpc/src/eth.rs @@ -82,8 +82,10 @@ pub struct EthApi EthApi where C: ProvideRuntimeApi, - C::Api: sp_api::ApiExt + BlockBuilder - + ConvertTransactionRuntimeApi + EthereumRuntimeRPCApi, + C::Api: sp_api::ApiExt + + BlockBuilder + + ConvertTransactionRuntimeApi + + EthereumRuntimeRPCApi, B: BlockT + Send + Sync + 'static, A: ChainApi + 'static, C: Send + Sync + 'static, @@ -540,8 +542,10 @@ impl EthApiT for EthApi + StorageProvider, C: HeaderBackend + HeaderMetadata + 'static, - C::Api: sp_api::ApiExt + BlockBuilder - + ConvertTransactionRuntimeApi + EthereumRuntimeRPCApi, + C::Api: sp_api::ApiExt + + BlockBuilder + + ConvertTransactionRuntimeApi + + EthereumRuntimeRPCApi, BE: Backend + 'static, BE::State: StateBackend, B: BlockT + Send + Sync + 'static, @@ -734,18 +738,16 @@ where // Indexers heavily rely on the parent hash. // Moonbase client-level patch for inconsistent runtime 1200 state. let number = rich_block.inner.header.number.unwrap_or_default(); - if rich_block.inner.header.parent_hash == H256::default() - && number > U256::zero() { - if let Ok(Some(parent)) = self.block_by_number( - BlockNumber::Num((number - 1).low_u64()), - false - ) { - rich_block.inner.header.parent_hash = parent.inner.header.hash.unwrap_or_default(); + if rich_block.inner.header.parent_hash == H256::default() && number > U256::zero() { + if let Ok(Some(parent)) = + self.block_by_number(BlockNumber::Num((number - 1).low_u64()), false) + { + rich_block.inner.header.parent_hash = + parent.inner.header.hash.unwrap_or_default(); } } Ok(Some(rich_block)) - - }, + } _ => Ok(None), } } @@ -796,13 +798,12 @@ where // Indexers heavily rely on the parent hash. // Moonbase client-level patch for inconsistent runtime 1200 state. let number = rich_block.inner.header.number.unwrap_or_default(); - if rich_block.inner.header.parent_hash == H256::default() - && number > U256::zero() { - if let Ok(Some(parent)) = self.block_by_number( - BlockNumber::Num((number - 1).low_u64()), - false - ) { - rich_block.inner.header.parent_hash = parent.inner.header.hash.unwrap_or_default(); + if rich_block.inner.header.parent_hash == H256::default() && number > U256::zero() { + if let Ok(Some(parent)) = + self.block_by_number(BlockNumber::Num((number - 1).low_u64()), false) + { + rich_block.inner.header.parent_hash = + parent.inner.header.hash.unwrap_or_default(); } } Ok(Some(rich_block)) @@ -1046,40 +1047,58 @@ where let transaction_hash = transaction.hash(); let block_id = BlockId::hash(self.client.info().best_hash); - let api_version = match self.client - .runtime_api() - .api_version::>(&block_id) { + let api_version = match self + .client + .runtime_api() + .api_version::>(&block_id) + { Ok(api_version) => api_version, - _ => return Box::pin(future::err(internal_err("cannot access runtime api"))) + _ => return Box::pin(future::err(internal_err("cannot access runtime api"))), }; let extrinsic = match api_version { - Some(2) => match self.client.runtime_api() - .convert_transaction(&block_id, transaction) { - Ok(extrinsic) => extrinsic, - Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), - }, - Some(1) => if let ethereum::TransactionV2::Legacy(legacy_transaction) = transaction { - #[allow(deprecated)] - match self.client.runtime_api() - .convert_transaction_before_version_2(&block_id, legacy_transaction) { + Some(2) => match self + .client + .runtime_api() + .convert_transaction(&block_id, transaction) + { + Ok(extrinsic) => extrinsic, + Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), + }, + Some(1) => { + if let ethereum::TransactionV2::Legacy(legacy_transaction) = transaction { + #[allow(deprecated)] + match self + .client + .runtime_api() + .convert_transaction_before_version_2(&block_id, legacy_transaction) + { Ok(extrinsic) => extrinsic, - Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), + Err(_) => { + return Box::pin(future::err(internal_err("cannot access runtime api"))) + } } - } else { - return Box::pin(future::err(internal_err("This runtime not support eth transactions v2"))); - }, - None => return Box::pin(future::err(internal_err("ConvertTransactionRuntimeApi not found"))), - _ => return Box::pin(future::err(internal_err("The version of ConvertTransactionRuntimeApi is not supported by this client"))), + } else { + return Box::pin(future::err(internal_err( + "This runtime not support eth transactions v2", + ))); + } + } + None => { + return Box::pin(future::err(internal_err( + "ConvertTransactionRuntimeApi not found", + ))) + } + _ => { + return Box::pin(future::err(internal_err( + "The version of ConvertTransactionRuntimeApi is not supported by this client", + ))) + } }; Box::pin( self.pool - .submit_one( - &block_id, - TransactionSource::Local, - extrinsic, - ) + .submit_one(&block_id, TransactionSource::Local, extrinsic) .map_ok(move |_| transaction_hash) .map_err(|err| internal_err(F::pool_error(err))), ) @@ -1113,40 +1132,58 @@ where let transaction_hash = transaction.hash(); let block_id = BlockId::hash(self.client.info().best_hash); - let api_version = match self.client - .runtime_api() - .api_version::>(&block_id) { + let api_version = match self + .client + .runtime_api() + .api_version::>(&block_id) + { Ok(api_version) => api_version, - _ => return Box::pin(future::err(internal_err("cannot access runtime api"))) + _ => return Box::pin(future::err(internal_err("cannot access runtime api"))), }; let extrinsic = match api_version { - Some(2) => match self.client.runtime_api() - .convert_transaction(&block_id, transaction) { - Ok(extrinsic) => extrinsic, - Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), - }, - Some(1) => if let ethereum::TransactionV2::Legacy(legacy_transaction) = transaction { - #[allow(deprecated)] - match self.client.runtime_api() - .convert_transaction_before_version_2(&block_id, legacy_transaction) { + Some(2) => match self + .client + .runtime_api() + .convert_transaction(&block_id, transaction) + { + Ok(extrinsic) => extrinsic, + Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), + }, + Some(1) => { + if let ethereum::TransactionV2::Legacy(legacy_transaction) = transaction { + #[allow(deprecated)] + match self + .client + .runtime_api() + .convert_transaction_before_version_2(&block_id, legacy_transaction) + { Ok(extrinsic) => extrinsic, - Err(_) => return Box::pin(future::err(internal_err("cannot access runtime api"))), + Err(_) => { + return Box::pin(future::err(internal_err("cannot access runtime api"))) + } } - } else { - return Box::pin(future::err(internal_err("This runtime not support eth transactions v2"))); - }, - None => return Box::pin(future::err(internal_err("ConvertTransactionRuntimeApi not found"))), - _ => return Box::pin(future::err(internal_err("The version of ConvertTransactionRuntimeApi is not supported by this client"))), + } else { + return Box::pin(future::err(internal_err( + "This runtime not support eth transactions v2", + ))); + } + } + None => { + return Box::pin(future::err(internal_err( + "ConvertTransactionRuntimeApi not found", + ))) + } + _ => { + return Box::pin(future::err(internal_err( + "The version of ConvertTransactionRuntimeApi is not supported by this client", + ))) + } }; Box::pin( self.pool - .submit_one( - &block_id, - TransactionSource::Local, - extrinsic, - ) + .submit_one(&block_id, TransactionSource::Local, extrinsic) .map_ok(move |_| transaction_hash) .map_err(|err| internal_err(F::pool_error(err))), ) @@ -1204,13 +1241,11 @@ where Some(amount) => amount, None => { let block = if api_version > 1 { - api - .current_block(&id) + api.current_block(&id) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? } else { #[allow(deprecated)] - let legacy_block = api - .current_block_before_version_2(&id) + let legacy_block = api.current_block_before_version_2(&id) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))?; if let Some(block) = legacy_block { Some(block.into()) @@ -1446,7 +1481,9 @@ where if let Some(from) = request.from { let gas_price = gas_price.unwrap_or_default(); if gas_price > U256::zero() { - let balance = self.client.runtime_api() + let balance = self + .client + .runtime_api() .account_basic(&BlockId::Hash(best_hash), from) .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? .balance; @@ -1481,154 +1518,157 @@ where let client = self.client.clone(); // Create a helper to check if a gas allowance results in an executable transaction - let executable = - move |request: CallRequest, gas_limit, api_version, estimate_mode| -> Result { - let CallRequest { - from, - to, - gas, - value, - data, - nonce, - access_list, - .. - } = request; - - // Fresh instance per execution - let api = client.runtime_api(); - - // Use request gas limit only if it less than gas_limit parameter - let gas_limit = core::cmp::min(gas.unwrap_or(gas_limit), gas_limit); - - let data = data.map(|d| d.0).unwrap_or_default(); - - let (exit_reason, data, used_gas) = match to { - Some(to) => { - let info = if api_version == 1 { - // Legacy pre-london - #[allow(deprecated)] - api.call_before_version_2( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - to, - data, - value.unwrap_or_default(), - gas_limit, - gas_price, - nonce, - estimate_mode, - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - } else if api_version < 4 { - // Post-london - #[allow(deprecated)] - api.call_before_version_4( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - to, - data, - value.unwrap_or_default(), - gas_limit, - max_fee_per_gas, - max_priority_fee_per_gas, - nonce, - estimate_mode, - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - } else { - // Post-london + access list support - let access_list = access_list.unwrap_or_default(); - api.call( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - to, - data, - value.unwrap_or_default(), - gas_limit, - max_fee_per_gas, - max_priority_fee_per_gas, - nonce, - estimate_mode, - Some( - access_list - .into_iter() - .map(|item| (item.address, item.storage_keys)) - .collect(), - ), - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - }; - - (info.exit_reason, info.value, info.used_gas) - } - None => { - let info = if api_version == 1 { - // Legacy pre-london - #[allow(deprecated)] - api.create_before_version_2( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - data, - value.unwrap_or_default(), - gas_limit, - gas_price, - nonce, - estimate_mode, - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - } else if api_version < 4 { - // Post-london - #[allow(deprecated)] - api.create_before_version_4( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - data, - value.unwrap_or_default(), - gas_limit, - max_fee_per_gas, - max_priority_fee_per_gas, - nonce, - estimate_mode, - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - } else { - // Post-london + access list support - let access_list = access_list.unwrap_or_default(); - api.create( - &BlockId::Hash(best_hash), - from.unwrap_or_default(), - data, - value.unwrap_or_default(), - gas_limit, - max_fee_per_gas, - max_priority_fee_per_gas, - nonce, - estimate_mode, - Some( - access_list - .into_iter() - .map(|item| (item.address, item.storage_keys)) - .collect(), - ), - ) - .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? - .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? - }; - - (info.exit_reason, Vec::new(), info.used_gas) - } - }; - Ok(ExecutableResult { - exit_reason, - data, - used_gas, - }) + let executable = move |request: CallRequest, + gas_limit, + api_version, + estimate_mode| + -> Result { + let CallRequest { + from, + to, + gas, + value, + data, + nonce, + access_list, + .. + } = request; + + // Fresh instance per execution + let api = client.runtime_api(); + + // Use request gas limit only if it less than gas_limit parameter + let gas_limit = core::cmp::min(gas.unwrap_or(gas_limit), gas_limit); + + let data = data.map(|d| d.0).unwrap_or_default(); + + let (exit_reason, data, used_gas) = match to { + Some(to) => { + let info = if api_version == 1 { + // Legacy pre-london + #[allow(deprecated)] + api.call_before_version_2( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + to, + data, + value.unwrap_or_default(), + gas_limit, + gas_price, + nonce, + estimate_mode, + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + } else if api_version < 4 { + // Post-london + #[allow(deprecated)] + api.call_before_version_4( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + to, + data, + value.unwrap_or_default(), + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + estimate_mode, + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + } else { + // Post-london + access list support + let access_list = access_list.unwrap_or_default(); + api.call( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + to, + data, + value.unwrap_or_default(), + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + estimate_mode, + Some( + access_list + .into_iter() + .map(|item| (item.address, item.storage_keys)) + .collect(), + ), + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + }; + + (info.exit_reason, info.value, info.used_gas) + } + None => { + let info = if api_version == 1 { + // Legacy pre-london + #[allow(deprecated)] + api.create_before_version_2( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + data, + value.unwrap_or_default(), + gas_limit, + gas_price, + nonce, + estimate_mode, + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + } else if api_version < 4 { + // Post-london + #[allow(deprecated)] + api.create_before_version_4( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + data, + value.unwrap_or_default(), + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + estimate_mode, + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + } else { + // Post-london + access list support + let access_list = access_list.unwrap_or_default(); + api.create( + &BlockId::Hash(best_hash), + from.unwrap_or_default(), + data, + value.unwrap_or_default(), + gas_limit, + max_fee_per_gas, + max_priority_fee_per_gas, + nonce, + estimate_mode, + Some( + access_list + .into_iter() + .map(|item| (item.address, item.storage_keys)) + .collect(), + ), + ) + .map_err(|err| internal_err(format!("runtime error: {:?}", err)))? + .map_err(|err| internal_err(format!("execution fatal: {:?}", err)))? + }; + + (info.exit_reason, Vec::new(), info.used_gas) + } }; + Ok(ExecutableResult { + exit_reason, + data, + used_gas, + }) + }; let api_version = if let Ok(Some(api_version)) = self.client .runtime_api() @@ -1669,7 +1709,12 @@ where data, exit_reason, used_gas: _, - } = executable(request.clone(), get_current_block_gas_limit()?, api_version, estimate_mode)?; + } = executable( + request.clone(), + get_current_block_gas_limit()?, + api_version, + estimate_mode, + )?; match exit_reason { ExitReason::Succeed(_) => { return Err(internal_err(format!( @@ -1746,14 +1791,15 @@ where let api = self.client.runtime_api(); let best_block: BlockId = BlockId::Hash(self.client.info().best_hash); - let api_version = - if let Ok(Some(api_version)) = api.api_version::>(&best_block) { - api_version - } else { - return Err(internal_err(format!( - "failed to retrieve Runtime Api version" - ))); - }; + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(&best_block) + { + api_version + } else { + return Err(internal_err(format!( + "failed to retrieve Runtime Api version" + ))); + }; // If the transaction is not yet mapped in the frontier db, // check for it in the transaction pool. let mut xts: Vec<::Extrinsic> = Vec::new(); @@ -1777,17 +1823,17 @@ where ); let ethereum_transactions: Vec = if api_version > 1 { - api - .extrinsic_filter(&best_block, xts) - .map_err(|err| { - internal_err(format!("fetch runtime extrinsic filter failed: {:?}", err)) - })? + api.extrinsic_filter(&best_block, xts).map_err(|err| { + internal_err(format!("fetch runtime extrinsic filter failed: {:?}", err)) + })? } else { #[allow(deprecated)] - let legacy = api - .extrinsic_filter_before_version_2(&best_block, xts) + let legacy = api.extrinsic_filter_before_version_2(&best_block, xts) .map_err(|err| { - internal_err(format!("fetch runtime extrinsic filter failed: {:?}", err)) + internal_err(format!( + "fetch runtime extrinsic filter failed: {:?}", + err + )) })?; legacy.into_iter().map(|tx| tx.into()).collect() }; diff --git a/client/rpc/src/eth_pubsub.rs b/client/rpc/src/eth_pubsub.rs index 82a374913e..6f4beaa4f3 100644 --- a/client/rpc/src/eth_pubsub.rs +++ b/client/rpc/src/eth_pubsub.rs @@ -353,25 +353,27 @@ where let api = client.runtime_api(); - let api_version = - if let Ok(Some(api_version)) = api.api_version::>(&best_block) { - api_version - } else { - return futures::future::ready(None); - }; + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(&best_block) + { + api_version + } else { + return futures::future::ready(None); + }; let xts = vec![xt.data().clone()]; - + let txs: Option> = if api_version > 1 { api.extrinsic_filter(&best_block, xts).ok() } else { #[allow(deprecated)] - if let Ok(legacy) = api.extrinsic_filter_before_version_2(&best_block, xts) { + if let Ok(legacy) = + api.extrinsic_filter_before_version_2(&best_block, xts) + { Some(legacy.into_iter().map(|tx| tx.into()).collect()) } else { None } - }; let res = match txs { diff --git a/frame/base-fee/Cargo.toml b/frame/base-fee/Cargo.toml index 859cbb67a2..a6f4f11b7b 100644 --- a/frame/base-fee/Cargo.toml +++ b/frame/base-fee/Cargo.toml @@ -14,15 +14,15 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-evm = { path = "../evm", default-features = false } scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } [dev-dependencies] -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } [features] default = ["std"] diff --git a/frame/dynamic-fee/Cargo.toml b/frame/dynamic-fee/Cargo.toml index 2744e15430..754ddf8989 100644 --- a/frame/dynamic-fee/Cargo.toml +++ b/frame/dynamic-fee/Cargo.toml @@ -10,18 +10,18 @@ license = "Apache-2.0" pallet-evm = { path = "../evm", version = "6.0.0-dev", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } serde = { version = "1.0.101", optional = true } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-inherents = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } async-trait = "0.1" scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } [dev-dependencies] -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } [features] default = ["std"] diff --git a/frame/dynamic-fee/src/tests.rs b/frame/dynamic-fee/src/tests.rs index 3b2f97db32..cb0472d66c 100644 --- a/frame/dynamic-fee/src/tests.rs +++ b/frame/dynamic-fee/src/tests.rs @@ -68,6 +68,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } frame_support::parameter_types! { diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml index 57ffbcc3da..a72c5d7270 100644 --- a/frame/ethereum/Cargo.toml +++ b/frame/ethereum/Cargo.toml @@ -11,14 +11,14 @@ resolver = "2" rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.101", optional = true } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-evm = { version = "6.0.0-dev", default-features = false, path = "../evm" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } evm = { version = "0.33.1", features = ["with-codec"], default-features = false } ethereum = { version = "0.11.1", default-features = false, features = ["with-codec"] } @@ -33,7 +33,7 @@ scale-info = { version = "1.0.0", default-features = false, features = ["derive" num_enum = { version = "0.5.4", default-features = false } [dev-dependencies] -sp-core = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } libsecp256k1 = { version = "0.5", features = ["static-context", "hmac"] } [features] diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs index ecce965846..dc8193a525 100644 --- a/frame/ethereum/src/lib.rs +++ b/frame/ethereum/src/lib.rs @@ -49,7 +49,7 @@ use sp_std::{marker::PhantomData, prelude::*}; pub use ethereum::{ AccessListItem, BlockV2 as Block, LegacyTransactionMessage, Log, ReceiptV3 as Receipt, - TransactionAction, TransactionV2 as Transaction, TransactionV0 as LegacyTransaction + TransactionAction, TransactionV0 as LegacyTransaction, TransactionV2 as Transaction, }; pub use fp_rpc::TransactionStatus; @@ -180,6 +180,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::without_storage_info] pub struct Pallet(PhantomData); #[pallet::origin] diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs index 3e69333b15..036f28034d 100644 --- a/frame/ethereum/src/mock.rs +++ b/frame/ethereum/src/mock.rs @@ -81,6 +81,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/frame/evm/Cargo.toml b/frame/evm/Cargo.toml index 29fa604413..436f4e3af3 100644 --- a/frame/evm/Cargo.toml +++ b/frame/evm/Cargo.toml @@ -15,15 +15,15 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false, optional = true } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-timestamp = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false, optional = true } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } primitive-types = { version = "0.10.0", default-features = false, features = ["rlp", "byteorder"] } rlp = { version = "0.5", default-features = false } diff --git a/frame/evm/precompile/blake2/Cargo.toml b/frame/evm/precompile/blake2/Cargo.toml index 22702be359..49fe8abe92 100644 --- a/frame/evm/precompile/blake2/Cargo.toml +++ b/frame/evm/precompile/blake2/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "BLAKE2 precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } [dev-dependencies] diff --git a/frame/evm/precompile/bn128/Cargo.toml b/frame/evm/precompile/bn128/Cargo.toml index 2e1fb5ba5f..aa149b6a6d 100644 --- a/frame/evm/precompile/bn128/Cargo.toml +++ b/frame/evm/precompile/bn128/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "BN128 precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } bn = { package = "substrate-bn", version = "0.6", default-features = false } diff --git a/frame/evm/precompile/curve25519/Cargo.toml b/frame/evm/precompile/curve25519/Cargo.toml index 5f403e5271..fb5dc3fa2a 100644 --- a/frame/evm/precompile/curve25519/Cargo.toml +++ b/frame/evm/precompile/curve25519/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/paritytech/frontier/" description = "Curve25519 elliptic curve precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } diff --git a/frame/evm/precompile/dispatch/Cargo.toml b/frame/evm/precompile/dispatch/Cargo.toml index adaa498606..6c0d012554 100644 --- a/frame/evm/precompile/dispatch/Cargo.toml +++ b/frame/evm/precompile/dispatch/Cargo.toml @@ -9,9 +9,9 @@ repository = "https://github.com/paritytech/frontier/" description = "DISPATCH precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-evm = { version = "6.0.0-dev", default-features = false, path = "../.." } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } diff --git a/frame/evm/precompile/ed25519/Cargo.toml b/frame/evm/precompile/ed25519/Cargo.toml index ff4b9be093..91a26c330a 100644 --- a/frame/evm/precompile/ed25519/Cargo.toml +++ b/frame/evm/precompile/ed25519/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "ED25519 precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } ed25519-dalek = { version = "1.0.0", features = ["alloc", "u64_backend"], default-features = false } diff --git a/frame/evm/precompile/modexp/Cargo.toml b/frame/evm/precompile/modexp/Cargo.toml index 7218ae3401..bfdd5bbb08 100644 --- a/frame/evm/precompile/modexp/Cargo.toml +++ b/frame/evm/precompile/modexp/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "MODEXP precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } num = { version = "0.4", features = ["alloc"], default-features = false } diff --git a/frame/evm/precompile/sha3fips/Cargo.toml b/frame/evm/precompile/sha3fips/Cargo.toml index 25d3ad38ac..17a7dde214 100644 --- a/frame/evm/precompile/sha3fips/Cargo.toml +++ b/frame/evm/precompile/sha3fips/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "SHA3 FIPS202 precompile for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } tiny-keccak = { version = "2.0", features = ["fips202"] } diff --git a/frame/evm/precompile/simple/Cargo.toml b/frame/evm/precompile/simple/Cargo.toml index 867888f39a..fb9c172515 100644 --- a/frame/evm/precompile/simple/Cargo.toml +++ b/frame/evm/precompile/simple/Cargo.toml @@ -9,8 +9,8 @@ repository = "https://github.com/paritytech/frontier/" description = "Simple precompiles for EVM pallet." [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../../../primitives/evm" } ripemd160 = { version = "0.9", default-features = false } diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs index c1264a134d..17858d6265 100644 --- a/frame/evm/src/lib.rs +++ b/frame/evm/src/lib.rs @@ -100,6 +100,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] + #[pallet::without_storage_info] pub struct Pallet(_); #[pallet::config] diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs index 16f19849a8..ba4ef07435 100644 --- a/frame/evm/src/mock.rs +++ b/frame/evm/src/mock.rs @@ -70,6 +70,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); + type MaxConsumers = frame_support::traits::ConstU32<16>; } parameter_types! { diff --git a/primitives/consensus/Cargo.toml b/primitives/consensus/Cargo.toml index 4e11fbc7f3..4ee5350390 100644 --- a/primitives/consensus/Cargo.toml +++ b/primitives/consensus/Cargo.toml @@ -9,9 +9,9 @@ homepage = "https://substrate.io" repository = "https://github.com/paritytech/frontier/" [dependencies] -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } ethereum = { version = "0.11.1", default-features = false, features = ["with-codec"] } rlp = { version = "0.5", default-features = false } diff --git a/primitives/evm/Cargo.toml b/primitives/evm/Cargo.toml index d0ea241b65..81acbf12df 100644 --- a/primitives/evm/Cargo.toml +++ b/primitives/evm/Cargo.toml @@ -13,8 +13,8 @@ documentation = "https://docs.rs/sp-evm" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-core = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } -sp-std = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } +sp-core = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-std = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } evm = { version = "0.33.1", default-features = false, features = ["with-codec"] } diff --git a/primitives/rpc/Cargo.toml b/primitives/rpc/Cargo.toml index a88b1ba009..78809bd498 100644 --- a/primitives/rpc/Cargo.toml +++ b/primitives/rpc/Cargo.toml @@ -7,15 +7,15 @@ description = "Runtime primitives for Ethereum RPC (web3) compatibility layer fo license = "Apache-2.0" [dependencies] -sp-core = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-core = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-evm = { version = "3.0.0-dev", default-features = false, path = "../../primitives/evm" } ethereum = { version = "0.11.1", default-features = false, features = ["with-codec"] } ethereum-types = { version = "0.12", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } -sp-runtime = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-runtime = { version = "4.1.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-std = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-io = { version = "4.0.0-dev", default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } [features] diff --git a/primitives/self-contained/Cargo.toml b/primitives/self-contained/Cargo.toml index b9ce33c5fc..ce7a1b8c7c 100644 --- a/primitives/self-contained/Cargo.toml +++ b/primitives/self-contained/Cargo.toml @@ -13,13 +13,13 @@ documentation = "https://docs.rs/fp-ethereum" serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } ethereum = { version = "0.11.1", default-features = false, features = ["with-codec"] } -sp-core = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } -sp-runtime = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } -sp-io = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } +sp-core = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-runtime = { version = "4.1.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } +sp-io = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } parity-util-mem = { version = "0.10", optional = true } sha3 = { version = "0.8", default-features = false } -frame-support = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false } +frame-support = { version = "4.0.0-dev", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false } [features] default = ["std"] diff --git a/primitives/self-contained/src/checked_extrinsic.rs b/primitives/self-contained/src/checked_extrinsic.rs index 41a66c60aa..d341df7955 100644 --- a/primitives/self-contained/src/checked_extrinsic.rs +++ b/primitives/self-contained/src/checked_extrinsic.rs @@ -108,7 +108,7 @@ where Err(err) => err.post_info, }; Extra::post_dispatch( - pre, + Some(pre), info, &post_info, len, @@ -117,7 +117,7 @@ where Ok(res) } CheckedSignature::Unsigned => { - let pre = Extra::pre_dispatch_unsigned(&self.function, info, len)?; + Extra::pre_dispatch_unsigned(&self.function, info, len)?; U::pre_dispatch(&self.function)?; let maybe_who = None; let res = self.function.dispatch(Origin::from(maybe_who)); @@ -126,7 +126,7 @@ where Err(err) => err.post_info, }; Extra::post_dispatch( - pre, + None, info, &post_info, len, diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index 66799bcc38..7eb8322134 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -20,41 +20,41 @@ jsonrpc-pubsub = "18.0.0" futures = "0.3" log = "0.4.8" -sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", features = ["wasmtime"] } -sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", features = ["wasmtime"] } -sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", features = ["wasmtime"] } -sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-consensus-aura = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-consensus-aura = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sc-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", features = ["wasmtime"] } +sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-executor = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", features = ["wasmtime"] } +sc-service = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", features = ["wasmtime"] } +sc-telemetry = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-keystore = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-consensus-aura = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-consensus-aura = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-consensus = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-finality-grandpa = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-timestamp = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-inherents = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } # These dependencies are used for the node template's RPCs jsonrpc-core = "18.0.0" -sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-rpc-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -substrate-frame-rpc-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-transaction-payment-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sc-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-rpc-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sc-basic-authorship = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +substrate-frame-rpc-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-transaction-payment-rpc = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } # These dependencies are used for runtime benchmarking -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-benchmarking-cli = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fc-consensus = { path = "../../client/consensus" } fp-consensus = { path = "../../primitives/consensus" } @@ -71,7 +71,7 @@ pallet-dynamic-fee = { path = "../../frame/dynamic-fee" } pallet-base-fee = { path = "../../frame/base-fee" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +substrate-build-script-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } [features] default = ["aura"] diff --git a/template/runtime/Cargo.toml b/template/runtime/Cargo.toml index e0d8a1204a..54d309c715 100644 --- a/template/runtime/Cargo.toml +++ b/template/runtime/Cargo.toml @@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] } serde = { version = "1.0.101", optional = true, features = ["derive"] } -frame-executive = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-support = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +frame-executive = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-support = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-ethereum = { default-features = false, path = "../../frame/ethereum" } pallet-evm = { default-features = false, path = "../../frame/evm" } @@ -26,28 +26,28 @@ pallet-dynamic-fee = { default-features = false, path = "../../frame/dynamic-fee pallet-evm-precompile-simple = { default-features = false, path = "../../frame/evm/precompile/simple" } pallet-evm-precompile-sha3fips = { default-features = false, path = "../../frame/evm/precompile/sha3fips" } pallet-evm-precompile-modexp = { default-features = false, path = "../../frame/evm/precompile/modexp" } -pallet-aura = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-balances = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-grandpa = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-sudo = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-timestamp = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-transaction-payment = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +pallet-aura = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-balances = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-grandpa = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-randomness-collective-flip = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-sudo = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-timestamp = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-transaction-payment = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } pallet-base-fee = { default-features = false, path = "../../frame/base-fee" } -sp-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-block-builder = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13"} -sp-consensus-aura = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-core = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-inherents = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13"} -sp-io = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-offchain = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-runtime = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-session = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-std = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-transaction-pool = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } -sp-version = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +sp-api = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-block-builder = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16"} +sp-consensus-aura = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-core = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-inherents = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16"} +sp-io = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-offchain = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-runtime = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-session = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-std = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-transaction-pool = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } +sp-version = { default-features = false, git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } fp-rpc = { default-features = false, path = "../../primitives/rpc" } fp-self-contained = { default-features = false, path = "../../primitives/self-contained" } @@ -55,11 +55,11 @@ fp-self-contained = { default-features = false, path = "../../primitives/self-co scale-info = { version = "1.0.0", default-features = false, features = ["derive"] } # benchmarking dependencies -frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false, optional = true } -frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13", default-features = false, optional = true } +frame-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false, optional = true } +frame-system-benchmarking = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16", default-features = false, optional = true } [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.13" } +substrate-wasm-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.16" } [features] default = ["std", "aura"]