diff --git a/Cargo.lock b/Cargo.lock index 3d5aa785ee9..7a238dfc65d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,9 +42,9 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", ] @@ -88,7 +88,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -199,9 +199,9 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.4", + "socket2", "waker-fn", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -213,6 +213,23 @@ dependencies = [ "event-listener", ] +[[package]] +name = "async-process" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2c06e30a24e8c78a3987d07f0930edf76ef35e027e7bdb063fccafdad1f60c" +dependencies = [ + "async-io", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "libc", + "once_cell", + "signal-hook", + "winapi", +] + [[package]] name = "async-std" version = "1.11.0" @@ -223,6 +240,7 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", + "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -242,15 +260,16 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf3e776afdf3a2477ef4854b85ba0dff3bd85792f685fb3c68948b4d304e4f0" +checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" dependencies = [ "async-std", "async-trait", "futures-io", "futures-util", "pin-utils", + "socket2", "trust-dns-resolver", ] @@ -271,26 +290,13 @@ dependencies = [ "syn", ] -[[package]] -name = "asynchronous-codec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4401f0a3622dad2e0763fa79e0eb328bc70fb7dccfdd645341f00d671247d6" -dependencies = [ - "bytes 1.1.0", - "futures-sink", - "futures-util", - "memchr", - "pin-project-lite 0.2.9", -] - [[package]] name = "asynchronous-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-sink", "futures-util", "memchr", @@ -320,7 +326,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -337,7 +343,7 @@ checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object 0.28.4", @@ -350,6 +356,12 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.2.0" @@ -423,17 +435,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" -dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", - "opaque-debug 0.3.0", -] - [[package]] name = "blake2" version = "0.10.4" @@ -455,39 +456,24 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "0.5.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec 0.7.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq", -] - -[[package]] -name = "blake3" -version = "0.3.8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" +checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", + "arrayvec 0.7.2", "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", ] [[package]] @@ -499,7 +485,7 @@ dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", - "cfg-if 1.0.0", + "cfg-if", "constant_time_eq", "digest 0.10.3", ] @@ -633,16 +619,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - [[package]] name = "bytes" version = "1.1.0" @@ -715,12 +691,6 @@ dependencies = [ "nom", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -729,21 +699,21 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412" +checksum = "01b72a433d0cf2aef113ba70f62634c56fddb0f244e6377185c56a7cadbd8f91" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", - "cpufeatures 0.1.5", + "cpufeatures", "zeroize", ] [[package]] name = "chacha20poly1305" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5" +checksum = "3b84ed6d1d5f7aa9bdde921a5090e0ca4d934d250ea3b402a5fab3a994e28a2a" dependencies = [ "aead", "chacha20", @@ -762,18 +732,20 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi 0.3.9", + "winapi", ] [[package]] name = "cid" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff0e3bc0b6446b3f9663c1a6aba6ef06c5aeaa1bc92bd18077be337198ab9768" +checksum = "fc949bff6704880faf064c42a4854032ab07bfcf3a4fcb82a57470acededb69c" dependencies = [ + "core2", "multibase", - "multihash 0.13.2", - "unsigned-varint 0.5.1", + "multihash", + "serde", + "unsigned-varint", ] [[package]] @@ -852,7 +824,18 @@ checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" dependencies = [ "atty", "lazy_static", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "comfy-table" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b103d85ca6e209388771bfb7aa6b68a7aeec4afbf6f0a0264bfbf50360e5212e" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", ] [[package]] @@ -864,6 +847,12 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -893,39 +882,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] -name = "cpp_demangle" -version = "0.3.5" +name = "core2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" dependencies = [ - "cfg-if 1.0.0", + "memchr", ] [[package]] -name = "cpufeatures" -version = "0.1.5" +name = "corosensei" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +checksum = "ab4b310cff9117ec16d05970743c20df3eaddafd461829f2758e76a8de2863a9" dependencies = [ + "autocfg", + "cfg-if", "libc", + "scopeguard", + "windows-sys 0.33.0", ] [[package]] -name = "cpufeatures" -version = "0.2.2" +name = "cpp_demangle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "libc", + "cfg-if", ] [[package]] -name = "cranelift-bforest" -version = "0.80.1" +name = "cpufeatures" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc68cdb867b7d27b5f33cd65eb11376dfb41a2d09568a1a2c2bc1dc204f4ef" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ - "cranelift-entity 0.80.1", + "libc", ] [[package]] @@ -934,24 +927,7 @@ version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38faa2a16616c8e78a18d37b4726b98bfd2de192f2fdc8a39ddf568a408a0f75" dependencies = [ - "cranelift-entity 0.82.3", -] - -[[package]] -name = "cranelift-codegen" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31253a44ab62588f8235a996cc9b0636d98a299190069ced9628b8547329b47a" -dependencies = [ - "cranelift-bforest 0.80.1", - "cranelift-codegen-meta 0.80.1", - "cranelift-codegen-shared 0.80.1", - "cranelift-entity 0.80.1", - "gimli", - "log", - "regalloc 0.0.33", - "smallvec", - "target-lexicon", + "cranelift-entity", ] [[package]] @@ -960,56 +936,32 @@ version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26f192472a3ba23860afd07d2b0217dc628f21fcc72617aa1336d98e1671f33b" dependencies = [ - "cranelift-bforest 0.82.3", - "cranelift-codegen-meta 0.82.3", - "cranelift-codegen-shared 0.82.3", - "cranelift-entity 0.82.3", + "cranelift-bforest", + "cranelift-codegen-meta", + "cranelift-codegen-shared", + "cranelift-entity", "gimli", "log", - "regalloc 0.0.34", + "regalloc", "smallvec", "target-lexicon", ] -[[package]] -name = "cranelift-codegen-meta" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a20ab4627d30b702fb1b8a399882726d216b8164d3b3fa6189e3bf901506afe" -dependencies = [ - "cranelift-codegen-shared 0.80.1", -] - [[package]] name = "cranelift-codegen-meta" version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f32ddb89e9b89d3d9b36a5b7d7ea3261c98235a76ac95ba46826b8ec40b1a24" dependencies = [ - "cranelift-codegen-shared 0.82.3", + "cranelift-codegen-shared", ] -[[package]] -name = "cranelift-codegen-shared" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6687d9668dacfed4468361f7578d86bded8ca4db978f734d9b631494bebbb5b8" - [[package]] name = "cranelift-codegen-shared" version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01fd0d9f288cc1b42d9333b7a776b17e278fc888c28e6a0f09b5573d45a150bc" -[[package]] -name = "cranelift-entity" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77c5d72db97ba2cb36f69037a709edbae0d29cb25503775891e7151c5c874bf" -dependencies = [ - "serde", -] - [[package]] name = "cranelift-entity" version = "0.82.3" @@ -1019,82 +971,43 @@ dependencies = [ "serde", ] -[[package]] -name = "cranelift-frontend" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426dca83f63c7c64ea459eb569aadc5e0c66536c0042ed5d693f91830e8750d0" -dependencies = [ - "cranelift-codegen 0.80.1", - "log", - "smallvec", - "target-lexicon", -] - [[package]] name = "cranelift-frontend" version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a006e3e32d80ce0e4ba7f1f9ddf66066d052a8c884a110b91d05404d6ce26dce" dependencies = [ - "cranelift-codegen 0.82.3", + "cranelift-codegen", "log", "smallvec", "target-lexicon", ] -[[package]] -name = "cranelift-native" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8007864b5d0c49b026c861a15761785a2871124e401630c03ef1426e6d0d559e" -dependencies = [ - "cranelift-codegen 0.80.1", - "libc", - "target-lexicon", -] - [[package]] name = "cranelift-native" version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501241b0cdf903412ec9075385ac9f2b1eb18a89044d1538e97fab603231f70c" dependencies = [ - "cranelift-codegen 0.82.3", + "cranelift-codegen", "libc", "target-lexicon", ] -[[package]] -name = "cranelift-wasm" -version = "0.80.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94cf12c071415ba261d897387ae5350c4d83c238376c8c5a96514ecfa2ea66a3" -dependencies = [ - "cranelift-codegen 0.80.1", - "cranelift-entity 0.80.1", - "cranelift-frontend 0.80.1", - "itertools", - "log", - "smallvec", - "wasmparser 0.81.0", - "wasmtime-types 0.33.1", -] - [[package]] name = "cranelift-wasm" version = "0.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16d9e4211bbc3268042a96dd4de5bd979cda22434991d035f5f8eacba987fad2" dependencies = [ - "cranelift-codegen 0.82.3", - "cranelift-entity 0.82.3", - "cranelift-frontend 0.82.3", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", "itertools", "log", "smallvec", "wasmparser 0.83.0", - "wasmtime-types 0.35.3", + "wasmtime-types", ] [[package]] @@ -1103,7 +1016,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1112,7 +1025,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1122,7 +1035,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1134,7 +1047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "lazy_static", "memoffset", @@ -1147,7 +1060,7 @@ version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -1157,6 +1070,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +dependencies = [ + "generic-array 0.14.5", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.3" @@ -1187,15 +1112,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" version = "0.1.22" @@ -1252,6 +1168,19 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.0.0-pre.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.3", + "subtle", + "zeroize", +] + [[package]] name = "darling" version = "0.13.4" @@ -1479,6 +1408,15 @@ dependencies = [ "gstd", ] +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1488,7 +1426,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version", "syn", ] @@ -1536,7 +1474,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1548,7 +1486,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1559,7 +1497,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1592,9 +1530,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" [[package]] name = "dyn-clonable" @@ -1649,6 +1587,18 @@ dependencies = [ "memmap2 0.5.4", ] +[[package]] +name = "ecdsa" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "economic-checks" version = "0.1.0" @@ -1740,11 +1690,29 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "elliptic-curve" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +dependencies = [ + "base16ct", + "crypto-bigint", + "der", + "ff", + "generic-array 0.14.5", + "group", + "rand_core 0.6.3", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "enum-as-inner" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4" +checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -1820,7 +1788,7 @@ checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1845,7 +1813,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.21", + "futures", ] [[package]] @@ -1878,6 +1846,16 @@ dependencies = [ "libc", ] +[[package]] +name = "ff" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +dependencies = [ + "rand_core 0.6.3", + "subtle", +] + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -1895,7 +1873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", - "futures 0.3.21", + "futures", "futures-timer", "log", "num-traits", @@ -1942,7 +1920,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", ] @@ -1954,13 +1932,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" dependencies = [ "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -1982,30 +1960,35 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "Inflector", "chrono", "clap", + "comfy-table", "frame-benchmarking", "frame-support", "frame-system", + "gethostname", "handlebars", "hash-db", "hex", "itertools", "kvdb", + "lazy_static", "linked-hash-map", "log", "memory-db", "parity-scale-codec", "rand 0.8.5", + "rand_pcg 0.3.1", "sc-block-builder", "sc-cli", "sc-client-api", "sc-client-db", "sc-executor", "sc-service", + "sc-sysinfo", "serde", "serde_json", "serde_nanos", @@ -2018,16 +2001,17 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-std", "sp-storage", "sp-trie", + "tempfile", + "thiserror", "thousands", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -2046,7 +2030,7 @@ version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "parity-scale-codec", "scale-info", "serde", @@ -2055,12 +2039,13 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "bitflags", "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", + "k256", "log", "once_cell", "parity-scale-codec", @@ -2084,7 +2069,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2096,10 +2081,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -2108,7 +2093,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "proc-macro2", "quote", @@ -2118,7 +2103,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "log", @@ -2135,7 +2120,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-benchmarking", "frame-support", @@ -2150,7 +2135,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "sp-api", @@ -2159,7 +2144,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "sp-api", @@ -2176,7 +2161,7 @@ dependencies = [ "lazy_static", "libc", "libloading 0.5.2", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2186,7 +2171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2195,34 +2180,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "funty" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - [[package]] name = "futures" version = "0.3.21" @@ -2300,13 +2263,13 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1387e07917c711fb4ee4f48ea0adb04a3c9739e53ef85bf43ae1edc2937a8b" +checksum = "e01fe9932a224b72b45336d96040aa86386d674a31d0af27d800ea7bc8ca97fe" dependencies = [ "futures-io", - "rustls 0.19.1", - "webpki 0.21.4", + "rustls", + "webpki", ] [[package]] @@ -2333,7 +2296,6 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ - "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -2396,7 +2358,7 @@ dependencies = [ "gear-core-errors", "log", "parity-scale-codec", - "wasmtime 0.35.3", + "wasmtime", ] [[package]] @@ -2495,12 +2457,14 @@ dependencies = [ "clap", "frame-benchmarking", "frame-benchmarking-cli", + "frame-system", "gear-runtime", "gear-runtime-interface", "gear-runtime-test-cli", "hex-literal", - "jsonrpc-core", + "jsonrpsee", "pallet-gear-rpc", + "pallet-transaction-payment", "pallet-transaction-payment-rpc", "primitive-types", "sc-basic-authorship", @@ -2526,6 +2490,7 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-inherents", + "sp-keyring", "sp-runtime", "sp-timestamp", "sp-transaction-pool", @@ -2691,13 +2656,23 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", @@ -2710,7 +2685,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.10.0+wasi-snapshot-preview1", ] @@ -2774,11 +2749,22 @@ dependencies = [ ] [[package]] -name = "gstd" +name = "group" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +dependencies = [ + "ff", + "rand_core 0.6.3", + "subtle", +] + +[[package]] +name = "gstd" version = "0.1.0" dependencies = [ "bs58", - "futures 0.3.21", + "futures", "galloc", "gcore", "gear-core-errors", @@ -2819,7 +2805,7 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2828,7 +2814,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util", "tracing", ] @@ -2960,16 +2946,16 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi 0.3.9", + "winapi", ] [[package]] name = "http" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", "itoa 1.0.2", ] @@ -2980,7 +2966,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes", "http", "pin-project-lite 0.2.9", ] @@ -3009,7 +2995,7 @@ version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -3020,7 +3006,7 @@ dependencies = [ "httpdate", "itoa 1.0.2", "pin-project-lite 0.2.9", - "socket2 0.4.4", + "socket2", "tokio", "tower-service", "tracing", @@ -3029,19 +3015,17 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ - "ct-logs", - "futures-util", + "http", "hyper", "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", + "tokio-rustls", ] [[package]] @@ -3050,17 +3034,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.2.3" @@ -3074,39 +3047,30 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "if-addrs-sys" -version = "0.3.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" dependencies = [ - "cc", "libc", + "winapi", ] [[package]] name = "if-watch" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" +checksum = "ae8f4a3c3d4c89351ca83e120c1c00b27df945d38e05695668c9d4b4f7bc52f3" dependencies = [ "async-io", - "futures 0.3.21", - "futures-lite", + "core-foundation", + "fnv", + "futures", "if-addrs", "ipnet", - "libc", "log", - "winapi 0.3.9", + "rtnetlink", + "system-configuration", + "windows", ] [[package]] @@ -3155,7 +3119,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3167,30 +3131,12 @@ dependencies = [ "num-traits", ] -[[package]] -name = "io-lifetimes" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ef6787e7f0faedc040f95716bdd0e62bcfcf4ba93da053b62dea2691c13864" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "io-lifetimes" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec58677acfea8a15352d42fc87d11d63596ade9239e0a7c9352914417515dbe6" -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ip_network" version = "0.4.1" @@ -3199,13 +3145,13 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" +checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" dependencies = [ - "socket2 0.3.19", + "socket2", "widestring", - "winapi 0.3.9", + "winapi", "winreg", ] @@ -3254,196 +3200,60 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonrpc-client-transports" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" -dependencies = [ - "derive_more", - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-pubsub", - "log", - "serde", - "serde_json", - "url 1.7.2", -] - -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures 0.3.21", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - -[[package]] -name = "jsonrpc-core-client" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" -dependencies = [ - "futures 0.3.21", - "jsonrpc-client-transports", -] - -[[package]] -name = "jsonrpc-derive" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" -dependencies = [ - "proc-macro-crate 0.1.5", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "jsonrpc-http-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" -dependencies = [ - "futures 0.3.21", - "hyper", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "net2", - "parking_lot 0.11.2", - "unicase", -] - -[[package]] -name = "jsonrpc-ipc-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-tokio-ipc", - "parking_lot 0.11.2", - "tower-service", -] - -[[package]] -name = "jsonrpc-pubsub" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "lazy_static", - "log", - "parking_lot 0.11.2", - "rand 0.7.3", - "serde", -] - -[[package]] -name = "jsonrpc-server-utils" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" -dependencies = [ - "bytes 1.1.0", - "futures 0.3.21", - "globset", - "jsonrpc-core", - "lazy_static", - "log", - "tokio", - "tokio-stream", - "tokio-util 0.6.10", - "unicase", -] - -[[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" -dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-server-utils", - "log", - "parity-ws", - "parking_lot 0.11.2", - "slab", -] - [[package]] name = "jsonrpsee" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5" -dependencies = [ - "jsonrpsee-types 0.4.1", - "jsonrpsee-utils", - "jsonrpsee-ws-client 0.4.1", -] - -[[package]] -name = "jsonrpsee" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05fd8cd6c6b1bbd06881d2cf88f1fc83cc36c98f2219090f839115fb4a956cb9" +checksum = "a1f2ab5a60e558e74ea93bcf5164ebc47939a7fff8938fa9b5233bbc63e16061" dependencies = [ "jsonrpsee-core", + "jsonrpsee-http-server", "jsonrpsee-proc-macros", - "jsonrpsee-types 0.8.0", - "jsonrpsee-ws-client 0.8.0", + "jsonrpsee-types", + "jsonrpsee-ws-client", + "jsonrpsee-ws-server", + "tracing", ] [[package]] name = "jsonrpsee-client-transport" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" +checksum = "26d682f4a55081a2be3e639280c640523070e4aeb8ee2fd8dd9168fdae57a9db" dependencies = [ - "futures 0.3.21", + "futures-util", "http", "jsonrpsee-core", - "jsonrpsee-types 0.8.0", + "jsonrpsee-types", "pin-project 1.0.10", - "rustls-native-certs 0.6.2", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.4", - "tokio-util 0.6.10", + "tokio-rustls", + "tokio-util", "tracing", - "webpki-roots 0.22.3", + "webpki-roots", ] [[package]] name = "jsonrpsee-core" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f220b5a238dc7992b90f1144fbf6eaa585872c9376afe6fe6863ffead6191bf3" +checksum = "6e27462b21279edf9a6a91f46ffbe125e9cdc58b901d2e08bf59b31a47d7d0ab" dependencies = [ "anyhow", "arrayvec 0.7.2", + "async-lock", "async-trait", "beef", "futures-channel", + "futures-timer", "futures-util", "hyper", - "jsonrpsee-types 0.8.0", + "jsonrpsee-types", + "parking_lot 0.12.1", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -3454,41 +3264,41 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-proc-macros" -version = "0.8.0" +name = "jsonrpsee-http-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" +checksum = "7178f16eabd7154c094e24d295b9ee355ec1e5f24c328759c56255ff7bbd4548" dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn", + "futures-channel", + "futures-util", + "globset", + "hyper", + "jsonrpsee-core", + "jsonrpsee-types", + "lazy_static", + "serde_json", + "tokio", + "tracing", + "unicase", ] [[package]] -name = "jsonrpsee-types" -version = "0.4.1" +name = "jsonrpsee-proc-macros" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2" +checksum = "8b8d7f449cab3b747f12c3efc27f5cad537f3b597c6a3838b0fac628f4bf730a" dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "hyper", - "log", - "serde", - "serde_json", - "soketto", - "thiserror", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "jsonrpsee-types" -version = "0.8.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b3f601bbbe45cd63f5407b6f7d7950e08a7d4f82aa699ff41a4a5e9e54df58" +checksum = "8fd11763134104122ddeb0f97e4bbe393058017dfb077db63fbf44b4dd0dd86e" dependencies = [ "anyhow", "beef", @@ -3499,56 +3309,50 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-utils" -version = "0.4.1" +name = "jsonrpsee-ws-client" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c" +checksum = "76f15180afb3761c7a3a32c0a8b680788176dcfdfe725b24c1758c90b1d1595b" dependencies = [ - "arrayvec 0.7.2", - "beef", - "jsonrpsee-types 0.4.1", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.4.1" +name = "jsonrpsee-ws-server" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef" +checksum = "dfb6c21556c551582b56e4e8e6e6249b0bbdb69bb7fa39efe9b9a6b54af9f206" dependencies = [ - "arrayvec 0.7.2", - "async-trait", - "fnv", - "futures 0.3.21", - "http", - "jsonrpsee-types 0.4.1", - "log", - "pin-project 1.0.10", - "rustls-native-certs 0.5.0", - "serde", + "futures-channel", + "futures-util", + "jsonrpsee-core", + "jsonrpsee-types", "serde_json", "soketto", - "thiserror", "tokio", - "tokio-rustls 0.22.0", - "tokio-util 0.6.10", + "tokio-util", + "tracing", ] [[package]] -name = "jsonrpsee-ws-client" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff425cee7c779e33920913bc695447416078ee6d119f443f3060feffa4e86b5" +name = "junit-common" +version = "0.1.0" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", - "jsonrpsee-types 0.8.0", + "serde", ] [[package]] -name = "junit-common" -version = "0.1.0" +name = "k256" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" dependencies = [ - "serde", + "cfg-if", + "ecdsa", + "elliptic-curve", + "sec1", ] [[package]] @@ -3557,16 +3361,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "kv-log-macro" version = "1.0.7" @@ -3665,7 +3459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" dependencies = [ "cc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3674,8 +3468,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", + "cfg-if", + "winapi", ] [[package]] @@ -3686,14 +3480,18 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.40.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" +checksum = "475ce2ac4a9727e53a519f6ee05b38abfcba8f0d39c4d24f103d184e36fd5b0f" dependencies = [ "atomic", - "bytes 1.1.0", - "futures 0.3.21", + "bytes", + "futures", + "futures-timer", + "getrandom 0.2.6", + "instant", "lazy_static", + "libp2p-autonat", "libp2p-core", "libp2p-deflate", "libp2p-dns", @@ -3719,66 +3517,85 @@ dependencies = [ "libp2p-websocket", "libp2p-yamux", "multiaddr", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project 1.0.10", + "rand 0.7.3", "smallvec", - "wasm-timer", +] + +[[package]] +name = "libp2p-autonat" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13b690e65046af6a09c0b27bd9508fa1cab0efce889de74b0b643b9d2a98f9a" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "instant", + "libp2p-core", + "libp2p-request-response", + "libp2p-swarm", + "log", + "prost 0.9.0", + "prost-build", + "rand 0.8.5", ] [[package]] name = "libp2p-core" -version = "0.30.2" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86aad7d54df283db817becded03e611137698a6509d4237a96881976a162340c" +checksum = "db5b02602099fb75cb2d16f9ea860a320d6eb82ce41e95ab680912c454805cd5" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "instant", "lazy_static", "libsecp256k1", "log", "multiaddr", - "multihash 0.14.0", + "multihash", "multistream-select", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "pin-project 1.0.10", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", "ring", "rw-stream-sink", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", "zeroize", ] [[package]] name = "libp2p-deflate" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" +checksum = "6b1d37f042f748e224f04785d0e987ae09a2aa518d6401d82d412dad83e360ed" dependencies = [ "flate2", - "futures 0.3.21", + "futures", "libp2p-core", ] [[package]] name = "libp2p-dns" -version = "0.30.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" +checksum = "066e33e854e10b5c93fc650458bf2179c7e0d143db260b0963e44a94859817f1" dependencies = [ "async-std-resolver", - "futures 0.3.21", + "futures", "libp2p-core", "log", "smallvec", @@ -3787,17 +3604,17 @@ dependencies = [ [[package]] name = "libp2p-floodsub" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" +checksum = "733d3ea6ebe7a7a85df2bc86678b93f24b015fae5fe3b3acc4c400e795a55d2d" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.21", + "futures", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", "smallvec", @@ -3805,83 +3622,87 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.33.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfeead619eb5dac46e65acc78c535a60aaec803d1428cca6407c3a4fc74d698d" +checksum = "a90c989a7c0969c2ab63e898da9bc735e3be53fb4f376e9c045ce516bcc9f928" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "base64", "byteorder", - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.21", + "futures", "hex_fmt", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prometheus-client", + "prost 0.9.0", "prost-build", "rand 0.7.3", "regex", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", "wasm-timer", ] [[package]] name = "libp2p-identify" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" +checksum = "c5ef5a5b57904c7c33d6713ef918d239dc6b7553458f3475d87f8a18e9c651c8" dependencies = [ - "futures 0.3.21", + "futures", + "futures-timer", "libp2p-core", "libp2p-swarm", "log", - "lru 0.6.6", - "prost", + "lru", + "prost 0.9.0", "prost-build", "smallvec", - "wasm-timer", ] [[package]] name = "libp2p-kad" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2297dc0ca285f3a09d1368bde02449e539b46f94d32d53233f53f6625bcd3ba" +checksum = "564e6bd64d177446399ed835b9451a8825b07929d6daa6a94e6405592974725e" dependencies = [ "arrayvec 0.5.2", - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "either", "fnv", - "futures 0.3.21", + "futures", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.7.3", - "sha2 0.9.9", + "sha2 0.10.2", "smallvec", + "thiserror", "uint", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-mdns" -version = "0.32.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c864b64bdc8a84ff3910a0df88e6535f256191a450870f1e7e10cbf8e64d45" +checksum = "611ae873c8e280ccfab0d57c7a13cac5644f364529e233114ff07863946058b0" dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.21", + "futures", "if-watch", "lazy_static", "libp2p-core", @@ -3889,58 +3710,60 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2 0.4.4", + "socket2", "void", ] [[package]] name = "libp2p-metrics" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af432fcdd2f8ba4579b846489f8f0812cfd738ced2c0af39df9b1c48bbb6ab2" +checksum = "985be799bb3796e0c136c768208c3c06604a38430571906a13dcfeda225a3b9d" dependencies = [ "libp2p-core", + "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", + "libp2p-relay", "libp2p-swarm", - "open-metrics-client", + "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" +checksum = "442eb0c9fff0bf22a34f015724b4143ce01877e079ed0963c722d94c07c72160" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.21", + "asynchronous-codec", + "bytes", + "futures", "libp2p-core", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.33.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" +checksum = "9dd7e0c94051cda67123be68cf6b65211ba3dde7277be9068412de3e7ffd63ef" dependencies = [ - "bytes 1.1.0", + "bytes", "curve25519-dalek 3.2.0", - "futures 0.3.21", + "futures", "lazy_static", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "snow", "static_assertions", "x25519-dalek", @@ -3949,33 +3772,34 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" +checksum = "bf57a3c2e821331dda9fe612d4654d676ab6e33d18d9434a18cced72630df6ad" dependencies = [ - "futures 0.3.21", + "futures", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "rand 0.7.3", "void", - "wasm-timer", ] [[package]] name = "libp2p-plaintext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" +checksum = "962c0fb0e7212fb96a69b87f2d09bcefd317935239bdc79cda900e7a8897a3fe" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.21", + "asynchronous-codec", + "bytes", + "futures", "libp2p-core", "log", - "prost", + "prost 0.9.0", "prost-build", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", ] @@ -3985,7 +3809,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.21", + "futures", "log", "pin-project 1.0.10", "rand 0.7.3", @@ -3995,89 +3819,96 @@ dependencies = [ [[package]] name = "libp2p-relay" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" +checksum = "3aa754cb7bccef51ebc3c458c6bbcef89d83b578a9925438389be841527d408f" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", - "futures 0.3.21", + "asynchronous-codec", + "bytes", + "either", + "futures", "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", "pin-project 1.0.10", - "prost", + "prost 0.9.0", "prost-build", - "rand 0.7.3", + "rand 0.8.5", "smallvec", - "unsigned-varint 0.7.1", + "static_assertions", + "thiserror", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-rendezvous" -version = "0.1.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" +checksum = "bbd0baab894c5b84da510b915d53264d566c3c35889f09931fe9edbd2a773bee" dependencies = [ - "asynchronous-codec 0.6.0", + "asynchronous-codec", "bimap", - "futures 0.3.21", + "futures", + "futures-timer", + "instant", "libp2p-core", "libp2p-swarm", "log", - "prost", + "prost 0.9.0", "prost-build", "rand 0.8.5", - "sha2 0.9.9", + "sha2 0.10.2", "thiserror", - "unsigned-varint 0.7.1", + "unsigned-varint", "void", - "wasm-timer", ] [[package]] name = "libp2p-request-response" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" +checksum = "b5e6a6fc6c9ad95661f46989473b34bd2993d14a4de497ff3b2668a910d4b869" dependencies = [ "async-trait", - "bytes 1.1.0", - "futures 0.3.21", + "bytes", + "futures", + "instant", "libp2p-core", "libp2p-swarm", "log", - "lru 0.7.6", "rand 0.7.3", "smallvec", - "unsigned-varint 0.7.1", - "wasm-timer", + "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.31.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" +checksum = "8f0c69ad9e8f7c5fc50ad5ad9c7c8b57f33716532a2b623197f69f93e374d14c" dependencies = [ "either", - "futures 0.3.21", + "fnv", + "futures", + "futures-timer", + "instant", "libp2p-core", "log", + "pin-project 1.0.10", "rand 0.7.3", "smallvec", + "thiserror", "void", - "wasm-timer", ] [[package]] name = "libp2p-swarm-derive" -version = "0.25.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072c290f727d39bdc4e9d6d1c847978693d25a673bd757813681e33e5f6c00c2" +checksum = "4f693c8c68213034d472cbb93a379c63f4f307d97c06f1c41e4985de481687a5" dependencies = [ "quote", "syn", @@ -4085,40 +3916,40 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" +checksum = "193447aa729c85aac2376828df76d171c1a589c9e6b58fcc7f9d9a020734122c" dependencies = [ "async-io", - "futures 0.3.21", + "futures", "futures-timer", "if-watch", "ipnet", "libc", "libp2p-core", "log", - "socket2 0.4.4", + "socket2", ] [[package]] name = "libp2p-uds" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" +checksum = "24bdab114f7f2701757d6541266e1131b429bbae382008f207f2114ee4222dcb" dependencies = [ "async-std", - "futures 0.3.21", + "futures", "libp2p-core", "log", ] [[package]] name = "libp2p-wasm-ext" -version = "0.30.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" +checksum = "4f6ea0f84a967ef59a16083f222c18115ae2e91db69809dce275df62e101b279" dependencies = [ - "futures 0.3.21", + "futures", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4128,31 +3959,31 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" +checksum = "c932834c3754501c368d1bf3d0fb458487a642b90fc25df082a3a2f3d3b32e37" dependencies = [ "either", - "futures 0.3.21", + "futures", "futures-rustls", "libp2p-core", "log", "quicksink", "rw-stream-sink", "soketto", - "url 2.2.2", - "webpki-roots 0.21.1", + "url", + "webpki-roots", ] [[package]] name = "libp2p-yamux" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" +checksum = "be902ebd89193cd020e89e89107726a38cfc0d16d18f613f4a37d046e92c7517" dependencies = [ - "futures 0.3.21", + "futures", "libp2p-core", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "thiserror", "yamux", ] @@ -4256,12 +4087,6 @@ dependencies = [ "statrs", ] -[[package]] -name = "linux-raw-sys" -version = "0.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a261afc61b7a5e323933b402ca6a1765183687c614789b1e4db7762ed4230bca" - [[package]] name = "linux-raw-sys" version = "0.0.42" @@ -4284,7 +4109,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "value-bag", ] @@ -4309,15 +4134,6 @@ dependencies = [ "syn", ] -[[package]] -name = "lru" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" -dependencies = [ - "hashbrown 0.11.2", -] - [[package]] name = "lru" version = "0.7.6" @@ -4407,6 +4223,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6627dc657574b49d6ad27105ed671822be56e0d2547d413bfbf3e8d8fa92e7a" +dependencies = [ + "libc", +] + [[package]] name = "memmap2" version = "0.2.3" @@ -4478,25 +4303,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.3" @@ -4506,31 +4312,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4541,27 +4323,27 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "multiaddr" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ee4ea82141951ac6379f964f71b20876d43712bea8faf6dd1a375e08a46499" +checksum = "3c580bfdd8803cce319b047d239559a22f809094aaea4ac13902a1fdcfcd4261" dependencies = [ "arrayref", "bs58", "byteorder", "data-encoding", - "multihash 0.14.0", - "percent-encoding 2.1.0", + "multihash", + "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.1", - "url 2.2.2", + "unsigned-varint", + "url", ] [[package]] name = "multibase" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78c60039650ff12e140ae867ef5299a58e19dded4d334c849dc7177083667e2" +checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" dependencies = [ "base-x", "data-encoding", @@ -4570,41 +4352,28 @@ dependencies = [ [[package]] name = "multihash" -version = "0.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac63698b887d2d929306ea48b63760431ff8a24fac40ddb22f9c7f49fb7cab" +checksum = "e3db354f401db558759dfc1e568d010a5d4146f4d3f637be1275ec4a3cf09689" dependencies = [ "blake2b_simd", "blake2s_simd", - "blake3 0.3.8", - "digest 0.9.0", - "generic-array 0.14.5", - "multihash-derive", - "sha2 0.9.9", - "sha3 0.9.1", - "unsigned-varint 0.5.1", -] - -[[package]] -name = "multihash" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752a61cd890ff691b4411423d23816d5866dd5621e4d1c5687a53b94b5a979d8" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.5", + "blake3", + "core2", + "digest 0.10.3", "multihash-derive", - "sha2 0.9.9", - "unsigned-varint 0.7.1", + "sha2 0.10.2", + "sha3 0.10.1", + "unsigned-varint", ] [[package]] name = "multihash-derive" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" +checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -4620,16 +4389,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" +checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" dependencies = [ - "bytes 1.1.0", - "futures 0.3.21", + "bytes", + "futures", "log", "pin-project 1.0.10", "smallvec", - "unsigned-varint 0.7.1", + "unsigned-varint", ] [[package]] @@ -4671,14 +4440,81 @@ dependencies = [ ] [[package]] -name = "net2" -version = "0.2.37" +name = "netlink-packet-core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +dependencies = [ + "anyhow", + "byteorder", + "libc", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "733ea73609acfd7fa7ddadfb7bf709b0471668c456ad9513685af543a06342b2" +dependencies = [ + "anyhow", + "bitflags", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef8785b8141e8432aa45fceb922a7e876d7da3fad37fa7e7ec702ace3aa0826b" +dependencies = [ + "bytes", + "futures", + "log", + "netlink-packet-core", + "netlink-sys", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c9f9547a08241bee7b6558b9b98e1f290d187de8b7cfca2bbb4937bcaa8f8" +dependencies = [ + "async-io", + "bytes", + "futures", + "libc", + "log", +] + +[[package]] +name = "nix" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ - "cfg-if 0.1.10", + "bitflags", + "cc", + "cfg-if", "libc", - "winapi 0.3.9", + "memoffset", ] [[package]] @@ -4689,7 +4525,7 @@ checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" dependencies = [ "bitflags", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] @@ -4701,7 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", ] @@ -4852,29 +4688,6 @@ 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.8", - "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.5" @@ -4903,13 +4716,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -4925,7 +4738,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -4940,7 +4753,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-benchmarking", "frame-support", @@ -5148,9 +4961,7 @@ dependencies = [ name = "pallet-gear-rpc" version = "2.0.0" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "pallet-gear-rpc-runtime-api", "sp-api", "sp-blockchain", @@ -5172,7 +4983,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-benchmarking", "frame-support", @@ -5195,7 +5006,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -5216,7 +5027,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -5230,7 +5041,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-benchmarking", "frame-support", @@ -5248,14 +5059,13 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "smallvec", "sp-core", "sp-io", "sp-runtime", @@ -5265,11 +5075,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -5282,7 +5090,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5324,7 +5132,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-support", "frame-system", @@ -5384,7 +5192,7 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -5396,34 +5204,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" -[[package]] -name = "parity-tokio-ipc" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" -dependencies = [ - "futures 0.3.21", - "libc", - "log", - "rand 0.7.3", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "parity-util-mem" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.12.1", "impl-trait-for-tuples", "parity-util-mem-derive", "parking_lot 0.12.1", "primitive-types", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5452,24 +5246,6 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking" version = "2.0.0" @@ -5503,12 +5279,12 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5517,11 +5293,11 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -5566,12 +5342,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -5707,11 +5477,11 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "wepoll-ffi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5720,7 +5490,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ - "cpufeatures 0.2.2", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -5731,8 +5501,8 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ - "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cfg-if", + "cpufeatures", "opaque-debug 0.3.0", "universal-hash", ] @@ -5756,15 +5526,6 @@ dependencies = [ "uint", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "1.1.3" @@ -5814,7 +5575,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cface98dfa6d645ea4c789839f176e4b072265d085bfcc48eaa8d137f58d3c39" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fnv", "lazy_static", "memchr", @@ -5822,14 +5583,47 @@ dependencies = [ "thiserror", ] +[[package]] +name = "prometheus-client" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a896938cc6018c64f279888b8c7559d3725210d5db9a3a1ee6bc7188d51d34" +dependencies = [ + "dtoa", + "itoa 1.0.2", + "owning_ref", + "prometheus-client-derive-text-encode", +] + +[[package]] +name = "prometheus-client-derive-text-encode" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.1.0", - "prost-derive", + "bytes", + "prost-derive 0.9.0", +] + +[[package]] +name = "prost" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +dependencies = [ + "bytes", + "prost-derive 0.10.1", ] [[package]] @@ -5838,14 +5632,14 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.1.0", + "bytes", "heck 0.3.3", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost", + "prost 0.9.0", "prost-types", "regex", "tempfile", @@ -5865,14 +5659,27 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.1.0", - "prost", + "bytes", + "prost 0.9.0", ] [[package]] @@ -6120,22 +5927,11 @@ dependencies = [ name = "ref-cast-impl" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "regalloc" -version = "0.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d808cff91dfca7b239d40b972ba628add94892b1d9e19a842aedc5cfae8ab1a" -dependencies = [ - "log", - "rustc-hash", - "smallvec", +checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -6184,7 +5980,7 @@ dependencies = [ "bitflags", "libc", "mach", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6196,7 +5992,7 @@ dependencies = [ "bitflags", "libc", "mach", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6214,10 +6010,10 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "env_logger", - "jsonrpsee 0.8.0", + "jsonrpsee", "log", "parity-scale-codec", "serde", @@ -6234,7 +6030,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6262,6 +6058,17 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" +[[package]] +name = "rfc6979" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +dependencies = [ + "crypto-bigint", + "hmac 0.11.0", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -6274,7 +6081,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6319,7 +6126,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "rtnetlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f54290e54521dac3de4149d83ddf9f62a359b3cc93bcb494a794a41e6f4744b" +dependencies = [ + "async-global-executor", + "futures", + "log", + "netlink-packet-route", + "netlink-proto", + "nix 0.22.3", + "thiserror", ] [[package]] @@ -6340,15 +6162,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" @@ -6358,20 +6171,6 @@ dependencies = [ "semver 1.0.9", ] -[[package]] -name = "rustix" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dcfc2778a90e38f56a708bfc90572422e11d6c7ee233d053d1f782cf9df6d2" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes 0.4.4", - "libc", - "linux-raw-sys 0.0.36", - "winapi 0.3.9", -] - [[package]] name = "rustix" version = "0.33.7" @@ -6380,23 +6179,10 @@ checksum = "938a344304321a9da4973b9ff4f9f8db9caf4597dfd9dda6a60b523340a0fff0" dependencies = [ "bitflags", "errno", - "io-lifetimes 0.5.3", + "io-lifetimes", "libc", - "linux-raw-sys 0.0.42", - "winapi 0.3.9", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "linux-raw-sys", + "winapi", ] [[package]] @@ -6407,20 +6193,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", -] - -[[package]] -name = "rustls-native-certs" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" -dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "sct", + "webpki", ] [[package]] @@ -6456,7 +6230,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.21", + "futures", "pin-project 0.4.29", "static_assertions", ] @@ -6488,7 +6262,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "sp-core", @@ -6499,9 +6273,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -6522,7 +6296,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6538,7 +6312,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.4", @@ -6555,9 +6329,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -6566,12 +6340,12 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "chrono", "clap", "fdlimit", - "futures 0.3.21", + "futures", "hex", "libp2p", "log", @@ -6581,6 +6355,7 @@ dependencies = [ "regex", "rpassword", "sc-client-api", + "sc-client-db", "sc-keystore", "sc-network", "sc-service", @@ -6604,10 +6379,10 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "fnv", - "futures 0.3.21", + "futures", "hash-db", "log", "parity-scale-codec", @@ -6632,7 +6407,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "hash-db", "kvdb", @@ -6657,10 +6432,10 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "libp2p", "log", @@ -6681,10 +6456,10 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "log", "parity-scale-codec", "sc-block-builder", @@ -6710,10 +6485,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -6735,10 +6510,10 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "lazy_static", - "lru 0.7.6", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", @@ -6762,14 +6537,14 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "environmental", "log", "parity-scale-codec", "sc-allocator", - "sp-core", "sp-maybe-compressed-blob", + "sp-sandbox", "sp-serializer", "sp-wasm-interface", "thiserror", @@ -6783,15 +6558,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "scoped-tls", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", "wasmi", ] @@ -6799,32 +6573,32 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "log", "parity-scale-codec", "parity-wasm 0.42.2", "sc-allocator", "sc-executor-common", - "sp-core", "sp-runtime-interface", + "sp-sandbox", "sp-wasm-interface", - "wasmtime 0.33.1", + "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "ahash", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures 0.3.21", + "futures", "futures-timer", "hex", "log", @@ -6857,10 +6631,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "ansi_term", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-util-mem", @@ -6874,7 +6648,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "hex", @@ -6889,17 +6663,17 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "asynchronous-codec 0.5.0", + "asynchronous-codec", "bitflags", - "bytes 1.1.0", + "bytes", "cid", "either", "fnv", "fork-tree", - "futures 0.3.21", + "futures", "futures-timer", "hex", "ip_network", @@ -6907,16 +6681,19 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.6", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "pin-project 1.0.10", - "prost", + "prost 0.10.4", "prost-build", "rand 0.7.3", "sc-block-builder", "sc-client-api", "sc-consensus", + "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-peerset", "sc-utils", "serde", @@ -6930,36 +6707,98 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", - "unsigned-varint 0.6.0", + "unsigned-varint", "void", "zeroize", ] +[[package]] +name = "sc-network-common" +version = "0.10.0-dev" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" +dependencies = [ + "futures", + "libp2p", + "parity-scale-codec", + "prost-build", + "sc-peerset", + "smallvec", +] + [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "ahash", - "futures 0.3.21", + "futures", "futures-timer", "libp2p", "log", - "lru 0.7.6", + "lru", "sc-network", "sp-runtime", "substrate-prometheus-endpoint", "tracing", ] +[[package]] +name = "sc-network-light" +version = "0.10.0-dev" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" +dependencies = [ + "futures", + "libp2p", + "log", + "parity-scale-codec", + "prost 0.10.4", + "prost-build", + "sc-client-api", + "sc-network-common", + "sc-peerset", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "sc-network-sync" +version = "0.10.0-dev" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" +dependencies = [ + "bitflags", + "either", + "fork-tree", + "futures", + "libp2p", + "log", + "lru", + "parity-scale-codec", + "prost 0.10.4", + "prost-build", + "sc-client-api", + "sc-consensus", + "sc-network-common", + "sc-peerset", + "smallvec", + "sp-arithmetic", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-finality-grandpa", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "futures 0.3.21", + "futures", "futures-timer", "hex", "hyper", @@ -6983,9 +6822,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "libp2p", "log", "sc-utils", @@ -6996,7 +6835,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7005,12 +6844,11 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7036,13 +6874,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", - "jsonrpc-pubsub", + "futures", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7062,14 +6897,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-http-server", - "jsonrpc-ipc-server", - "jsonrpc-pubsub", - "jsonrpc-ws-server", + "futures", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", @@ -7079,16 +6910,15 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.21", + "futures", "futures-timer", "hash-db", - "jsonrpc-core", - "jsonrpc-pubsub", + "jsonrpsee", "log", "parity-scale-codec", "parity-util-mem", @@ -7104,9 +6934,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", + "sc-network-common", "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-sysinfo", "sc-telemetry", "sc-tracing", "sc-transaction-pool", @@ -7143,7 +6975,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "parity-scale-codec", @@ -7154,13 +6986,32 @@ dependencies = [ "sp-core", ] +[[package]] +name = "sc-sysinfo" +version = "6.0.0-dev" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" +dependencies = [ + "futures", + "libc", + "log", + "rand 0.7.3", + "rand_pcg 0.2.1", + "regex", + "sc-telemetry", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-std", +] + [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "chrono", - "futures 0.3.21", + "futures", "libp2p", "log", "parking_lot 0.12.1", @@ -7175,7 +7026,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "ansi_term", "atty", @@ -7206,9 +7057,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7217,9 +7068,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "linked-hash-map", "log", @@ -7244,9 +7095,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "log", "serde", "sp-blockchain", @@ -7257,9 +7108,9 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "futures-timer", "lazy_static", "log", @@ -7274,7 +7125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ "bitvec", - "cfg-if 1.0.0", + "cfg-if", "derive_more", "parity-scale-codec", "scale-info-derive", @@ -7287,7 +7138,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7300,7 +7151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -7321,28 +7172,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -7359,6 +7194,18 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +dependencies = [ + "der", + "generic-array 0.14.5", + "subtle", + "zeroize", +] + [[package]] name = "secp256k1" version = "0.21.3" @@ -7415,16 +7262,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -7442,15 +7280,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.137" @@ -7531,8 +7360,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cfg-if", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7556,8 +7385,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cfg-if", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -7568,8 +7397,8 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ - "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cfg-if", + "cpufeatures", "digest 0.10.3", ] @@ -7610,6 +7439,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +[[package]] +name = "signal-hook" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -7621,9 +7460,13 @@ dependencies = [ [[package]] name = "signature" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" +checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +dependencies = [ + "digest 0.9.0", + "rand_core 0.6.3", +] [[package]] name = "simba" @@ -7657,31 +7500,19 @@ checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" [[package]] name = "snow" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6142f7c25e94f6fd25a32c3348ec230df9109b463f59c8c7acc4bd34936babb7" +checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", - "blake2 0.9.2", + "blake2", "chacha20poly1305", - "rand 0.8.5", + "curve25519-dalek 4.0.0-pre.1", "rand_core 0.6.3", "ring", - "rustc_version 0.3.3", - "sha2 0.9.9", + "rustc_version", + "sha2 0.10.2", "subtle", - "x25519-dalek", -] - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", ] [[package]] @@ -7691,7 +7522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7701,9 +7532,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64", - "bytes 1.1.0", + "bytes", "flate2", - "futures 0.3.21", + "futures", "httparse", "log", "rand 0.8.5", @@ -7713,7 +7544,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "hash-db", "log", @@ -7730,10 +7561,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "blake2 0.10.4", - "proc-macro-crate 1.1.3", + "blake2", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -7742,7 +7573,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "scale-info", @@ -7755,7 +7586,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "integer-sqrt", "num-traits", @@ -7770,7 +7601,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "parity-scale-codec", @@ -7782,7 +7613,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "sp-api", @@ -7794,11 +7625,11 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "log", - "lru 0.7.6", + "lru", "parity-scale-codec", "parking_lot 0.12.1", "sp-api", @@ -7812,10 +7643,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "futures-timer", "log", "parity-scale-codec", @@ -7831,7 +7662,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "parity-scale-codec", @@ -7849,7 +7680,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "scale-info", @@ -7863,7 +7694,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "base58", "bitflags", @@ -7871,7 +7702,7 @@ dependencies = [ "byteorder", "dyn-clonable", "ed25519-dalek", - "futures 0.3.21", + "futures", "hash-db", "hash256-std-hasher", "hex", @@ -7909,9 +7740,9 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "blake2 0.10.4", + "blake2", "byteorder", "digest 0.10.3", "sha2 0.10.2", @@ -7923,7 +7754,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "proc-macro2", "quote", @@ -7934,7 +7765,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -7943,7 +7774,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "proc-macro2", "quote", @@ -7953,7 +7784,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "environmental", "parity-scale-codec", @@ -7964,7 +7795,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "finality-grandpa", "log", @@ -7982,7 +7813,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -7996,9 +7827,9 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "futures 0.3.21", + "futures", "hash-db", "libsecp256k1", "log", @@ -8021,7 +7852,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "lazy_static", "sp-core", @@ -8032,10 +7863,10 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", - "futures 0.3.21", + "futures", "merlin", "parity-scale-codec", "parking_lot 0.12.1", @@ -8049,7 +7880,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "thiserror", "zstd", @@ -8058,7 +7889,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "sp-api", "sp-core", @@ -8068,7 +7899,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "backtrace", "lazy_static", @@ -8078,7 +7909,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "rustc-hash", "serde", @@ -8088,7 +7919,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "either", "hash256-std-hasher", @@ -8110,7 +7941,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8127,10 +7958,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "Inflector", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -8139,7 +7970,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "parity-scale-codec", @@ -8153,7 +7984,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "serde", "serde_json", @@ -8162,7 +7993,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "scale-info", @@ -8176,7 +8007,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "scale-info", @@ -8187,7 +8018,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "hash-db", "log", @@ -8209,12 +8040,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8227,7 +8058,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "log", "sp-core", @@ -8240,7 +8071,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "futures-timer", @@ -8256,7 +8087,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "sp-std", @@ -8268,7 +8099,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "sp-api", "sp-runtime", @@ -8277,7 +8108,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "async-trait", "log", @@ -8293,7 +8124,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "hash-db", "memory-db", @@ -8309,7 +8140,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8326,7 +8157,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8337,14 +8168,14 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", "sp-std", "wasmi", - "wasmtime 0.33.1", + "wasmtime", ] [[package]] @@ -8443,7 +8274,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "platforms", ] @@ -8451,18 +8282,17 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.21", - "jsonrpc-core", - "jsonrpc-core-client", - "jsonrpc-derive", + "futures", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", + "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -8473,7 +8303,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "futures-util", "hyper", @@ -8486,7 +8316,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "ansi_term", "build-helper", @@ -8534,6 +8364,27 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tabled" version = "0.7.0" @@ -8573,12 +8424,12 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8659,7 +8510,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8702,18 +8553,18 @@ version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "bytes 1.1.0", + "bytes", "libc", "memchr", - "mio 0.8.3", + "mio", "num_cpus", "once_cell", "parking_lot 0.12.1", "pin-project-lite 0.2.9", "signal-hook-registry", - "socket2 0.4.4", + "socket2", "tokio-macros", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8727,52 +8578,15 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", - "tokio", - "webpki 0.22.0", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite 0.2.9", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes 1.1.0", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite 0.2.9", + "rustls", "tokio", + "webpki", ] [[package]] @@ -8781,8 +8595,9 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 1.1.0", + "bytes", "futures-core", + "futures-io", "futures-sink", "pin-project-lite 0.2.9", "tokio", @@ -8806,11 +8621,11 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite 0.2.9", "tracing-attributes", @@ -8830,11 +8645,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -8854,8 +8669,10 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ + "ahash", "lazy_static", "log", + "lru", "tracing-core", ] @@ -8916,18 +8733,18 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31" +checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner", "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna", "ipnet", "lazy_static", "log", @@ -8935,22 +8752,22 @@ dependencies = [ "smallvec", "thiserror", "tinyvec", - "url 2.2.2", + "url", ] [[package]] name = "trust-dns-resolver" -version = "0.20.4" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a" +checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", "log", "lru-cache", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", @@ -8966,10 +8783,10 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#278f3bc029d46102523dda0879ba8d0aef887946" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "clap", - "jsonrpsee 0.4.1", + "jsonrpsee", "log", "parity-scale-codec", "remote-externalities", @@ -9000,7 +8817,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest 0.10.3", "rand 0.8.5", "static_assertions", @@ -9076,34 +8893,16 @@ checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" name = "unicode-xid" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.5", - "subtle", -] - -[[package]] -name = "unsigned-varint" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fdeedbf205afadfe39ae559b75c3240f24e257d0ca27e85f85cb82aa19ac35" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] -name = "unsigned-varint" -version = "0.6.0" +name = "universal-hash" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "asynchronous-codec 0.5.0", - "bytes 1.1.0", - "futures-io", - "futures-util", + "generic-array 0.14.5", + "subtle", ] [[package]] @@ -9112,8 +8911,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" dependencies = [ - "asynchronous-codec 0.6.0", - "bytes 1.1.0", + "asynchronous-codec", + "bytes", "futures-io", "futures-util", ] @@ -9124,17 +8923,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - [[package]] name = "url" version = "2.2.2" @@ -9142,9 +8930,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.3", + "idna", "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -9217,7 +9005,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", - "winapi 0.3.9", + "winapi", "winapi-util", ] @@ -9255,7 +9043,7 @@ version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -9280,7 +9068,7 @@ version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -9375,7 +9163,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.21", + "futures", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -9386,11 +9174,11 @@ dependencies = [ [[package]] name = "wasmer" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f727a39e7161f7438ddb8eafe571b67c576a8c2fb459f666d9053b5bba4afdea" +checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "indexmap", "js-sys", "loupe", @@ -9398,6 +9186,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasm-bindgen", + "wasmer-artifact", "wasmer-compiler", "wasmer-compiler-singlepass", "wasmer-derive", @@ -9406,16 +9195,29 @@ dependencies = [ "wasmer-engine-universal", "wasmer-types", "wasmer-vm", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "wasmer-artifact" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" +dependencies = [ + "enumset", + "loupe", + "thiserror", + "wasmer-compiler", + "wasmer-types", ] [[package]] name = "wasmer-cache" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c692dabf8b2c55d7885f1b72b4f707876c24a89701a5530e50b16da17c9d3e02" +checksum = "0def391ee1631deac5ac1e6ce919c07a5ccb936ad0fd44708cdc2365c49561a4" dependencies = [ - "blake3 1.3.1", + "blake3", "hex", "thiserror", "wasmer", @@ -9423,9 +9225,9 @@ dependencies = [ [[package]] name = "wasmer-compiler" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9951599222eb12bd13d4d91bcded0a880e4c22c2dfdabdf5dc7e5e803b7bf3" +checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" dependencies = [ "enumset", "loupe", @@ -9436,19 +9238,19 @@ dependencies = [ "target-lexicon", "thiserror", "wasmer-types", - "wasmer-vm", - "wasmparser 0.78.2", + "wasmparser 0.83.0", ] [[package]] name = "wasmer-compiler-singlepass" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5432e993840cdb8e6875ddc8c9eea64e7a129579b4706bd91b8eb474d9c4a860" +checksum = "29ca2a35204d8befa85062bc7aac259a8db8070b801b8a783770ba58231d729e" dependencies = [ "byteorder", "dynasm", "dynasmrt", + "gimli", "lazy_static", "loupe", "more-asserts", @@ -9456,14 +9258,13 @@ dependencies = [ "smallvec", "wasmer-compiler", "wasmer-types", - "wasmer-vm", ] [[package]] name = "wasmer-derive" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458dbd9718a837e6dbc52003aef84487d79eedef5fa28c7d28b6784be98ac08e" +checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" dependencies = [ "proc-macro-error", "proc-macro2", @@ -9473,9 +9274,9 @@ dependencies = [ [[package]] name = "wasmer-engine" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed603a6d037ebbb14014d7f739ae996a78455a4b86c41cfa4e81c590a1253b9" +checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" dependencies = [ "backtrace", "enumset", @@ -9488,6 +9289,7 @@ dependencies = [ "serde_bytes", "target-lexicon", "thiserror", + "wasmer-artifact", "wasmer-compiler", "wasmer-types", "wasmer-vm", @@ -9495,11 +9297,11 @@ dependencies = [ [[package]] name = "wasmer-engine-dylib" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd7fdc60e252a795c849b3f78a81a134783051407e7e279c10b7019139ef8dc" +checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "leb128", @@ -9510,6 +9312,7 @@ dependencies = [ "serde", "tempfile", "tracing", + "wasmer-artifact", "wasmer-compiler", "wasmer-engine", "wasmer-object", @@ -9520,12 +9323,11 @@ dependencies = [ [[package]] name = "wasmer-engine-universal" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcff0cd2c01a8de6009fd863b14ea883132a468a24f2d2ee59dc34453d3a31b5" +checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" dependencies = [ - "cfg-if 1.0.0", - "enum-iterator", + "cfg-if", "enumset", "leb128", "loupe", @@ -9533,16 +9335,33 @@ dependencies = [ "rkyv", "wasmer-compiler", "wasmer-engine", + "wasmer-engine-universal-artifact", "wasmer-types", "wasmer-vm", - "winapi 0.3.9", + "winapi", +] + +[[package]] +name = "wasmer-engine-universal-artifact" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" +dependencies = [ + "enum-iterator", + "enumset", + "loupe", + "rkyv", + "thiserror", + "wasmer-artifact", + "wasmer-compiler", + "wasmer-types", ] [[package]] name = "wasmer-object" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ce18ac2877050e59580d27ee1a88f3192d7a31e77fbba0852abc7888d6e0b5" +checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" dependencies = [ "object 0.28.4", "thiserror", @@ -9552,12 +9371,15 @@ dependencies = [ [[package]] name = "wasmer-types" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "659fa3dd6c76f62630deff4ac8c7657b07f0b1e4d7e0f8243a552b9d9b448e24" +checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" dependencies = [ + "backtrace", + "enum-iterator", "indexmap", "loupe", + "more-asserts", "rkyv", "serde", "thiserror", @@ -9565,25 +9387,30 @@ dependencies = [ [[package]] name = "wasmer-vm" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdc46158517c2769f9938bc222a7d41b3bb330824196279d8aa2d667cd40641" +checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", + "corosensei", "enum-iterator", "indexmap", + "lazy_static", "libc", "loupe", + "mach", "memoffset", "more-asserts", "region 3.0.0", "rkyv", + "scopeguard", "serde", "thiserror", + "wasmer-artifact", "wasmer-types", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9611,18 +9438,6 @@ dependencies = [ "parity-wasm 0.42.2", ] -[[package]] -name = "wasmparser" -version = "0.78.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" - -[[package]] -name = "wasmparser" -version = "0.81.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98930446519f63d00a836efdc22f67766ceae8dbcc1571379f2bcabc6b2b9abc" - [[package]] name = "wasmparser" version = "0.83.0" @@ -9648,38 +9463,6 @@ dependencies = [ "wasmparser 0.86.0", ] -[[package]] -name = "wasmtime" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9c724da92e39a85d2231d4c2a942c8be295211441dbca581c6c3f3f45a9f00" -dependencies = [ - "anyhow", - "backtrace", - "bincode", - "cfg-if 1.0.0", - "cpp_demangle", - "indexmap", - "lazy_static", - "libc", - "log", - "object 0.27.1", - "paste", - "psm", - "rayon", - "region 2.2.0", - "rustc-demangle", - "serde", - "target-lexicon", - "wasmparser 0.81.0", - "wasmtime-cache", - "wasmtime-cranelift 0.33.1", - "wasmtime-environ 0.33.1", - "wasmtime-jit 0.33.1", - "wasmtime-runtime 0.33.1", - "winapi 0.3.9", -] - [[package]] name = "wasmtime" version = "0.35.3" @@ -9689,7 +9472,7 @@ dependencies = [ "anyhow", "backtrace", "bincode", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "lazy_static", "libc", @@ -9703,18 +9486,19 @@ dependencies = [ "serde", "target-lexicon", "wasmparser 0.83.0", - "wasmtime-cranelift 0.35.3", - "wasmtime-environ 0.35.3", - "wasmtime-jit 0.35.3", - "wasmtime-runtime 0.35.3", - "winapi 0.3.9", + "wasmtime-cache", + "wasmtime-cranelift", + "wasmtime-environ", + "wasmtime-jit", + "wasmtime-runtime", + "winapi", ] [[package]] name = "wasmtime-cache" -version = "0.33.1" +version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4439d99100298344567c0eb6916ad5864e99e54760b8177c427e529077fb30" +checksum = "85c6ab24291fa7cb3a181f5669f6c72599b7ef781669759b45c7828c5999d0c0" dependencies = [ "anyhow", "base64", @@ -9722,36 +9506,14 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix 0.31.3", + "rustix", "serde", "sha2 0.9.9", "toml", - "winapi 0.3.9", + "winapi", "zstd", ] -[[package]] -name = "wasmtime-cranelift" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1762765dd69245f00e5d9783b695039e449a7be0f9c5383e4c78465dd6131aeb" -dependencies = [ - "anyhow", - "cranelift-codegen 0.80.1", - "cranelift-entity 0.80.1", - "cranelift-frontend 0.80.1", - "cranelift-native 0.80.1", - "cranelift-wasm 0.80.1", - "gimli", - "log", - "more-asserts", - "object 0.27.1", - "target-lexicon", - "thiserror", - "wasmparser 0.81.0", - "wasmtime-environ 0.33.1", -] - [[package]] name = "wasmtime-cranelift" version = "0.35.3" @@ -9759,11 +9521,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04c810078a491b7bc4866ebe045f714d2b95e6b539e1f64009a4a7606be11de" dependencies = [ "anyhow", - "cranelift-codegen 0.82.3", - "cranelift-entity 0.82.3", - "cranelift-frontend 0.82.3", - "cranelift-native 0.82.3", - "cranelift-wasm 0.82.3", + "cranelift-codegen", + "cranelift-entity", + "cranelift-frontend", + "cranelift-native", + "cranelift-wasm", "gimli", "log", "more-asserts", @@ -9771,27 +9533,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.83.0", - "wasmtime-environ 0.35.3", -] - -[[package]] -name = "wasmtime-environ" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4468301d95ec71710bb6261382efe27d1296447711645e3dbabaea6e4de3504" -dependencies = [ - "anyhow", - "cranelift-entity 0.80.1", - "gimli", - "indexmap", - "log", - "more-asserts", - "object 0.27.1", - "serde", - "target-lexicon", - "thiserror", - "wasmparser 0.81.0", - "wasmtime-types 0.33.1", + "wasmtime-environ", ] [[package]] @@ -9801,7 +9543,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61448266ea164b1ac406363cdcfac81c7c44db4d94c7a81c8620ac6c5c6cdf59" dependencies = [ "anyhow", - "cranelift-entity 0.82.3", + "cranelift-entity", "gimli", "indexmap", "log", @@ -9811,29 +9553,7 @@ dependencies = [ "target-lexicon", "thiserror", "wasmparser 0.83.0", - "wasmtime-types 0.35.3", -] - -[[package]] -name = "wasmtime-jit" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ae6e581ff014b470ec35847ea3c0b4c3ace89a55df5a04c802a11f4574e7d" -dependencies = [ - "addr2line", - "anyhow", - "bincode", - "cfg-if 1.0.0", - "gimli", - "object 0.27.1", - "region 2.2.0", - "rustix 0.31.3", - "serde", - "target-lexicon", - "thiserror", - "wasmtime-environ 0.33.1", - "wasmtime-runtime 0.33.1", - "winapi 0.3.9", + "wasmtime-types", ] [[package]] @@ -9845,20 +9565,21 @@ dependencies = [ "addr2line", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", "gimli", "log", "object 0.27.1", "region 2.2.0", "rustc-demangle", - "rustix 0.33.7", + "rustix", "serde", "target-lexicon", "thiserror", - "wasmtime-environ 0.35.3", - "wasmtime-runtime 0.35.3", - "winapi 0.3.9", + "wasmtime-environ", + "wasmtime-jit-debug", + "wasmtime-runtime", + "winapi", ] [[package]] @@ -9868,31 +9589,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5dc31f811760a6c76b2672c404866fd19b75e5fb3b0075a3e377a6846490654" dependencies = [ "lazy_static", -] - -[[package]] -name = "wasmtime-runtime" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9c28877ae37a367cda7b52b8887589816152e95dde9b7c80cc686f52761961" -dependencies = [ - "anyhow", - "backtrace", - "cc", - "cfg-if 1.0.0", - "indexmap", - "lazy_static", - "libc", - "log", - "mach", - "memoffset", - "more-asserts", - "rand 0.8.5", - "region 2.2.0", - "rustix 0.31.3", - "thiserror", - "wasmtime-environ 0.33.1", - "winapi 0.3.9", + "object 0.27.1", + "rustix", ] [[package]] @@ -9904,32 +9602,21 @@ dependencies = [ "anyhow", "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "indexmap", "libc", "log", "mach", + "memfd", "memoffset", "more-asserts", "rand 0.8.5", "region 2.2.0", - "rustix 0.33.7", + "rustix", "thiserror", - "wasmtime-environ 0.35.3", + "wasmtime-environ", "wasmtime-jit-debug", - "winapi 0.3.9", -] - -[[package]] -name = "wasmtime-types" -version = "0.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395726e8f5dd8c57cb0db445627b842343f7e29ed7489467fdf7953ed9d3cd4f" -dependencies = [ - "cranelift-entity 0.80.1", - "serde", - "thiserror", - "wasmparser 0.81.0", + "winapi", ] [[package]] @@ -9938,7 +9625,7 @@ version = "0.35.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514ef0e5fd197b9609dc9eb74beba0c84d5a12b2417cbae55534633329ba4852" dependencies = [ - "cranelift-entity 0.82.3", + "cranelift-entity", "serde", "thiserror", "wasmparser 0.83.0", @@ -9975,16 +9662,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -9995,22 +9672,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -10035,15 +9703,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -10055,12 +9717,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -10073,7 +9729,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -10082,37 +9738,111 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3" +dependencies = [ + "windows_aarch64_msvc 0.29.0", + "windows_i686_gnu 0.29.0", + "windows_i686_msvc 0.29.0", + "windows_x86_64_gnu 0.29.0", + "windows_x86_64_msvc 0.29.0", +] + +[[package]] +name = "windows-sys" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43dbb096663629518eb1dfa72d80243ca5a6aca764cae62a2df70af760a9be75" +dependencies = [ + "windows_aarch64_msvc 0.33.0", + "windows_i686_gnu 0.33.0", + "windows_i686_msvc 0.33.0", + "windows_x86_64_gnu 0.33.0", + "windows_x86_64_msvc 0.33.0", +] + [[package]] name = "windows-sys" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", ] +[[package]] +name = "windows_aarch64_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd761fd3eb9ab8cc1ed81e56e567f02dd82c4c837e48ac3b2181b9ffc5060807" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_i686_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58" + +[[package]] +name = "windows_i686_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab0cf703a96bab2dc0c02c0fa748491294bf9b7feb27e1f4f96340f208ada0e" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_msvc" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4" + +[[package]] +name = "windows_i686_msvc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfdbe89cc9ad7ce618ba34abc34bbb6c36d99e96cae2245b7943cd75ee773d0" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_x86_64_gnu" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4dd9b0c0e9ece7bb22e84d70d01b71c6d6248b81a3c60d11869451b4cb24784" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -10121,27 +9851,29 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561" [[package]] -name = "winreg" -version = "0.6.2" +name = "windows_x86_64_msvc" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] +checksum = "ff1e4aa646495048ec7f3ffddc411e1d829c026a2ec62b39da15c1055e406eaa" [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "winreg" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] @@ -10175,23 +9907,23 @@ dependencies = [ [[package]] name = "yamux" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" +checksum = "0c0608f53c1dc0bad505d03a34bbd49fbf2ad7b51eb036123e896365532745a1" dependencies = [ - "futures 0.3.21", + "futures", "log", "nohash-hasher", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "rand 0.8.5", "static_assertions", ] [[package]] name = "zeroize" -version = "1.5.5" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" dependencies = [ "zeroize_derive", ] @@ -10210,18 +9942,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.10.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "4.1.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" dependencies = [ "libc", "zstd-sys", @@ -10229,9 +9961,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/common/Cargo.toml b/common/Cargo.toml index 82e408b980f..d0e0ed3e103 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } log = "0.4.17" gear-common-codegen = { path = "./codegen" } diff --git a/common/src/lib.rs b/common/src/lib.rs index 2d6feffda40..41ff2ca6e1f 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -36,7 +36,7 @@ use core::fmt; use frame_support::{ dispatch::{DispatchError, DispatchResult}, traits::Imbalance, - weights::{IdentityFee, WeightToFeePolynomial}, + weights::{IdentityFee, WeightToFee}, }; use gear_core::{ ids::{CodeId, MessageId, ProgramId}, @@ -134,7 +134,7 @@ pub trait GasPrice { /// A price for the `gas` amount of gas. /// In general case, this doesn't necessarily has to be constant. fn gas_price(gas: u64) -> Self::Balance { - IdentityFee::::calc(&gas) + IdentityFee::::weight_to_fee(&gas) } } diff --git a/common/src/storage/complex/mailbox.rs b/common/src/storage/complex/mailbox.rs index 05ae04e8e78..8732b5b3a31 100644 --- a/common/src/storage/complex/mailbox.rs +++ b/common/src/storage/complex/mailbox.rs @@ -50,7 +50,7 @@ pub trait Mailbox { fn remove(key1: Self::Key1, key2: Self::Key2) -> Result; /// Removes all values from all key's mailboxes. - fn remove_all(); + fn clear(); } /// Represents store of mailbox's action callbacks. @@ -138,8 +138,8 @@ where } } - fn remove_all() { - T::remove_all() + fn clear() { + T::clear() } } diff --git a/common/src/storage/complex/messenger.rs b/common/src/storage/complex/messenger.rs index 1cf98d150ca..bf32908ab88 100644 --- a/common/src/storage/complex/messenger.rs +++ b/common/src/storage/complex/messenger.rs @@ -161,8 +161,8 @@ pub trait Messenger { Self::Sent::reset(); Self::Dequeued::reset(); Self::QueueProcessing::allow(); - Self::Queue::remove_all(); - Self::Mailbox::remove_all(); - Self::Waitlist::remove_all(); + Self::Queue::clear(); + Self::Mailbox::clear(); + Self::Waitlist::clear(); } } diff --git a/common/src/storage/complex/queue.rs b/common/src/storage/complex/queue.rs index cad0f5213a3..6bf05124021 100644 --- a/common/src/storage/complex/queue.rs +++ b/common/src/storage/complex/queue.rs @@ -44,7 +44,7 @@ pub trait Queue { fn queue(value: Self::Value) -> Result<(), Self::OutputError>; /// Removes all values from queue. - fn remove_all(); + fn clear(); /// Inserts given value at the beginning of the queue. /// @@ -87,8 +87,8 @@ where T::push_back(key, value).map_err(Into::into) } - fn remove_all() { - T::remove_all() + fn clear() { + T::clear() } fn requeue(value: Self::Value) -> Result<(), Self::OutputError> { diff --git a/common/src/storage/complex/waitlist.rs b/common/src/storage/complex/waitlist.rs index 1fcc4f52a74..1e21589c648 100644 --- a/common/src/storage/complex/waitlist.rs +++ b/common/src/storage/complex/waitlist.rs @@ -57,7 +57,7 @@ pub trait Waitlist { ) -> Result<(Self::Value, Self::BlockNumber), Self::OutputError>; /// Removes all values from all key's waitlisted. - fn remove_all(); + fn clear(); } /// Represents store of waitlist's action callbacks. @@ -156,8 +156,8 @@ where } } - fn remove_all() { - T::remove_all() + fn clear() { + T::clear() } } diff --git a/common/src/storage/complicated/dequeue.rs b/common/src/storage/complicated/dequeue.rs index b2bda38604b..000d5a19c01 100644 --- a/common/src/storage/complicated/dequeue.rs +++ b/common/src/storage/complicated/dequeue.rs @@ -58,7 +58,7 @@ pub trait Dequeue { fn push_front(key: Self::Key, value: Self::Value) -> Result<(), Self::Error>; /// Removes all values. - fn remove_all(); + fn clear(); } /// Represents store of dequeue's action callbacks. @@ -77,8 +77,8 @@ pub trait DequeueCallbacks { type OnPushBack: Callback; /// Callback on success `push_front`. type OnPushFront: Callback; - /// Callback on success `remove_all`. - type OnRemoveAll: EmptyCallback; + /// Callback on success `clear`. + type OnClear: EmptyCallback; } /// Represents dequeue error type. @@ -308,11 +308,11 @@ where } } - fn remove_all() { + fn clear() { HVS::kill(); TVS::kill(); - MS::remove_all(); - Callbacks::OnRemoveAll::call(); + MS::clear(); + Callbacks::OnClear::call(); } } diff --git a/common/src/storage/primitives/double_map.rs b/common/src/storage/primitives/double_map.rs index cdf9cf77c77..dbaa6c0d78d 100644 --- a/common/src/storage/primitives/double_map.rs +++ b/common/src/storage/primitives/double_map.rs @@ -69,7 +69,7 @@ pub trait DoubleMapStorage { fn remove(key1: Self::Key1, key2: Self::Key2); /// Removes all values. - fn remove_all(); + fn clear(); /// Gets value stored under given keys, if present, /// and removes it from storage. @@ -127,8 +127,8 @@ macro_rules! wrap_storage_double_map { $storage::::remove(key1, key2) } - fn remove_all() { - $storage::::remove_all(None); + fn clear() { + let _ = $storage::::clear(u32::MAX, None); } fn take(key1: Self::Key1, key2: Self::Key2) -> Option { diff --git a/common/src/storage/primitives/map.rs b/common/src/storage/primitives/map.rs index c83d51bc14b..91456436c81 100644 --- a/common/src/storage/primitives/map.rs +++ b/common/src/storage/primitives/map.rs @@ -59,7 +59,7 @@ pub trait MapStorage { fn remove(key: Self::Key); /// Removes all values. - fn remove_all(); + fn clear(); /// Gets value stored under given key, if present, /// and removes it from storage. @@ -86,7 +86,7 @@ macro_rules! wrap_storage_map { (storage: $storage: ident, name: $name: ident, key: $key: ty, value: $val: ty) => { wrap_storage_map!(storage: $storage, name: $name, key: $key, value: $val, counted None); }; - (storage: $storage: ident, name: $name: ident, key: $key: ty, value: $val: ty, counted $($rm_arg:expr)?) => { + (storage: $storage: ident, name: $name: ident, key: $key: ty, value: $val: ty,) => { pub struct $name(PhantomData); impl MapStorage for $name { @@ -118,8 +118,8 @@ macro_rules! wrap_storage_map { $storage::::remove(key) } - fn remove_all() { - $storage::::remove_all($($rm_arg)?); + fn clear() { + let _ = $storage::::clear(u32::MAX, None); } fn take(key: Self::Key) -> Option { @@ -137,13 +137,7 @@ macro_rules! wrap_storage_map { #[macro_export] macro_rules! wrap_counted_storage_map { (storage: $storage: ident, name: $name: ident, key: $key: ty, value: $val: ty, length: $len: ty) => { - $crate::wrap_storage_map!( - storage: $storage, - name: $name, - key: $key, - value: $val, - counted - ); + $crate::wrap_storage_map!(storage: $storage, name: $name, key: $key, value: $val,); impl Counted for $name { type Length = $len; diff --git a/core-errors/Cargo.toml b/core-errors/Cargo.toml index bd01161bcd7..aa0bf3188d8 100644 --- a/core-errors/Cargo.toml +++ b/core-errors/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "GPL-3.0" [dependencies] -scale-info = { version = "2.0.1", default-features = false, features = ["derive"], optional = true } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"], optional = true } derive_more = "0.99.17" [dependencies.codec] diff --git a/core-processor/Cargo.toml b/core-processor/Cargo.toml index f4ff5da4ce7..3ddded28bb7 100644 --- a/core-processor/Cargo.toml +++ b/core-processor/Cargo.toml @@ -10,7 +10,7 @@ gear-core = { path = "../core" } gear-core-errors = { path = "../core-errors" } gear-backend-common = { path = "../core-backend/common" } -blake2-rfc = { version = "0.2.16", default-features = false } +blake2-rfc = { version = "0.2.18", default-features = false } codec = { package = "parity-scale-codec", version = "3.1.2", features = ["derive"], default-features = false } log = { version = "0.4.17", default-features = false } anyhow = { version = "1.0.57", default-features = false } diff --git a/core/Cargo.toml b/core/Cargo.toml index 6d94e9f6c37..4c1370439f2 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -7,11 +7,11 @@ license = "GPL-3.0" [dependencies] gear-core-errors = { path = "../core-errors" } -blake2-rfc = { version = "0.2.16", default-features = false } +blake2-rfc = { version = "0.2.18", default-features = false } codec = { package = "parity-scale-codec", version = "3.1.2", features = [ "derive", ], default-features = false } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } derive_more = "0.99.17" log = { version = "0.4.17", default-features = false } parity-wasm = { version = "0.42.2", default-features = false } diff --git a/examples/Cargo.lock b/examples/Cargo.lock index 61b25df1f26..667aca0cf86 100644 --- a/examples/Cargo.lock +++ b/examples/Cargo.lock @@ -50,9 +50,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -103,16 +103,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -140,9 +140,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "byte-slice-cast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698" +checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" [[package]] name = "byte-tools" @@ -156,6 +156,12 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + [[package]] name = "cfg-if" version = "1.0.0" @@ -176,9 +182,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -195,20 +201,10 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array 0.14.4", - "subtle", -] - [[package]] name = "curve25519-dalek" version = "2.1.3" @@ -240,8 +236,8 @@ name = "demo-async" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -250,8 +246,8 @@ version = "0.1.0" dependencies = [ "futures", "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -260,8 +256,8 @@ version = "0.1.0" dependencies = [ "futures", "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", "sp-core", ] @@ -270,8 +266,8 @@ name = "demo-async-sign" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", "sp-core", ] @@ -287,8 +283,8 @@ name = "demo-bot" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -302,7 +298,7 @@ dependencies = [ name = "demo-chat" version = "0.1.0" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -355,8 +351,8 @@ name = "demo-gui-test" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -379,8 +375,8 @@ name = "demo-meta" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -516,7 +512,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -525,7 +521,7 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "block-buffer 0.10.0", + "block-buffer 0.10.2", "crypto-common", "subtle", ] @@ -544,9 +540,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.2.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" dependencies = [ "signature", ] @@ -560,10 +556,16 @@ dependencies = [ "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", - "sha2 0.9.8", + "sha2 0.9.9", "zeroize", ] +[[package]] +name = "environmental" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" + [[package]] name = "fake-simd" version = "0.1.2" @@ -585,16 +587,16 @@ version = "0.1.0" dependencies = [ "gstd", "hex", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", - "scale-info 2.0.1", + "parity-scale-codec", + "primitive-types", + "scale-info", ] [[package]] name = "futures" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -606,9 +608,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", @@ -616,24 +618,22 @@ 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-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-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", @@ -641,31 +641,28 @@ 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" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[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-core", "futures-macro", "futures-sink", "futures-task", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", ] [[package]] @@ -680,7 +677,7 @@ name = "gcore" version = "0.1.0" dependencies = [ "gear-core-errors", - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] @@ -688,8 +685,8 @@ name = "gear-core-errors" version = "0.1.0" dependencies = [ "derive_more", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -703,9 +700,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -722,9 +719,9 @@ dependencies = [ "gear-core-errors", "gstd-codegen", "hex", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", - "scale-info 2.0.1", + "parity-scale-codec", + "primitive-types", + "scale-info", ] [[package]] @@ -740,8 +737,8 @@ name = "guestbook" version = "0.1.0" dependencies = [ "gstd", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -771,50 +768,20 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac", - "digest 0.9.0", -] - -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array 0.14.4", - "hmac", -] - -[[package]] -name = "impl-codec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" -dependencies = [ - "parity-scale-codec 2.3.1", -] - [[package]] name = "impl-codec" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.1.2", + "parity-scale-codec", ] [[package]] name = "impl-trait-for-tuples" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", @@ -823,15 +790,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "lazy_static" @@ -841,9 +808,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.107" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libc_print" @@ -862,14 +829,11 @@ dependencies = [ "arrayref", "base64", "digest 0.9.0", - "hmac-drbg", "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.4", + "rand 0.8.5", "serde", - "sha2 0.9.8", - "typenum", ] [[package]] @@ -903,18 +867,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "merlin" @@ -936,9 +900,9 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -965,18 +929,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "parity-scale-codec" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" -dependencies = [ - "arrayvec 0.7.2", - "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive 2.3.1", -] - [[package]] name = "parity-scale-codec" version = "3.1.2" @@ -986,19 +938,7 @@ dependencies = [ "arrayvec 0.7.2", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.1.2", -] - -[[package]] -name = "parity-scale-codec-derive" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", + "parity-scale-codec-derive", ] [[package]] @@ -1015,14 +955,14 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if", "impl-trait-for-tuples", "parity-util-mem-derive", - "primitive-types 0.10.1", + "primitive-types", "winapi", ] @@ -1039,9 +979,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -1051,21 +991,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" - -[[package]] -name = "primitive-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" -dependencies = [ - "fixed-hash", - "impl-codec 0.5.1", - "scale-info 1.0.0", - "uint", -] +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "primitive-types" @@ -1074,33 +1002,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", - "impl-codec 0.6.0", - "scale-info 2.0.1", + "impl-codec", + "scale-info", "uint", ] [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", ] -[[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.39" @@ -1132,9 +1048,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "rand_core 0.6.3", ] @@ -1172,18 +1088,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "685d58625b6c2b83e4cc88a27c4bf65adb7b6b16dbdc413e515c9405b47432ab" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" dependencies = [ "proc-macro2", "quote", @@ -1226,51 +1142,27 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "scale-info" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "c46be926081c9f4dd5dd9b6f1d3e3229f2360bc6502dd8836f84a93b7c75e99a" dependencies = [ "cfg-if", "derive_more", - "parity-scale-codec 2.3.1", - "scale-info-derive 1.0.0", -] - -[[package]] -name = "scale-info" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42" -dependencies = [ - "cfg-if", - "derive_more", - "parity-scale-codec 3.1.2", - "scale-info-derive 2.0.0", + "parity-scale-codec", + "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "scale-info-derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" +checksum = "50e334bb10a245e28e5fd755cabcafd96cfcd167c99ae63a46924ca8d8703a3c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1294,6 +1186,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -1311,18 +1221,18 @@ checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ "proc-macro2", "quote", @@ -1331,9 +1241,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa", "ryu", @@ -1354,9 +1264,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", @@ -1367,9 +1277,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", "cpufeatures", @@ -1388,14 +1298,14 @@ dependencies = [ [[package]] name = "signature" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "6.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "bitflags", "blake2-rfc", @@ -1408,11 +1318,12 @@ dependencies = [ "log", "merlin", "num-traits", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "parity-util-mem", - "primitive-types 0.10.1", - "scale-info 1.0.0", + "primitive-types", + "scale-info", "schnorrkel", + "secp256k1", "secrecy", "sp-core-hashing", "sp-debug-derive", @@ -1426,12 +1337,12 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "blake2", "byteorder", "digest 0.10.3", - "sha2 0.10.1", + "sha2 0.10.2", "sha3", "sp-std", "twox-hash", @@ -1440,21 +1351,33 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "sp-externalities" +version = "0.12.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std", + "sp-storage", +] + [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "6.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", - "primitive-types 0.10.1", + "parity-scale-codec", + "primitive-types", + "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", "sp-storage", @@ -1465,8 +1388,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "5.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "Inflector", "proc-macro-crate", @@ -1478,14 +1401,14 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "6.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "ref-cast", "sp-debug-derive", "sp-std", @@ -1493,10 +1416,10 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "5.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-std", "tracing", "tracing-core", @@ -1504,19 +1427,19 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#b0fa1f2227664125e4636305bcbfcf00f312140e" +version = "6.0.0" +source = "git+https://github.com/gear-tech/substrate.git?branch=gear-stable#0fb69d082da18312c0b7fc55bd2bfbcc620bc3ac" dependencies = [ "impl-trait-for-tuples", - "parity-scale-codec 2.3.1", + "parity-scale-codec", "sp-std", ] [[package]] name = "ss58-registry" -version = "1.12.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" +checksum = "5d804c8d48aeab838be31570866fce1130d275b563d49af08b4927a0bd561e7c" dependencies = [ "Inflector", "proc-macro2", @@ -1534,9 +1457,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "str-buf" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3f6746ae4fb2c851c6ad2fdaa1090f6777315bc7522b2a2bc5897e091eefb2" +checksum = "0873cb29201126440dcc78d0b1f5a13d917e78831778429a7920ca9c7f3dae1e" [[package]] name = "subtle" @@ -1557,9 +1480,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -1569,18 +1492,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -1594,25 +1517,25 @@ dependencies = [ "bs58", "gstd", "hex", - "parity-scale-codec 3.1.2", - "primitive-types 0.11.1", - "scale-info 2.0.1", + "parity-scale-codec", + "primitive-types", + "scale-info", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if", "pin-project-lite", @@ -1621,15 +1544,15 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "7709595b8878a4965ce5e87ebf880a7d39c9afc6837721b21a5a816a8117d921" [[package]] name = "twox-hash" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.3", @@ -1638,15 +1561,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" dependencies = [ "byteorder", "crunchy", @@ -1662,15 +1585,15 @@ checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "winapi" @@ -1700,24 +1623,24 @@ version = "0.1.0" dependencies = [ "gstd", "hex", - "parity-scale-codec 3.1.2", - "scale-info 2.0.1", + "parity-scale-codec", + "scale-info", ] [[package]] name = "zeroize" -version = "1.5.1" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4062c749be08d90be727e9c5895371c3a0e49b90ba2b9592dc7afda95cc2b719" +checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb" +checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ "proc-macro2", "quote", diff --git a/examples/async-init/Cargo.toml b/examples/async-init/Cargo.toml index 02c7c71421c..2fd37cb7161 100644 --- a/examples/async-init/Cargo.toml +++ b/examples/async-init/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } futures = { version = "0.3", default-features = false, features = ["alloc"] } diff --git a/examples/async-multisig/Cargo.toml b/examples/async-multisig/Cargo.toml index db1c5a3dd3c..eebc8810392 100644 --- a/examples/async-multisig/Cargo.toml +++ b/examples/async-multisig/Cargo.toml @@ -9,6 +9,6 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } futures = { version = "0.3", default-features = false, features = ["alloc"] } -sp-core = { version = "5.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, features = ["full_crypto"] } +sp-core = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, features = ["full_crypto"] } diff --git a/examples/async-sign/Cargo.toml b/examples/async-sign/Cargo.toml index 9f6b4641058..d8e815cbd18 100644 --- a/examples/async-sign/Cargo.toml +++ b/examples/async-sign/Cargo.toml @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -sp-core = { version = "5.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, features = ["full_crypto"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +sp-core = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, features = ["full_crypto"] } diff --git a/examples/async/Cargo.toml b/examples/async/Cargo.toml index 723c7cf6ee5..4f50bb4af38 100644 --- a/examples/async/Cargo.toml +++ b/examples/async/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } diff --git a/examples/binaries/proxy/Cargo.toml b/examples/binaries/proxy/Cargo.toml index 77dcbc87b0c..b67e177fafd 100644 --- a/examples/binaries/proxy/Cargo.toml +++ b/examples/binaries/proxy/Cargo.toml @@ -9,7 +9,7 @@ workspace = "../../../" [dependencies] gstd = { path = "../../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } [build-dependencies] gear-wasm-builder = { path = "../../../utils/wasm-builder" } diff --git a/examples/bot/Cargo.toml b/examples/bot/Cargo.toml index a7820627649..8d55ac8c289 100644 --- a/examples/bot/Cargo.toml +++ b/examples/bot/Cargo.toml @@ -9,4 +9,4 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } diff --git a/examples/fungible-token/Cargo.toml b/examples/fungible-token/Cargo.toml index ad806519a29..463c6bf228c 100644 --- a/examples/fungible-token/Cargo.toml +++ b/examples/fungible-token/Cargo.toml @@ -12,6 +12,6 @@ crate-type = ["cdylib"] [dependencies] gstd = {path = "../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"]} diff --git a/examples/guestbook/Cargo.toml b/examples/guestbook/Cargo.toml index dd95874a8f8..2d3509a76d4 100644 --- a/examples/guestbook/Cargo.toml +++ b/examples/guestbook/Cargo.toml @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } diff --git a/examples/gui-test/Cargo.toml b/examples/gui-test/Cargo.toml index 43538c6e2b9..c341a0b79a5 100644 --- a/examples/gui-test/Cargo.toml +++ b/examples/gui-test/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } diff --git a/examples/meta/Cargo.toml b/examples/meta/Cargo.toml index 8f5a18bd392..d7bc204c783 100644 --- a/examples/meta/Cargo.toml +++ b/examples/meta/Cargo.toml @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] gstd = { path = "../../gstd", features = ["debug"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } diff --git a/examples/token-vendor/Cargo.toml b/examples/token-vendor/Cargo.toml index 0d6e34b879d..a3e20ca5599 100644 --- a/examples/token-vendor/Cargo.toml +++ b/examples/token-vendor/Cargo.toml @@ -13,5 +13,5 @@ gstd = { path = "../../gstd", features = ["debug"] } bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive","full"] } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"]} diff --git a/examples/token-vendor/workshop-example/Cargo.toml b/examples/token-vendor/workshop-example/Cargo.toml index 143057a9f2b..92788a1124a 100644 --- a/examples/token-vendor/workshop-example/Cargo.toml +++ b/examples/token-vendor/workshop-example/Cargo.toml @@ -12,4 +12,4 @@ gstd = { path = "../../../gstd", features = ["debug"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive","full"] } hex = { version = "0.4.3", default-features = false, features = ["alloc"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } diff --git a/gear-test/Cargo.toml b/gear-test/Cargo.toml index 1e3f612ea90..4e34764669a 100644 --- a/gear-test/Cargo.toml +++ b/gear-test/Cargo.toml @@ -7,7 +7,7 @@ license = "GPL-3.0" [dependencies] anyhow = "1" -clap = { version = "3.1.18", features = ["derive"] } +clap = { version = "3.1", features = ["derive"] } derive_more = "0.99" env_logger = "0.9" colored = "2.0.0" diff --git a/gstd/Cargo.toml b/gstd/Cargo.toml index 55fae71e59e..6ba4d7e9d6b 100644 --- a/gstd/Cargo.toml +++ b/gstd/Cargo.toml @@ -15,7 +15,7 @@ bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] } codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "full"]} hex = { version = "0.4.3", default-features = false, features = ["alloc"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"]} -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } futures = { version = "0.3", default-features = false, features = ["alloc"] } [features] diff --git a/gtest/Cargo.toml b/gtest/Cargo.toml index 56fd4d8e5b6..474c630a937 100644 --- a/gtest/Cargo.toml +++ b/gtest/Cargo.toml @@ -11,7 +11,7 @@ gear-backend-wasmtime = { path = "../core-backend/wasmtime" } core-processor = { package = "gear-core-processor", path = "../core-processor" } codec = { package = "parity-scale-codec", version = "3.1.2", features = ["derive"] } -logger = { package = "log", version = "0.4.14" } +logger = { package = "log", version = "0.4.17" } hex = "0.4.3" colored = "2.0.0" env_logger = "0.9.0" diff --git a/lazy-pages/Cargo.toml b/lazy-pages/Cargo.toml index 52cd30b83b3..f07ea0f3137 100644 --- a/lazy-pages/Cargo.toml +++ b/lazy-pages/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/gear-tech/gear" rust-version = "1.56" [dependencies] -log = "0.4.14" +log = "0.4.17" gear-core = { path = "../core" } sp-io = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sp-std = { version = "4.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } diff --git a/node/Cargo.toml b/node/Cargo.toml index c4b823bc3a0..8b630246ad0 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -18,7 +18,7 @@ name = "gear-node" [dependencies] clap = { version = "3.1", features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } hex-literal = "0.3.4" primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } @@ -37,6 +37,7 @@ sc-service = { version = "0.10.0-dev", git = "https://github.com/gear-tech/subst sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sc-keystore = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sp-inherents = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } +sp-keyring = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } @@ -51,7 +52,7 @@ sp-runtime = { version = "6.0.0", git = "https://github.com/gear-tech/substrate. sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } # These dependencies are used for the node template's RPCs -jsonrpc-core = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server"] } sc-rpc = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sp-api = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } @@ -59,7 +60,9 @@ sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/gear-tech/sub sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } +frame-system = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } pallet-gear-rpc = { path = "../pallets/gear/rpc" } +pallet-transaction-payment = { version = "4.0.0-dev", default-features = false, git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } # These dependencies are used for runtime benchmarking diff --git a/node/src/cli.rs b/node/src/cli.rs index afabe37a781..caf5cb7d66d 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -54,8 +54,8 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - /// The custom benchmark subcommand benchmarking runtime pallets. - #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] + /// Sub-commands concerned with benchmarking. + #[clap(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), /// Try some command against runtime state. @@ -66,6 +66,9 @@ pub enum Subcommand { #[cfg(not(feature = "try-runtime"))] TryRuntime, + /// Db meta columns information. + ChainInfo(sc_cli::ChainInfoCmd), + #[clap( name = "runtime-spec-tests", about = "Run gear runtime tests with yaml." diff --git a/node/src/command.rs b/node/src/command.rs index f455966eb4b..ce27681ef62 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -19,11 +19,14 @@ use crate::{ chain_spec, cli::{Cli, Subcommand}, + command_helper::{inherent_benchmark_data, BenchmarkExtrinsicBuilder}, service, }; +use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE}; use gear_runtime::Block; use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli}; use sc_service::PartialComponents; +use std::sync::Arc; impl SubstrateCli for Cli { fn impl_name() -> String { @@ -142,17 +145,52 @@ pub fn run() -> sc_cli::Result<()> { }) } Some(Subcommand::Benchmark(cmd)) => { - if cfg!(feature = "runtime-benchmarks") { - let runner = cli.create_runner(cmd)?; - - runner.sync_run(|config| cmd.run::(config)) - } else { - Err( - "Benchmarking wasn't enabled when building the node. You can enable it with \ - `--features runtime-benchmarks`." - .into(), - ) - } + let runner = cli.create_runner(cmd)?; + + runner.sync_run(|config| { + // This switch needs to be in the client, since the client decides + // which sub-commands it wants to support. + match cmd { + BenchmarkCmd::Pallet(cmd) => { + if !cfg!(feature = "runtime-benchmarks") { + return Err( + "Runtime benchmarking wasn't enabled when building the node. \ + You can enable it with `--features runtime-benchmarks`." + .into(), + ); + } + + cmd.run::(config) + } + BenchmarkCmd::Block(cmd) => { + let PartialComponents { client, .. } = service::new_partial(&config)?; + cmd.run(client) + } + BenchmarkCmd::Storage(cmd) => { + let PartialComponents { + client, backend, .. + } = service::new_partial(&config)?; + let db = backend.expose_db(); + let storage = backend.expose_storage(); + + cmd.run(config, client, db, storage) + } + BenchmarkCmd::Overhead(cmd) => { + let PartialComponents { client, .. } = service::new_partial(&config)?; + let ext_builder = BenchmarkExtrinsicBuilder::new(client.clone()); + + cmd.run( + config, + client, + inherent_benchmark_data()?, + Arc::new(ext_builder), + ) + } + BenchmarkCmd::Machine(cmd) => { + cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()) + } + } + }) } Some(Subcommand::GearRuntimeTest(cmd)) => { let runner = cli.create_runner(cmd)?; @@ -179,6 +217,10 @@ pub fn run() -> sc_cli::Result<()> { Some(Subcommand::TryRuntime) => Err("TryRuntime wasn't enabled when building the node. \ You can enable it with `--features try-runtime`." .into()), + Some(Subcommand::ChainInfo(cmd)) => { + let runner = cli.create_runner(cmd)?; + runner.sync_run(|config| cmd.run::(&config)) + } None => { let runner = cli.create_runner(&cli.run)?; runner.run_node_until_exit(|config| async move { diff --git a/node/src/command_helper.rs b/node/src/command_helper.rs new file mode 100644 index 00000000000..90f53836eef --- /dev/null +++ b/node/src/command_helper.rs @@ -0,0 +1,135 @@ +// This file is part of Gear. + +// Copyright (C) 2022 Gear Technologies Inc. +// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0 + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +//! Contains code to setup the command invocations in [`super::command`] which would +//! otherwise bloat that module. + +use crate::service::FullClient; + +use gear_runtime as runtime; +use runtime::SystemCall; +use sc_cli::Result; +use sc_client_api::BlockBackend; +use sp_core::{Encode, Pair}; +use sp_inherents::{InherentData, InherentDataProvider}; +use sp_keyring::Sr25519Keyring; +use sp_runtime::{OpaqueExtrinsic, SaturatedConversion}; + +use std::{sync::Arc, time::Duration}; + +/// Generates extrinsics for the `benchmark overhead` command. +/// +/// Note: Should only be used for benchmarking. +pub struct BenchmarkExtrinsicBuilder { + client: Arc, +} + +impl BenchmarkExtrinsicBuilder { + /// Creates a new [`Self`] from the given client. + pub fn new(client: Arc) -> Self { + Self { client } + } +} + +impl frame_benchmarking_cli::ExtrinsicBuilder for BenchmarkExtrinsicBuilder { + fn remark(&self, nonce: u32) -> std::result::Result { + let acc = Sr25519Keyring::Bob.pair(); + let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic( + self.client.as_ref(), + acc, + SystemCall::remark { remark: vec![] }.into(), + nonce, + ) + .into(); + + Ok(extrinsic) + } +} + +/// Create a transaction using the given `call`. +/// +/// Note: Should only be used for benchmarking. +pub fn create_benchmark_extrinsic( + client: &FullClient, + sender: sp_core::sr25519::Pair, + call: runtime::Call, + nonce: u32, +) -> runtime::UncheckedExtrinsic { + let genesis_hash = client + .block_hash(0) + .ok() + .flatten() + .expect("Genesis block exists; qed"); + let best_hash = client.chain_info().best_hash; + let best_block = client.chain_info().best_number; + + let period = runtime::BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let extra: runtime::SignedExtra = ( + frame_system::CheckNonZeroSender::::new(), + frame_system::CheckSpecVersion::::new(), + frame_system::CheckTxVersion::::new(), + frame_system::CheckGenesis::::new(), + frame_system::CheckEra::::from(sp_runtime::generic::Era::mortal( + period, + best_block.saturated_into(), + )), + frame_system::CheckNonce::::from(nonce), + frame_system::CheckWeight::::new(), + pallet_transaction_payment::ChargeTransactionPayment::::from(0), + ); + + let raw_payload = runtime::SignedPayload::from_raw( + call.clone(), + extra.clone(), + ( + (), + runtime::VERSION.spec_version, + runtime::VERSION.transaction_version, + genesis_hash, + best_hash, + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|e| sender.sign(e)); + + runtime::UncheckedExtrinsic::new_signed( + call, + sp_runtime::AccountId32::from(sender.public()).into(), + runtime::Signature::Sr25519(signature), + extra, + ) +} + +/// Generates inherent data for the `benchmark overhead` command. +/// +/// Note: Should only be used for benchmarking. +pub fn inherent_benchmark_data() -> Result { + let mut inherent_data = InherentData::new(); + let d = Duration::from_millis(0); + let timestamp = sp_timestamp::InherentDataProvider::new(d.into()); + + timestamp + .provide_inherent_data(&mut inherent_data) + .map_err(|e| format!("creating inherent data: {:?}", e))?; + Ok(inherent_data) +} diff --git a/node/src/main.rs b/node/src/main.rs index 84d2791be69..b15d23c8776 100644 --- a/node/src/main.rs +++ b/node/src/main.rs @@ -21,6 +21,7 @@ mod chain_spec; mod service; mod cli; mod command; +mod command_helper; mod rpc; fn main() -> sc_cli::Result<()> { diff --git a/node/src/rpc.rs b/node/src/rpc.rs index d8b4da0ad3d..76963dfa355 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -23,12 +23,14 @@ use std::sync::Arc; use gear_runtime::{opaque::Block, AccountId, Balance, Index}; -pub use sc_rpc_api::DenyUnsafe; +use jsonrpsee::RpcModule; use sc_transaction_pool_api::TransactionPool; use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; +pub use sc_rpc_api::DenyUnsafe; + /// Full client dependencies. pub struct FullDeps { /// The client instance to use. @@ -40,7 +42,9 @@ pub struct FullDeps { } /// Instantiate all full RPC extensions. -pub fn create_full(deps: FullDeps) -> jsonrpc_core::IoHandler +pub fn create_full( + deps: FullDeps, +) -> Result, Box> where C: ProvideRuntimeApi, C: HeaderBackend + HeaderMetadata + 'static, @@ -51,33 +55,26 @@ where C::Api: BlockBuilder, P: TransactionPool + 'static, { - use pallet_gear_rpc::{Gear, GearApi}; - use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi}; - use substrate_frame_rpc_system::{FullSystem, SystemApi}; + use pallet_gear_rpc::{Gear, GearApiServer}; + use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer}; + use substrate_frame_rpc_system::{System, SystemApiServer}; - let mut io = jsonrpc_core::IoHandler::default(); + let mut module = RpcModule::new(()); let FullDeps { client, pool, deny_unsafe, } = deps; - io.extend_with(SystemApi::to_delegate(FullSystem::new( - client.clone(), - pool, - deny_unsafe, - ))); - - io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new( - client.clone(), - ))); + module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + module.merge(TransactionPayment::new(client.clone()).into_rpc())?; // Extend this RPC with a custom API by using the following syntax. // `YourRpcStruct` should have a reference to a client, which is needed // to call into the runtime. // `io.extend_with(YourRpcTrait::to_delegate(YourRpcStruct::new(ReferenceToClient, ...)));` - io.extend_with(GearApi::to_delegate(Gear::new(client))); + module.merge(Gear::new(client).into_rpc())?; - io + Ok(module) } diff --git a/node/src/service.rs b/node/src/service.rs index 98c96b3361f..00a3b04396f 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -51,7 +51,7 @@ impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { } } -type FullClient = +pub(crate) type FullClient = sc_service::TFullClient>; type FullBackend = sc_service::TFullBackend; type FullSelectChain = sc_consensus::LongestChain; @@ -263,8 +263,7 @@ pub fn new_full(mut config: Configuration) -> Result pool: pool.clone(), deny_unsafe, }; - - Ok(crate::rpc::create_full(deps)) + crate::rpc::create_full(deps).map_err(Into::into) }) }; @@ -274,7 +273,7 @@ pub fn new_full(mut config: Configuration) -> Result keystore: keystore_container.sync_keystore(), task_manager: &mut task_manager, transaction_pool: transaction_pool.clone(), - rpc_extensions_builder, + rpc_builder: rpc_extensions_builder, backend, system_rpc_tx, config, diff --git a/pallets/gas/Cargo.toml b/pallets/gas/Cargo.toml index ea647881f2a..53ffc1d1148 100644 --- a/pallets/gas/Cargo.toml +++ b/pallets/gas/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } parity-wasm = { version = "0.42.2", default-features = false, optional = true } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } diff --git a/pallets/gear-debug/Cargo.toml b/pallets/gear-debug/Cargo.toml index 2d080132776..9402a97f7f4 100644 --- a/pallets/gear-debug/Cargo.toml +++ b/pallets/gear-debug/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } log = { version = "0.4.17", default-features = false } diff --git a/pallets/gear-messenger/Cargo.toml b/pallets/gear-messenger/Cargo.toml index 8fe203916d4..06fcce24858 100644 --- a/pallets/gear-messenger/Cargo.toml +++ b/pallets/gear-messenger/Cargo.toml @@ -14,9 +14,9 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } -log = { version = "0.4.16", default-features = false } +log = { version = "0.4.17", default-features = false } # Internal deps common = { package = "gear-common", path = "../../common", default-features = false } diff --git a/pallets/gear-messenger/src/lib.rs b/pallets/gear-messenger/src/lib.rs index 3422fb113e1..198946bae19 100644 --- a/pallets/gear-messenger/src/lib.rs +++ b/pallets/gear-messenger/src/lib.rs @@ -453,7 +453,7 @@ pub mod pallet { type OnPopFront = OnPopFront; type OnPushBack = (); type OnPushFront = OnPushFront; - type OnRemoveAll = (); + type OnClear = (); } // ---- diff --git a/pallets/gear-program/Cargo.toml b/pallets/gear-program/Cargo.toml index ce9476c620e..9509d1bf9c6 100644 --- a/pallets/gear-program/Cargo.toml +++ b/pallets/gear-program/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } log = { version = "0.4.17", default-features = false } diff --git a/pallets/gear-program/src/lib.rs b/pallets/gear-program/src/lib.rs index e2ddab081ca..2d929027684 100644 --- a/pallets/gear-program/src/lib.rs +++ b/pallets/gear-program/src/lib.rs @@ -153,7 +153,6 @@ pub mod pallet { /// /// - `ProgramResumed(H256)` in the case of success. /// - #[frame_support::transactional] #[pallet::weight(::WeightInfo::resume_program(memory_pages.values().map(|p| p.len() as u32).sum()))] pub fn resume_program( origin: OriginFor, diff --git a/pallets/gear-program/src/program.rs b/pallets/gear-program/src/program.rs index 508bc988a26..13bc074ec32 100644 --- a/pallets/gear-program/src/program.rs +++ b/pallets/gear-program/src/program.rs @@ -26,6 +26,6 @@ impl pallet::Pallet { } pub fn reset_storage() { - PausedPrograms::::remove_all(None); + let _ = PausedPrograms::::clear(u32::MAX, None); } } diff --git a/pallets/gear/Cargo.toml b/pallets/gear/Cargo.toml index 66b58834c40..d7a6f9d5740 100644 --- a/pallets/gear/Cargo.toml +++ b/pallets/gear/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } wasm-instrument = { version = "0.1", default-features = false } diff --git a/pallets/gear/rpc/Cargo.toml b/pallets/gear/rpc/Cargo.toml index 9dde29417fc..64c2ecdeccc 100644 --- a/pallets/gear/rpc/Cargo.toml +++ b/pallets/gear/rpc/Cargo.toml @@ -8,9 +8,7 @@ homepage = "https://gear-tech.io" repository = "https://github.com/gear-tech/gear" [dependencies] -jsonrpc-core = "18.0.0" -jsonrpc-core-client = "18.0.0" -jsonrpc-derive = "18.0.0" +jsonrpsee = { version = "0.13.0", features = ["server", "macros"] } # Substrate packages sp-api = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false } diff --git a/pallets/gear/rpc/runtime-api/Cargo.toml b/pallets/gear/rpc/runtime-api/Cargo.toml index ac739fc679b..469b248742d 100644 --- a/pallets/gear/rpc/runtime-api/Cargo.toml +++ b/pallets/gear/rpc/runtime-api/Cargo.toml @@ -16,7 +16,7 @@ pallet-gear = { version = "2.0.0", default-features = false, path = "../../../ge [features] default = ["std"] std = [ - "sp-api/std", - "sp-core/std", - "pallet-gear/std" + "pallet-gear/std", + "sp-api/std", + "sp-core/std", ] diff --git a/pallets/gear/rpc/src/lib.rs b/pallets/gear/rpc/src/lib.rs index 910b56fb8e5..190d5d49dfe 100644 --- a/pallets/gear/rpc/src/lib.rs +++ b/pallets/gear/rpc/src/lib.rs @@ -18,28 +18,36 @@ //! RPC interface for the gear module. -use jsonrpc_core::{Error as RpcError, ErrorCode, Result}; -use jsonrpc_derive::rpc; -pub use pallet_gear_rpc_runtime_api::{GearApi as GearRuntimeApi, HandleKind}; +use std::{convert::TryInto, sync::Arc}; + +use jsonrpsee::{ + core::{async_trait, Error as JsonRpseeError, RpcResult}, + proc_macros::rpc, + types::error::{CallError, ErrorObject}, +}; + +pub use pallet_gear_rpc_runtime_api::HandleKind; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_core::{Bytes, H256}; use sp_rpc::number::NumberOrHex; use sp_runtime::{generic::BlockId, traits::Block as BlockT}; -use std::{convert::TryInto, sync::Arc}; -#[rpc] -pub trait GearApi { - fn get_gas_spent( - &self, - source: H256, - kind: HandleKind, - payload: Bytes, - value: u128, - at: Option, - ) -> Result; +pub use pallet_gear_rpc_runtime_api::GearApi as GearRuntimeApi; + +/// Converts a runtime trap into a [`CallError`]. +fn runtime_error_into_rpc_error(err: impl std::fmt::Debug) -> JsonRpseeError { + CallError::Custom(ErrorObject::owned( + 8000, + "Runtime error", + Some(format!("{:?}", err)), + )) + .into() +} - #[rpc(name = "gear_getInitGasSpent")] +#[rpc(client, server)] +pub trait GearApi { + #[method(name = "gear_getInitGasSpent")] fn get_init_gas_spent( &self, source: H256, @@ -47,11 +55,9 @@ pub trait GearApi { payload: Bytes, value: u128, at: Option, - ) -> Result { - self.get_gas_spent(source, HandleKind::Init(code.to_vec()), payload, value, at) - } + ) -> RpcResult; - #[rpc(name = "gear_getHandleGasSpent")] + #[method(name = "gear_getHandleGasSpent")] fn get_handle_gas_spent( &self, source: H256, @@ -59,11 +65,9 @@ pub trait GearApi { payload: Bytes, value: u128, at: Option, - ) -> Result { - self.get_gas_spent(source, HandleKind::Handle(dest), payload, value, at) - } + ) -> RpcResult; - #[rpc(name = "gear_getReplyGasSpent")] + #[method(name = "gear_getReplyGasSpent")] fn get_reply_gas_spent( &self, source: H256, @@ -72,15 +76,7 @@ pub trait GearApi { payload: Bytes, value: u128, at: Option, - ) -> Result { - self.get_gas_spent( - source, - HandleKind::Reply(message_id, exit_code), - payload, - value, - at, - ) - } + ) -> RpcResult; } /// A struct that implements the [`GearApi`]. @@ -92,7 +88,7 @@ pub struct Gear { } impl Gear { - /// Create new `Gear` instance with the given reference to the client. + /// Creates a new instance of the Gear Rpc helper. pub fn new(client: Arc) -> Self { Self { client, @@ -118,48 +114,104 @@ impl From for i64 { } } -impl GearApi<::Hash> for Gear +#[async_trait] +impl GearApiServer<::Hash, Result>> for Gear where Block: BlockT, C: 'static + ProvideRuntimeApi + HeaderBackend, C::Api: GearRuntimeApi, { - fn get_gas_spent( + fn get_init_gas_spent( &self, source: H256, - kind: HandleKind, + code: Bytes, + payload: Bytes, + value: u128, + at: Option<::Hash>, + ) -> RpcResult { + let api = self.client.runtime_api(); + let at = BlockId::hash(at.unwrap_or_else(|| + // If the block hash is not supplied assume the best block. + self.client.info().best_hash)); + + let runtime_api_result = api + .get_gas_spent( + &at, + source, + HandleKind::Init(code.to_vec()), + payload.to_vec(), + value, + ) + .map_err(runtime_error_into_rpc_error)?; + + match runtime_api_result { + Ok(gas) => Ok(gas.try_into().map_err(runtime_error_into_rpc_error)?), + Err(message) => Err(runtime_error_into_rpc_error(String::from_utf8_lossy( + &message, + ))), + } + } + + fn get_handle_gas_spent( + &self, + source: H256, + dest: H256, + payload: Bytes, + value: u128, + at: Option<::Hash>, + ) -> RpcResult { + let api = self.client.runtime_api(); + let at = BlockId::hash(at.unwrap_or_else(|| + // If the block hash is not supplied assume the best block. + self.client.info().best_hash)); + + let runtime_api_result = api + .get_gas_spent( + &at, + source, + HandleKind::Handle(dest), + payload.to_vec(), + value, + ) + .map_err(runtime_error_into_rpc_error)?; + + match runtime_api_result { + Ok(gas) => Ok(gas.try_into().map_err(runtime_error_into_rpc_error)?), + Err(message) => Err(runtime_error_into_rpc_error(String::from_utf8_lossy( + &message, + ))), + } + } + + fn get_reply_gas_spent( + &self, + source: H256, + message_id: H256, + exit_code: i32, payload: Bytes, value: u128, at: Option<::Hash>, - ) -> Result { + ) -> RpcResult { let api = self.client.runtime_api(); let at = BlockId::hash(at.unwrap_or_else(|| // If the block hash is not supplied assume the best block. self.client.info().best_hash)); let runtime_api_result = api - .get_gas_spent(&at, source, kind, payload.to_vec(), value) - .map_err(|e| RpcError { - code: ErrorCode::ServerError(Error::RuntimeError.into()), - message: "Unable to get gas spent.".into(), - data: Some(format!("{:?}", e).into()), - })?; - - let try_into_rpc_gas_spent = |value: u64| { - value.try_into().map_err(|_| RpcError { - code: ErrorCode::InvalidParams, - message: format!("{} doesn't fit in NumberOrHex representation", value), - data: None, - }) - }; + .get_gas_spent( + &at, + source, + HandleKind::Reply(message_id, exit_code), + payload.to_vec(), + value, + ) + .map_err(runtime_error_into_rpc_error)?; match runtime_api_result { - Ok(gas) => Ok(try_into_rpc_gas_spent(gas)?), - Err(message) => Err(RpcError { - code: ErrorCode::ServerError(Error::RuntimeError.into()), - message: String::from_utf8_lossy(&message).into(), - data: None, - }), + Ok(gas) => Ok(gas.try_into().map_err(runtime_error_into_rpc_error)?), + Err(message) => Err(runtime_error_into_rpc_error(String::from_utf8_lossy( + &message, + ))), } } } diff --git a/pallets/gear/src/benchmarking/mod.rs b/pallets/gear/src/benchmarking/mod.rs index f173419bb42..6d0c63a96d0 100644 --- a/pallets/gear/src/benchmarking/mod.rs +++ b/pallets/gear/src/benchmarking/mod.rs @@ -230,7 +230,7 @@ where let dispatch = dispatch.into_stored(); - QueueOf::::remove_all(); + QueueOf::::clear(); QueueOf::::queue(dispatch).map_err(|_| "Unable to push message")?; let block_info = BlockInfo { diff --git a/pallets/gear/src/lib.rs b/pallets/gear/src/lib.rs index 60cc5b971dc..f47670a91d6 100644 --- a/pallets/gear/src/lib.rs +++ b/pallets/gear/src/lib.rs @@ -600,7 +600,7 @@ pub mod pallet { let dispatch = dispatch.into_stored(); - QueueOf::::remove_all(); + QueueOf::::clear(); QueueOf::::queue(dispatch).map_err(|_| b"Messages storage corrupted".to_vec())?; @@ -1079,7 +1079,6 @@ pub mod pallet { #[pallet::weight( ::WeightInfo::submit_code(code.len() as u32) )] - #[frame_support::transactional] pub fn submit_code(origin: OriginFor, code: Vec) -> DispatchResultWithPostInfo { let who = ensure_signed(origin)?; @@ -1157,7 +1156,6 @@ pub mod pallet { #[pallet::weight( ::WeightInfo::submit_program(code.len() as u32, salt.len() as u32) )] - #[frame_support::transactional] pub fn submit_program( origin: OriginFor, code: Vec, @@ -1289,7 +1287,6 @@ pub mod pallet { /// /// Emits the following events: /// - `DispatchMessageEnqueued(MessageInfo)` when dispatch message is placed in the queue. - #[frame_support::transactional] #[pallet::weight(::WeightInfo::send_message(payload.len() as u32))] pub fn send_message( origin: OriginFor, @@ -1392,7 +1389,6 @@ pub mod pallet { /// - `value`: balance to be transferred to the program once it's been created. /// /// - `DispatchMessageEnqueued(H256)` when dispatch message is placed in the queue. - #[frame_support::transactional] #[pallet::weight(::WeightInfo::send_reply(payload.len() as u32))] pub fn send_reply( origin: OriginFor, @@ -1495,7 +1491,6 @@ pub mod pallet { Ok(().into()) } - #[frame_support::transactional] #[pallet::weight(T::DbWeight::get().writes(1))] pub fn claim_value_from_mailbox( origin: OriginFor, diff --git a/pallets/gear/src/mock.rs b/pallets/gear/src/mock.rs index 2de1839259e..5b5f80f3d82 100644 --- a/pallets/gear/src/mock.rs +++ b/pallets/gear/src/mock.rs @@ -452,7 +452,7 @@ where let dispatch = dispatch.into_stored(); - QueueOf::::remove_all(); + QueueOf::::clear(); QueueOf::::queue(dispatch).map_err(|_| b"Messages storage corrupted".to_vec())?; diff --git a/pallets/gear/src/tests.rs b/pallets/gear/src/tests.rs index f543108dda3..c0f16ed0bdd 100644 --- a/pallets/gear/src/tests.rs +++ b/pallets/gear/src/tests.rs @@ -32,7 +32,7 @@ use demo_distributor::{Request, WASM_BINARY}; use demo_mul_by_const::WASM_BINARY as MUL_CONST_WASM_BINARY; use demo_program_factory::{CreateProgram, WASM_BINARY as PROGRAM_FACTORY_WASM_BINARY}; use demo_waiting_proxy::WASM_BINARY as WAITING_PROXY_WASM_BINARY; -use frame_support::{assert_noop, assert_ok, sp_runtime::traits::Zero}; +use frame_support::{assert_noop, assert_ok, dispatch::Dispatchable, sp_runtime::traits::Zero}; use frame_system::Pallet as SystemPallet; use gear_core::{ code::Code, @@ -250,13 +250,19 @@ fn send_message_expected_failure() { res.expect("submit result was asserted") }; + let send_message_call = crate::mock::Call::Gear(crate::Call::::send_message { + destination: program_id, + payload: EMPTY_PAYLOAD.to_vec(), + gas_limit: DEFAULT_GAS_LIMIT, + value: 0, + }); assert_noop!( - send_default_message(LOW_BALANCE_USER, program_id), + send_message_call.dispatch(Origin::signed(LOW_BALANCE_USER)), Error::::NotEnoughBalanceForReserve ); // Because destination is user, no gas will be reserved - MailboxOf::::remove_all(); + MailboxOf::::clear(); assert_ok!(GearPallet::::send_message( Origin::signed(LOW_BALANCE_USER), USER_1.into(), @@ -1980,7 +1986,7 @@ fn test_create_program_no_code_hash() { assert_init_success(1); // 1 for submitting factory SystemPallet::::reset_events(); - MailboxOf::::remove_all(); + MailboxOf::::clear(); // Try to create multiple programs with non existing code hash assert_ok!(GearPallet::::send_message( @@ -2010,7 +2016,7 @@ fn test_create_program_no_code_hash() { ); SystemPallet::::reset_events(); - MailboxOf::::remove_all(); + MailboxOf::::clear(); // Try to create with invalid code hash assert_ok!(GearPallet::::send_message( @@ -2175,7 +2181,7 @@ fn test_create_program_duplicate() { assert_init_success(2); // +2 from extrinsics (2 submit_program) SystemPallet::::reset_events(); - MailboxOf::::remove_all(); + MailboxOf::::clear(); // Create a new program from program assert_ok!(GearPallet::::send_message( @@ -2271,7 +2277,7 @@ fn test_create_program_duplicate_in_one_execution() { assert!(!MailboxOf::::is_empty(&USER_1)); SystemPallet::::reset_events(); - MailboxOf::::remove_all(); + MailboxOf::::clear(); // Successful child creation assert_ok!(GearPallet::::send_message( @@ -3300,17 +3306,19 @@ fn test_reply_to_terminated_program() { assert_eq!(MailboxOf::::len(&USER_1), 1); // Send reply + let reply_call = crate::mock::Call::Gear(crate::Call::::send_reply { + reply_to_id: mail_id, + payload: EMPTY_PAYLOAD.to_vec(), + gas_limit: 10_000_000, + value: 0, + }); assert_noop!( - GearPallet::::send_reply( - Origin::signed(USER_1), - mail_id, - EMPTY_PAYLOAD.to_vec(), - 10_000_000, - 0 - ), + reply_call.dispatch(Origin::signed(USER_1)), Error::::ProgramIsTerminated, ); + log::debug!("mailbox: {:?}", MailboxOf::::iter_key(USER_1).next()); + // the only way to claim value from terminated destination is a corresponding extrinsic call assert_ok!(GearPallet::::claim_value_from_mailbox( Origin::signed(USER_1), diff --git a/pallets/payment/Cargo.toml b/pallets/payment/Cargo.toml index 2584b7cc5a7..9360f7831dc 100644 --- a/pallets/payment/Cargo.toml +++ b/pallets/payment/Cargo.toml @@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive", "max-encoded-len"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } -log = { version = "0.4.16", default-features = false } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } +log = { version = "0.4.17", default-features = false } parity-wasm = { version = "0.42.2", default-features = false, optional = true } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } diff --git a/pallets/payment/src/mock.rs b/pallets/payment/src/mock.rs index 970d525d3dc..46ec519f35f 100644 --- a/pallets/payment/src/mock.rs +++ b/pallets/payment/src/mock.rs @@ -143,9 +143,9 @@ parameter_types! { impl pallet_transaction_payment::Config for Test { type OnChargeTransaction = CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = ConstU8<5>; type WeightToFee = IdentityFee; + type LengthToFee = IdentityFee; type FeeMultiplierUpdate = pallet_gear_payment::GearFeeMultiplier; } diff --git a/pallets/payment/src/tests.rs b/pallets/payment/src/tests.rs index 9ac56fb767c..654fc89b3c5 100644 --- a/pallets/payment/src/tests.rs +++ b/pallets/payment/src/tests.rs @@ -65,7 +65,7 @@ where T: Config, T::Messenger: Messenger, { - QueueOf::::remove_all(); + QueueOf::::clear(); for i in 0_u64..n { let prog_id = (i + 1).into(); @@ -208,7 +208,7 @@ fn mq_size_affecting_fee_works() { }); let len = 100_usize; - let per_byte_fee = ::TransactionByteFee::get(); + let per_byte_fee = TransactionByteFee::get(); let len_fee = per_byte_fee.saturating_mul(len as u128); let weight = 1000_u64; @@ -297,7 +297,7 @@ fn mq_size_not_affecting_fee_works() { }); let len = 100_usize; - let per_byte_fee = ::TransactionByteFee::get(); + let per_byte_fee = TransactionByteFee::get(); let len_fee = per_byte_fee.saturating_mul(len as u128); let weight = 1000_u64; diff --git a/pallets/usage/Cargo.toml b/pallets/usage/Cargo.toml index 0a857943920..e207ad67a1c 100644 --- a/pallets/usage/Cargo.toml +++ b/pallets/usage/Cargo.toml @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } primitive-types = { version = "0.11.1", default-features = false, features = ["scale-info"] } diff --git a/runtime-interface/Cargo.toml b/runtime-interface/Cargo.toml index 8d6bec8c6b9..0807d2e818b 100644 --- a/runtime-interface/Cargo.toml +++ b/runtime-interface/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.56" [dependencies] gear-core = { path = "../core" } -log = { version = "0.4.8", optional = true } +log = { version = "0.4.17", optional = true } libc = { version = "0.2.101", default-features = false } sp-runtime-interface = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false } sp-std = { version = "4.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false } diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 1208b11f64c..0d66f07ad61 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = ["derive"] } log = { version = "0.4.17", default-features = false } -scale-info = { version = "2.0.1", default-features = false, features = ["derive"] } +scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # Substrate deps frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable" } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 0699d246b7c..ba5687374be 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -27,7 +27,6 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; -pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier}; use sp_api::impl_runtime_apis; use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256}; @@ -60,9 +59,10 @@ pub use frame_support::{ }, StorageValue, }; +pub use frame_system::Call as SystemCall; pub use pallet_balances::Call as BalancesCall; pub use pallet_timestamp::Call as TimestampCall; - +pub use pallet_transaction_payment::{CurrencyAdapter, Multiplier}; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -83,10 +83,6 @@ pub type Signature = MultiSignature; /// to the public key of our transaction signing scheme. pub type AccountId = <::Signer as IdentifyAccount>::AccountId; -/// The type for looking up accounts. We don't expect more than 4 billion of them, but you -/// never know... -pub type AccountIndex = u32; - /// Balance of an account. pub type Balance = u128; @@ -96,9 +92,6 @@ pub type Index = u32; /// A hash of some data used by the chain. pub type Hash = sp_core::H256; -/// Digest item type. -pub type DigestItem = generic::DigestItem; - /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know /// the specifics of the runtime. They can then be made to be agnostic over specific formats /// of data like extrinsics, allowing for them to continue syncing the network through upgrades @@ -130,7 +123,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // The version of the runtime specification. A full node will not attempt to use its native // runtime in substitute for the on-chain Wasm runtime unless all of `spec_name`, // `spec_version`, and `authoring_version` are the same between Wasm and native. - spec_version: 1050, + spec_version: 1060, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -168,8 +161,8 @@ pub fn native_version() -> NativeVersion { const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(25); parameter_types! { - pub const Version: RuntimeVersion = VERSION; pub const BlockHashCount: BlockNumber = 2400; + pub const Version: RuntimeVersion = VERSION; /// We allow for 1/3 of a second of compute with a 2 second average block time. pub BlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights ::with_sensible_defaults(WEIGHT_PER_SECOND / 3, NORMAL_DISPATCH_RATIO); @@ -285,7 +278,7 @@ impl pallet_timestamp::Config for Runtime { /// A timestamp: milliseconds since the unix epoch. type Moment = u64; type OnTimestampSet = Aura; - type MinimumPeriod = MinimumPeriod; + type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>; type WeightInfo = (); } @@ -310,9 +303,9 @@ parameter_types! { impl pallet_transaction_payment::Config for Runtime { type OnChargeTransaction = CurrencyAdapter; - type TransactionByteFee = TransactionByteFee; type OperationalFeeMultiplier = ConstU8<5>; type WeightToFee = IdentityFee; + type LengthToFee = IdentityFee; type FeeMultiplierUpdate = pallet_gear_payment::GearFeeMultiplier; } @@ -505,10 +498,12 @@ pub type SignedExtra = ( frame_system::CheckEra, frame_system::CheckNonce, frame_system::CheckWeight, - pallet_gear_payment::CustomChargeTransactionPayment, + pallet_transaction_payment::ChargeTransactionPayment, ); /// Unchecked extrinsic type as expected by this runtime. pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +/// The payload being signed in transactions. +pub type SignedPayload = generic::SignedPayload; /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -523,6 +518,21 @@ type DebugInfo = GearDebug; #[cfg(not(feature = "debug-mode"))] type DebugInfo = (); +#[cfg(feature = "runtime-benchmarks")] +#[macro_use] +extern crate frame_benchmarking; + +#[cfg(feature = "runtime-benchmarks")] +mod benches { + define_benchmarks!( + [frame_benchmarking, BaselineBench::] + [frame_system, SystemBench::] + [pallet_balances, Balances] + [pallet_timestamp, Timestamp] + [pallet_gear, Gear] + ); +} + impl_runtime_apis! { impl sp_api::Core for Runtime { fn version() -> RuntimeVersion { @@ -672,17 +682,13 @@ impl_runtime_apis! { Vec, Vec, ) { - use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkList}; use frame_support::traits::StorageInfoTrait; use frame_system_benchmarking::Pallet as SystemBench; + use baseline::Pallet as BaselineBench; let mut list = Vec::::new(); - - list_benchmark!(list, extra, frame_system, SystemBench::); - list_benchmark!(list, extra, pallet_balances, Balances); - list_benchmark!(list, extra, pallet_timestamp, Timestamp); - list_benchmark!(list, extra, pallet_gear_program, GearProgram); - list_benchmark!(list, extra, pallet_gear, Gear); + list_benchmarks!(list, extra); let storage_info = AllPalletsWithSystem::storage_info(); @@ -692,10 +698,13 @@ impl_runtime_apis! { fn dispatch_benchmark( config: frame_benchmarking::BenchmarkConfig ) -> Result, sp_runtime::RuntimeString> { - use frame_benchmarking::{Benchmarking, BenchmarkBatch, add_benchmark, TrackedStorageKey}; + use frame_benchmarking::{baseline, Benchmarking, BenchmarkBatch, TrackedStorageKey}; use frame_system_benchmarking::Pallet as SystemBench; + use baseline::Pallet as BaselineBench; + impl frame_system_benchmarking::Config for Runtime {} + impl baseline::Config for Runtime {} let whitelist: Vec = vec![ // Block Number @@ -712,14 +721,8 @@ impl_runtime_apis! { let mut batches = Vec::::new(); let params = (&config, &whitelist); + add_benchmarks!(params, batches); - add_benchmark!(params, batches, frame_system, SystemBench::); - add_benchmark!(params, batches, pallet_balances, Balances); - add_benchmark!(params, batches, pallet_timestamp, Timestamp); - add_benchmark!(params, batches, pallet_gear_program, GearProgram); - add_benchmark!(params, batches, pallet_gear, Gear); - - if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) } Ok(batches) } } diff --git a/utils/economic-checks/Cargo.toml b/utils/economic-checks/Cargo.toml index 215d69d1fe0..bba22edd005 100644 --- a/utils/economic-checks/Cargo.toml +++ b/utils/economic-checks/Cargo.toml @@ -7,12 +7,12 @@ license = "GPL-3.0" [dependencies] codec = { package = "parity-scale-codec", version = "3.1.2", features = ["derive"] } -log = { version = "0.4.14" } +log = { version = "0.4.17" } parity-wasm = { version = "0.42.2" } parking_lot = "0.12.0" primitive-types = { version = "0.11.1", features = ["scale-info"] } rand = { version = "0.8.5", default-features = false, features = ["std_rng"] } -serde = "1.0.136" +serde = "1" env_logger = "0.9" hex = "0.4.3" arbitrary = { version = "1" } diff --git a/utils/gear-runtime-test-cli/src/command.rs b/utils/gear-runtime-test-cli/src/command.rs index 1b8ae5abfed..b3d7bae34c4 100644 --- a/utils/gear-runtime-test-cli/src/command.rs +++ b/utils/gear-runtime-test-cli/src/command.rs @@ -86,7 +86,7 @@ impl GearRuntimeTestCmd { let output = run_fixture(test, fixture); let elapsed = now.elapsed(); - MailboxOf::::remove_all(); + MailboxOf::::clear(); println!("Fixture {}: {}", fixture.title.bold(), output); if !output.contains("Ok") && !output.contains("Skip") { diff --git a/utils/junit-common/Cargo.toml b/utils/junit-common/Cargo.toml index b1de69069fc..0e039010e60 100644 --- a/utils/junit-common/Cargo.toml +++ b/utils/junit-common/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" license = "GPL-3.0" [dependencies] -serde = { version = "1.0.137", features = ["derive"] } +serde = { version = "1", features = ["derive"] } diff --git a/utils/regression-analysis/Cargo.toml b/utils/regression-analysis/Cargo.toml index 7d27c3775c5..f841a8f0d59 100644 --- a/utils/regression-analysis/Cargo.toml +++ b/utils/regression-analysis/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" license = "GPL-3.0" [dependencies] -clap = { version = "3.1.18", features = ["derive"] } +clap = { version = "3.1", features = ["derive"] } quick-xml = { version = "0.23", features = [ "serialize" ] } tabled = "0.7.0" common = { package = "junit-common", path = "../junit-common" } diff --git a/utils/wasm-proc/Cargo.toml b/utils/wasm-proc/Cargo.toml index ae4d42ca505..d1534f4b519 100644 --- a/utils/wasm-proc/Cargo.toml +++ b/utils/wasm-proc/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2018" [dependencies] -clap = "3.1.18" +clap = "3.1" log = "0.4.17" env_logger = "0.9.0" pwasm-utils = "0.19.0"