From fe58b85d581b0bdd746de9aa24bce2b73b2fb283 Mon Sep 17 00:00:00 2001 From: Aleksandr Krupenkin Date: Mon, 16 Jan 2023 11:38:31 +0300 Subject: [PATCH 01/10] EVM tracing support (#802) * Added EVM tracing into local runtime * Added tracing CLI * Compilation fixes * Added EVM tracing host functions * Added EVM tracing into parachain runtimes * TracingConfig -> EvmTracingConfig * Compilation fixes * Fix clippy errors * Fix formatting * Updated dependencies in Cargo.lock * Updated Cargo.lock * Update bin/collator/src/local/service.rs Co-authored-by: Shunsuke Watanabe * Update bin/collator/src/parachain/service.rs Co-authored-by: Shunsuke Watanabe * Bump astar/shiden runtime specs Co-authored-by: Shunsuke Watanabe --- Cargo.lock | 1340 +++++++++++++++---------- bin/collator/Cargo.toml | 9 +- bin/collator/src/cli.rs | 91 ++ bin/collator/src/command.rs | 19 +- bin/collator/src/local/service.rs | 42 +- bin/collator/src/parachain/service.rs | 58 +- bin/collator/src/rpc.rs | 37 +- bin/collator/src/rpc/tracing.rs | 123 +++ runtime/astar/Cargo.toml | 7 +- runtime/astar/src/lib.rs | 66 +- runtime/local/Cargo.toml | 10 +- runtime/local/src/lib.rs | 68 +- runtime/shibuya/Cargo.toml | 7 +- runtime/shibuya/src/lib.rs | 64 ++ runtime/shiden/Cargo.toml | 7 +- runtime/shiden/src/lib.rs | 66 +- 16 files changed, 1461 insertions(+), 553 deletions(-) create mode 100644 bin/collator/src/rpc/tracing.rs diff --git a/Cargo.lock b/Cargo.lock index 0e7856e837..dacee1d72d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.0", ] [[package]] @@ -75,9 +84,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -108,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "approx" @@ -123,9 +132,9 @@ dependencies = [ [[package]] name = "array-bytes" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "array-bytes" @@ -165,7 +174,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "astar-collator" -version = "4.44.0" +version = "5.0.0" dependencies = [ "astar-runtime", "async-trait", @@ -195,10 +204,14 @@ dependencies = [ "frame-benchmarking-cli", "frame-system", "frame-try-runtime", - "futures", + "futures 0.3.25", "jsonrpsee", "local-runtime", "log", + "moonbeam-primitives-ext", + "moonbeam-rpc-debug", + "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-trace", "pallet-block-reward", "pallet-ethereum", "pallet-evm", @@ -249,13 +262,14 @@ dependencies = [ "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", + "tokio", "try-runtime-cli", "url", ] [[package]] name = "astar-runtime" -version = "4.44.0" +version = "5.0.0" dependencies = [ "array-bytes 6.0.0", "cumulus-pallet-aura-ext", @@ -266,6 +280,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", + "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -276,6 +291,8 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "log", + "moonbeam-evm-tracer", + "moonbeam-rpc-primitives-debug", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -350,11 +367,11 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ - "concurrent-queue 1.2.4", + "concurrent-queue", "event-listener", "futures-core", ] @@ -367,7 +384,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.0.0", + "concurrent-queue", "fastrand", "futures-lite", "slab", @@ -390,13 +407,13 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", - "concurrent-queue 1.2.4", + "concurrent-queue", "futures-lite", "libc", "log", @@ -405,7 +422,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -420,20 +437,20 @@ dependencies = [ [[package]] name = "async-process" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4" dependencies = [ "async-io", + "async-lock", "autocfg", "blocking", "cfg-if", "event-listener", "futures-lite", "libc", - "once_cell", "signal-hook", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -487,9 +504,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" dependencies = [ "proc-macro2", "quote", @@ -511,9 +528,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" [[package]] name = "atty" @@ -560,16 +577,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.30.2", "rustc-demangle", ] @@ -597,6 +614,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "base64ct" version = "1.5.3" @@ -617,11 +640,11 @@ name = "beefy-gadget" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "async-trait", "beefy-primitives", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -656,7 +679,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2d dependencies = [ "beefy-gadget", "beefy-primitives", - "futures", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", @@ -744,11 +767,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -759,7 +782,7 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -770,21 +793,21 @@ checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", "cfg-if", - "constant_time_eq", - "digest 0.10.5", + "constant_time_eq 0.2.4", + "digest 0.10.6", ] [[package]] @@ -828,16 +851,16 @@ dependencies = [ [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", ] [[package]] @@ -857,11 +880,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.17" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" dependencies = [ "memchr", + "serde", ] [[package]] @@ -899,9 +923,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "bzip2-sys" @@ -914,17 +938,11 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" dependencies = [ "serde", ] @@ -946,16 +964,16 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.16", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -1017,9 +1035,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", @@ -1074,9 +1092,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" dependencies = [ "bitflags", "clap_derive", @@ -1089,9 +1107,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -1102,9 +1120,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] @@ -1133,9 +1151,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.2" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "strum", "strum_macros", @@ -1144,18 +1162,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -1172,6 +1181,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constant_time_eq" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" + [[package]] name = "convert_case" version = "0.4.0" @@ -1243,7 +1258,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log", "regalloc2", "smallvec", @@ -1351,22 +1366,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset", + "memoffset 0.7.1", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1374,9 +1389,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -1451,7 +1466,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "clap", "parity-scale-codec", @@ -1466,12 +1481,12 @@ dependencies = [ [[package]] name = "cumulus-client-collator" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-client-consensus-common", "cumulus-client-network", "cumulus-primitives-core", - "futures", + "futures 0.3.25", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-primitives", @@ -1489,12 +1504,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-aura" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", - "futures", + "futures 0.3.25", "parity-scale-codec", "sc-client-api", "sc-consensus", @@ -1518,12 +1533,12 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-common" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-relay-chain-interface", "dyn-clone", - "futures", + "futures 0.3.25", "parity-scale-codec", "polkadot-primitives", "sc-client-api", @@ -1538,13 +1553,13 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures", + "futures 0.3.25", "parking_lot 0.12.1", "sc-consensus", "sp-api", @@ -1561,11 +1576,11 @@ dependencies = [ [[package]] name = "cumulus-client-network" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-relay-chain-interface", - "futures", + "futures 0.3.25", "futures-timer", "parity-scale-codec", "parking_lot 0.12.1", @@ -1584,11 +1599,11 @@ dependencies = [ [[package]] name = "cumulus-client-pov-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures", + "futures 0.3.25", "futures-timer", "parity-scale-codec", "polkadot-node-primitives", @@ -1607,7 +1622,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -1630,7 +1645,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "frame-support", "frame-system", @@ -1646,7 +1661,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-dmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1663,7 +1678,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "bytes", "cumulus-pallet-parachain-system-proc-macro", @@ -1691,7 +1706,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1702,7 +1717,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1718,7 +1733,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-xcmp-queue" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1736,7 +1751,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-core" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -1751,7 +1766,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-parachain-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -1774,10 +1789,10 @@ dependencies = [ [[package]] name = "cumulus-primitives-timestamp" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", - "futures", + "futures 0.3.25", "parity-scale-codec", "sp-inherents", "sp-std", @@ -1787,7 +1802,7 @@ dependencies = [ [[package]] name = "cumulus-primitives-utility" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1803,12 +1818,12 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures", + "futures 0.3.25", "futures-timer", "polkadot-cli", "polkadot-client", @@ -1828,11 +1843,11 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "cumulus-primitives-core", - "futures", + "futures 0.3.25", "jsonrpsee-core", "parity-scale-codec", "polkadot-overseer", @@ -1847,14 +1862,14 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", - "futures", + "futures 0.3.25", "lru", "polkadot-availability-distribution", "polkadot-core-primitives", @@ -1891,13 +1906,13 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "async-trait", "backoff", "cumulus-primitives-core", "cumulus-relay-chain-interface", - "futures", + "futures 0.3.25", "futures-timer", "jsonrpsee", "parity-scale-codec", @@ -1919,7 +1934,7 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", @@ -1957,22 +1972,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -1982,9 +1998,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", @@ -1997,15 +2013,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", @@ -2015,7 +2031,7 @@ dependencies = [ [[package]] name = "dapps-staking-chain-extension-types" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "parity-scale-codec", @@ -2026,9 +2042,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -2052,9 +2068,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "zeroize", @@ -2110,9 +2126,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -2184,9 +2200,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "dyn-clonable" @@ -2211,9 +2227,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -2229,9 +2245,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "signature", ] @@ -2279,7 +2295,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.5", + "digest 0.10.6", "ff", "generic-array 0.14.6", "group", @@ -2323,9 +2339,9 @@ dependencies = [ [[package]] name = "enumn" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2" +checksum = "e88bcb3a067a6555d577aba299e75eff9942da276e6506fc6274327daa026132" dependencies = [ "proc-macro2", "quote", @@ -2345,11 +2361,24 @@ dependencies = [ "termcolor", ] +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "errno" @@ -2485,13 +2514,28 @@ dependencies = [ "sha3 0.10.6", ] +[[package]] +name = "evm-tracing-events" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "environmental", + "ethereum", + "ethereum-types", + "evm", + "evm-gasometer", + "evm-runtime", + "parity-scale-codec", + "sp-runtime-interface", +] + [[package]] name = "exit-future" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures", + "futures 0.3.25", ] [[package]] @@ -2617,7 +2661,7 @@ dependencies = [ "fc-db", "fp-consensus", "fp-rpc", - "futures", + "futures 0.3.25", "futures-timer", "log", "sc-client-api", @@ -2640,7 +2684,7 @@ dependencies = [ "fp-evm", "fp-rpc", "fp-storage", - "futures", + "futures 0.3.25", "hex", "jsonrpsee", "libsecp256k1", @@ -2702,21 +2746,27 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger", + "env_logger 0.10.0", "log", ] [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if", "libc", @@ -2726,12 +2776,12 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" dependencies = [ "either", - "futures", + "futures 0.3.25", "futures-timer", "log", "num-traits", @@ -2760,9 +2810,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", @@ -2916,7 +2966,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "Inflector", - "array-bytes 4.1.0", + "array-bytes 4.2.0", "chrono", "clap", "comfy-table", @@ -3168,6 +3218,12 @@ 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.25" @@ -3278,6 +3334,7 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ + "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -3373,17 +3430,23 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -3394,9 +3457,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b" dependencies = [ "futures-channel", "futures-core", @@ -3436,9 +3499,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -3501,6 +3564,9 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "hex-literal" @@ -3534,7 +3600,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3625,9 +3691,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -3702,7 +3768,7 @@ dependencies = [ "async-io", "core-foundation", "fnv", - "futures", + "futures 0.3.25", "if-addrs", "ipnet", "log", @@ -3751,9 +3817,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -3792,9 +3858,9 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" dependencies = [ "libc", "windows-sys 0.42.0", @@ -3808,9 +3874,9 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" +checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be" dependencies = [ "socket2", "widestring", @@ -3820,19 +3886,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 1.0.1", - "rustix 0.36.4", + "io-lifetimes 1.0.4", + "rustix 0.36.6", "windows-sys 0.42.0", ] @@ -3847,9 +3913,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -4027,9 +4093,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "kusama-runtime" @@ -4205,9 +4274,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -4219,6 +4288,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + [[package]] name = "libm" version = "0.2.6" @@ -4232,7 +4307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "futures-timer", "getrandom 0.2.8", "instant", @@ -4270,7 +4345,7 @@ dependencies = [ "ed25519-dalek", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", "lazy_static", @@ -4299,7 +4374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" dependencies = [ "async-std-resolver", - "futures", + "futures 0.3.25", "libp2p-core", "log", "parking_lot 0.12.1", @@ -4314,7 +4389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" dependencies = [ "asynchronous-codec", - "futures", + "futures 0.3.25", "futures-timer", "libp2p-core", "libp2p-swarm", @@ -4339,7 +4414,7 @@ dependencies = [ "bytes", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", "libp2p-core", @@ -4365,7 +4440,7 @@ dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures", + "futures 0.3.25", "if-watch", "libp2p-core", "libp2p-swarm", @@ -4398,7 +4473,7 @@ checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" dependencies = [ "asynchronous-codec", "bytes", - "futures", + "futures 0.3.25", "libp2p-core", "log", "nohash-hasher", @@ -4416,7 +4491,7 @@ checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures", + "futures 0.3.25", "lazy_static", "libp2p-core", "log", @@ -4436,7 +4511,7 @@ version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "instant", "libp2p-core", @@ -4454,7 +4529,7 @@ checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" dependencies = [ "async-trait", "bytes", - "futures", + "futures 0.3.25", "instant", "libp2p-core", "libp2p-swarm", @@ -4472,7 +4547,7 @@ checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" dependencies = [ "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", "libp2p-core", @@ -4502,7 +4577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" dependencies = [ "async-io", - "futures", + "futures 0.3.25", "futures-timer", "if-watch", "libc", @@ -4517,7 +4592,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" dependencies = [ - "futures", + "futures 0.3.25", "js-sys", "libp2p-core", "parity-send-wrapper", @@ -4532,7 +4607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" dependencies = [ "either", - "futures", + "futures 0.3.25", "futures-rustls", "libp2p-core", "log", @@ -4550,7 +4625,7 @@ version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12" dependencies = [ - "futures", + "futures 0.3.25", "libp2p-core", "log", "parking_lot 0.12.1", @@ -4580,7 +4655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4634,9 +4709,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -4674,15 +4749,16 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb68f22743a3fb35785f1e7f844ca5a3de2dde5bd0c0ef5b372065814699b121" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "local-runtime" -version = "4.44.0" +version = "5.0.0" dependencies = [ "array-bytes 6.0.0", + "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -4693,6 +4769,8 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "log", + "moonbeam-evm-tracer", + "moonbeam-rpc-primitives-debug", "pallet-assets", "pallet-assets-chain-extension", "pallet-aura", @@ -4859,7 +4937,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.4", + "rustix 0.36.6", ] [[package]] @@ -4880,6 +4958,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memory-db" version = "0.30.0" @@ -4924,7 +5011,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ - "futures", + "futures 0.3.25", "rand 0.8.5", "thrift", ] @@ -4937,9 +5024,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -4983,6 +5070,174 @@ dependencies = [ "syn", ] +[[package]] +name = "moonbeam-client-evm-tracing" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "evm-tracing-events", + "hex", + "moonbeam-rpc-primitives-debug", + "parity-scale-codec", + "serde", + "serde_json", + "sp-std", +] + +[[package]] +name = "moonbeam-evm-tracer" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "evm", + "evm-gasometer", + "evm-runtime", + "evm-tracing-events", + "fp-evm", + "moonbeam-primitives-ext", + "pallet-evm", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "moonbeam-primitives-ext" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "evm-tracing-events", + "parity-scale-codec", + "sp-externalities", + "sp-runtime-interface", + "sp-std", +] + +[[package]] +name = "moonbeam-rpc-core-debug" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "futures 0.3.25", + "jsonrpsee", + "moonbeam-client-evm-tracing", + "moonbeam-rpc-core-types", + "serde", + "serde_json", + "sp-core", +] + +[[package]] +name = "moonbeam-rpc-core-trace" +version = "0.6.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "futures 0.3.25", + "jsonrpsee", + "moonbeam-client-evm-tracing", + "moonbeam-rpc-core-types", + "serde", + "serde_json", +] + +[[package]] +name = "moonbeam-rpc-core-types" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum-types", + "serde", + "serde_json", +] + +[[package]] +name = "moonbeam-rpc-debug" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum", + "ethereum-types", + "fc-consensus", + "fc-db", + "fc-rpc", + "fp-rpc", + "futures 0.3.25", + "hex-literal", + "jsonrpsee", + "moonbeam-client-evm-tracing", + "moonbeam-rpc-core-debug", + "moonbeam-rpc-core-types", + "moonbeam-rpc-primitives-debug", + "sc-client-api", + "sc-utils", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-core", + "sp-io", + "sp-runtime", + "tokio", +] + +[[package]] +name = "moonbeam-rpc-primitives-debug" +version = "0.1.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "environmental", + "ethereum", + "ethereum-types", + "hex", + "parity-scale-codec", + "serde", + "serde_json", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "moonbeam-rpc-trace" +version = "0.6.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" +dependencies = [ + "ethereum", + "ethereum-types", + "fc-consensus", + "fc-rpc", + "fc-rpc-core", + "fp-rpc", + "futures 0.3.25", + "jsonrpsee", + "moonbeam-client-evm-tracing", + "moonbeam-rpc-core-trace", + "moonbeam-rpc-core-types", + "moonbeam-rpc-primitives-debug", + "sc-client-api", + "sc-network", + "sc-utils", + "serde", + "sha3 0.10.6", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-io", + "sp-runtime", + "sp-std", + "sp-transaction-pool", + "tokio", + "tracing", +] + [[package]] name = "multiaddr" version = "0.14.0" @@ -5022,7 +5277,7 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.5", + "digest 0.10.6", "multihash-derive", "sha2 0.10.6", "sha3 0.10.6", @@ -5056,7 +5311,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "log", "pin-project", "smallvec", @@ -5152,7 +5407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "log", "netlink-packet-core", "netlink-sys", @@ -5168,16 +5423,16 @@ checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ "async-io", "bytes", - "futures", + "futures 0.3.25", "libc", "log", ] [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if", @@ -5192,9 +5447,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -5242,9 +5497,9 @@ dependencies = [ [[package]] name = "num-format" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec 0.7.2", "itoa", @@ -5290,16 +5545,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.6", ] [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] @@ -5374,11 +5629,20 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -5406,7 +5670,7 @@ checksum = "0aab54694ddaa8a9b703724c6ef04272b2d27bc32d2c855aae5cdd1857216b43" dependencies = [ "async-trait", "dyn-clonable", - "futures", + "futures 0.3.25", "futures-timer", "orchestra-proc-macro", "pin-project", @@ -5441,9 +5705,19 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.0" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "packed_simd_2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] [[package]] name = "pallet-assets" @@ -5612,7 +5886,7 @@ name = "pallet-beefy-mmr" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "beefy-merkle-tree", "beefy-primitives", "frame-support", @@ -5633,7 +5907,7 @@ dependencies = [ [[package]] name = "pallet-block-reward" version = "2.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5670,7 +5944,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-dapps-staking" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "dapps-staking-chain-extension-types", "frame-support", @@ -5690,7 +5964,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "frame-system", @@ -5729,7 +6003,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.3.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -5848,7 +6122,7 @@ dependencies = [ [[package]] name = "pallet-custom-signatures" version = "4.6.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "frame-system", @@ -5864,7 +6138,7 @@ dependencies = [ [[package]] name = "pallet-dapps-staking" version = "3.9.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6024,7 +6298,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-assets-erc20" version = "0.5.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "frame-support", @@ -6111,7 +6385,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sr25519" version = "1.2.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "log", @@ -6127,7 +6401,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-substrate-ecdsa" version = "1.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "log", @@ -6143,7 +6417,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xcm" version = "0.9.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "frame-support", @@ -6166,7 +6440,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "frame-support", @@ -6448,7 +6722,7 @@ dependencies = [ [[package]] name = "pallet-precompile-dapps-staking" version = "3.6.3" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "fp-evm", "frame-support", @@ -6850,7 +7124,7 @@ dependencies = [ [[package]] name = "pallet-xc-asset-config" version = "1.3.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-benchmarking", "frame-support", @@ -6868,7 +7142,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.28" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "frame-system", @@ -6921,7 +7195,7 @@ dependencies = [ [[package]] name = "pallet-xvm" version = "0.2.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "frame-system", @@ -6940,7 +7214,7 @@ dependencies = [ [[package]] name = "parachain-info" version = "0.1.0" -source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#eb044b17ef24e7f10fa3408ffbd900f8a9da837f" +source = "git+https://github.com/paritytech/cumulus?branch=polkadot-v0.9.33#27721d794ee63aae42317a7eeda21595dd3200d9" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -7052,7 +7326,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -7062,14 +7336,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.6", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -7081,9 +7355,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if", "libc", @@ -7094,9 +7368,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pbkdf2" @@ -7130,9 +7404,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a" dependencies = [ "thiserror", "ucd-trie", @@ -7140,9 +7414,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f" +checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6" dependencies = [ "pest", "pest_generator", @@ -7150,9 +7424,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4" +checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c" dependencies = [ "pest", "pest_meta", @@ -7163,13 +7437,13 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.4.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe" +checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51" dependencies = [ "once_cell", "pest", - "sha1", + "sha2 0.10.6", ] [[package]] @@ -7242,12 +7516,18 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polkadot-approval-distribution" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7262,7 +7542,7 @@ name = "polkadot-availability-bitfield-distribution" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7278,7 +7558,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "derive_more", "fatality", - "futures", + "futures 0.3.25", "lru", "parity-scale-codec", "polkadot-erasure-coding", @@ -7300,7 +7580,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "fatality", - "futures", + "futures 0.3.25", "lru", "parity-scale-codec", "polkadot-erasure-coding", @@ -7322,7 +7602,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "clap", "frame-benchmarking-cli", - "futures", + "futures 0.3.25", "log", "polkadot-client", "polkadot-node-core-pvf", @@ -7389,7 +7669,7 @@ dependencies = [ "always-assert", "bitvec", "fatality", - "futures", + "futures 0.3.25", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -7423,7 +7703,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "derive_more", "fatality", - "futures", + "futures 0.3.25", "futures-timer", "indexmap", "lru", @@ -7460,7 +7740,7 @@ name = "polkadot-gossip-support" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -7484,7 +7764,7 @@ dependencies = [ "async-trait", "bytes", "fatality", - "futures", + "futures 0.3.25", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-network-protocol", @@ -7504,7 +7784,7 @@ name = "polkadot-node-collation-generation" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-primitives", @@ -7524,7 +7804,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "bitvec", "derive_more", - "futures", + "futures 0.3.25", "futures-timer", "kvdb", "lru", @@ -7552,7 +7832,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "bitvec", - "futures", + "futures 0.3.25", "futures-timer", "kvdb", "parity-scale-codec", @@ -7573,7 +7853,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "bitvec", "fatality", - "futures", + "futures 0.3.25", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7590,7 +7870,7 @@ name = "polkadot-node-core-bitfield-signing" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -7606,7 +7886,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "parity-scale-codec", "polkadot-node-core-pvf", @@ -7624,7 +7904,7 @@ name = "polkadot-node-core-chain-api" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "polkadot-primitives", @@ -7639,7 +7919,7 @@ name = "polkadot-node-core-chain-selection" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "kvdb", "parity-scale-codec", @@ -7657,7 +7937,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "fatality", - "futures", + "futures 0.3.25", "kvdb", "lru", "parity-scale-codec", @@ -7676,7 +7956,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "polkadot-node-subsystem", "polkadot-primitives", @@ -7694,7 +7974,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "bitvec", "fatality", - "futures", + "futures 0.3.25", "futures-timer", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7714,7 +7994,7 @@ dependencies = [ "assert_matches", "async-process", "async-std", - "futures", + "futures 0.3.25", "futures-timer", "parity-scale-codec", "pin-project", @@ -7742,7 +8022,7 @@ name = "polkadot-node-core-pvf-checker" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -7758,7 +8038,7 @@ name = "polkadot-node-core-runtime-api" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "futures", + "futures 0.3.25", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -7793,7 +8073,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "bs58", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -7814,7 +8094,7 @@ dependencies = [ "async-trait", "derive_more", "fatality", - "futures", + "futures 0.3.25", "hex", "parity-scale-codec", "polkadot-node-jaeger", @@ -7835,7 +8115,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "bounded-vec", - "futures", + "futures 0.3.25", "parity-scale-codec", "polkadot-parachain", "polkadot-primitives", @@ -7868,7 +8148,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "async-trait", "derive_more", - "futures", + "futures 0.3.25", "orchestra", "polkadot-node-jaeger", "polkadot-node-network-protocol", @@ -7892,7 +8172,7 @@ dependencies = [ "async-trait", "derive_more", "fatality", - "futures", + "futures 0.3.25", "itertools", "kvdb", "lru", @@ -7923,7 +8203,7 @@ version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "lru", "orchestra", @@ -7962,7 +8242,7 @@ name = "polkadot-performance-test" version = "0.9.33" source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6c21242fc654f6f069e12c00951484dff334d" dependencies = [ - "env_logger", + "env_logger 0.9.3", "kusama-runtime", "log", "polkadot-erasure-coding", @@ -8247,7 +8527,7 @@ dependencies = [ "beefy-primitives", "frame-support", "frame-system-rpc-runtime-api", - "futures", + "futures 0.3.25", "hex-literal", "kusama-runtime", "kvdb", @@ -8348,7 +8628,7 @@ source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.33#c7d6 dependencies = [ "arrayvec 0.5.2", "fatality", - "futures", + "futures 0.3.25", "indexmap", "parity-scale-codec", "polkadot-node-network-protocol", @@ -8374,16 +8654,16 @@ dependencies = [ [[package]] name = "polling" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -8418,7 +8698,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.4.3" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "evm", "fp-evm", @@ -8441,7 +8721,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "num_enum", "proc-macro2", @@ -8452,9 +8732,9 @@ dependencies = [ [[package]] name = "predicates" -version = "2.1.3" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6bd09a7f7e68f3f0bf710fb7ab9c4615a488b58b5f653382a687701e458c92" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", @@ -8482,9 +8762,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -8513,7 +8793,7 @@ dependencies = [ "coarsetime", "crossbeam-queue", "derive_more", - "futures", + "futures 0.3.25", "futures-timer", "nanorand", "thiserror", @@ -8557,9 +8837,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -8603,9 +8883,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -8613,9 +8893,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8b442418ea0822409d9e7d047cbf1e7e9e1760b172bf9982cf29d517c93511" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", "heck", @@ -8648,9 +8928,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools", @@ -8661,9 +8941,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -8697,9 +8977,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -8818,21 +9098,19 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -8875,18 +9153,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", @@ -8907,9 +9185,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -8936,7 +9214,7 @@ name = "remote-externalities" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "env_logger", + "env_logger 0.9.3", "log", "parity-scale-codec", "serde", @@ -8999,7 +9277,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -9135,11 +9413,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c9f5d2a0c3e2ea729ab3706d22217177770654c3ef5056b68b69d07332d3f5" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi", ] @@ -9150,7 +9429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ "async-global-executor", - "futures", + "futures 0.3.25", "log", "netlink-packet-route", "netlink-proto", @@ -9158,6 +9437,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -9191,7 +9480,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", ] [[package]] @@ -9210,23 +9499,23 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.4" +version = "0.36.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.1", + "io-lifetimes 1.0.4", "libc", - "linux-raw-sys 0.1.2", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -9248,18 +9537,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" @@ -9267,16 +9556,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures", + "futures 0.3.25", "pin-project", "static_assertions", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe-mix" @@ -9313,7 +9602,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "ip_network", "libp2p", @@ -9339,7 +9628,7 @@ name = "sc-basic-authorship" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -9406,11 +9695,11 @@ name = "sc-cli" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "chrono", "clap", "fdlimit", - "futures", + "futures 0.3.25", "libp2p", "log", "names", @@ -9447,7 +9736,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "fnv", - "futures", + "futures 0.3.25", "hash-db", "log", "parity-scale-codec", @@ -9500,7 +9789,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "libp2p", "log", @@ -9524,7 +9813,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "log", "parity-scale-codec", "sc-block-builder", @@ -9554,7 +9843,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2d dependencies = [ "async-trait", "fork-tree", - "futures", + "futures 0.3.25", "log", "merlin", "num-bigint", @@ -9593,7 +9882,7 @@ name = "sc-consensus-babe-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", @@ -9629,7 +9918,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -9730,12 +10019,12 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "ahash", - "array-bytes 4.1.0", + "array-bytes 4.2.0", "async-trait", "dyn-clone", "finality-grandpa", "fork-tree", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -9771,7 +10060,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "finality-grandpa", - "futures", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", @@ -9792,7 +10081,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "ansi_term", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-util-mem", @@ -9808,7 +10097,7 @@ name = "sc-keystore" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "async-trait", "parking_lot 0.12.1", "serde_json", @@ -9823,7 +10112,7 @@ name = "sc-network" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "async-trait", "asynchronous-codec", "bitflags", @@ -9832,7 +10121,7 @@ dependencies = [ "either", "fnv", "fork-tree", - "futures", + "futures 0.3.25", "futures-timer", "ip_network", "libp2p", @@ -9871,7 +10160,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "cid", - "futures", + "futures 0.3.25", "libp2p", "log", "prost", @@ -9893,7 +10182,7 @@ dependencies = [ "async-trait", "bitflags", "bytes", - "futures", + "futures 0.3.25", "futures-timer", "libp2p", "linked_hash_set", @@ -9917,7 +10206,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "ahash", - "futures", + "futures 0.3.25", "futures-timer", "libp2p", "log", @@ -9934,8 +10223,8 @@ name = "sc-network-light" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", - "futures", + "array-bytes 4.2.0", + "futures 0.3.25", "libp2p", "log", "parity-scale-codec", @@ -9955,9 +10244,9 @@ name = "sc-network-sync" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "fork-tree", - "futures", + "futures 0.3.25", "libp2p", "log", "lru", @@ -9985,8 +10274,8 @@ name = "sc-network-transactions" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", - "futures", + "array-bytes 4.2.0", + "futures 0.3.25", "hex", "libp2p", "log", @@ -10004,10 +10293,10 @@ name = "sc-offchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "bytes", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "hyper", "hyper-rustls", @@ -10034,7 +10323,7 @@ name = "sc-peerset" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "libp2p", "log", "sc-utils", @@ -10056,7 +10345,7 @@ name = "sc-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "hash-db", "jsonrpsee", "log", @@ -10086,7 +10375,7 @@ name = "sc-rpc-api" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", @@ -10109,7 +10398,7 @@ name = "sc-rpc-server" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "jsonrpsee", "log", "serde_json", @@ -10122,7 +10411,7 @@ name = "sc-rpc-spec-v2" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "hex", "jsonrpsee", "parity-scale-codec", @@ -10144,7 +10433,7 @@ dependencies = [ "async-trait", "directories", "exit-future", - "futures", + "futures 0.3.25", "futures-timer", "hash-db", "jsonrpsee", @@ -10245,7 +10534,7 @@ name = "sc-sysinfo" version = "6.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "libc", "log", "rand 0.7.3", @@ -10265,7 +10554,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "chrono", - "futures", + "futures 0.3.25", "libp2p", "log", "parking_lot 0.12.1", @@ -10325,7 +10614,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "linked-hash-map", "log", @@ -10352,7 +10641,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "log", "serde", "sp-blockchain", @@ -10365,7 +10654,7 @@ name = "sc-utils" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "lazy_static", "log", @@ -10375,9 +10664,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8" +checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" dependencies = [ "bitvec", "cfg-if", @@ -10389,9 +10678,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496" +checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10401,12 +10690,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -10435,9 +10723,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -10465,9 +10753,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] @@ -10533,9 +10821,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ "serde", ] @@ -10548,18 +10836,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -10568,9 +10856,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -10599,17 +10887,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.5", -] - [[package]] name = "sha2" version = "0.8.2" @@ -10643,7 +10920,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -10665,7 +10942,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "keccak", ] @@ -10680,7 +10957,7 @@ dependencies = [ [[package]] name = "shibuya-runtime" -version = "4.44.0" +version = "5.0.0" dependencies = [ "array-bytes 6.0.0", "cumulus-pallet-aura-ext", @@ -10691,6 +10968,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", + "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -10701,6 +10979,8 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "log", + "moonbeam-evm-tracer", + "moonbeam-rpc-primitives-debug", "pallet-assets", "pallet-assets-chain-extension", "pallet-aura", @@ -10780,7 +11060,7 @@ dependencies = [ [[package]] name = "shiden-runtime" -version = "4.44.0" +version = "5.0.0" dependencies = [ "array-bytes 6.0.0", "cumulus-pallet-aura-ext", @@ -10791,6 +11071,7 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", + "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -10801,6 +11082,8 @@ dependencies = [ "frame-system-rpc-runtime-api", "frame-try-runtime", "log", + "moonbeam-evm-tracer", + "moonbeam-rpc-primitives-debug", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -10899,7 +11182,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -10971,9 +11254,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snap" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" @@ -10984,7 +11267,7 @@ dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-pre.5", "rand_core 0.6.4", "ring", "rustc_version 0.4.0", @@ -11008,10 +11291,10 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "flate2", - "futures", + "futures 0.3.25", "httparse", "log", "rand 0.8.5", @@ -11118,7 +11401,7 @@ name = "sp-blockchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "futures", + "futures 0.3.25", "log", "lru", "parity-scale-codec", @@ -11137,7 +11420,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -11223,14 +11506,14 @@ name = "sp-core" version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "array-bytes 4.1.0", + "array-bytes 4.2.0", "base58", "bitflags", "blake2", "byteorder", "dyn-clonable", "ed25519-zebra", - "futures", + "futures 0.3.25", "hash-db", "hash256-std-hasher", "impl-serde", @@ -11270,7 +11553,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2d dependencies = [ "blake2", "byteorder", - "digest 0.10.5", + "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", "sp-std", @@ -11356,7 +11639,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "hash-db", "libsecp256k1", "log", @@ -11393,7 +11676,7 @@ version = "0.12.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "merlin", "parity-scale-codec", "parking_lot 0.12.1", @@ -11757,9 +12040,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a9821878e1f13aba383aa40a86fb1b33c7265774ec91e32563cb1dd1577496" +checksum = "d44528162f980c0e03c71e005d334332c8da0aec9f2b0b4bdc557ed4a9f24776" dependencies = [ "Inflector", "num-format", @@ -11804,7 +12087,7 @@ dependencies = [ "cfg_aliases", "libc", "parking_lot 0.11.2", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "static_init_macro 1.0.2", "winapi", ] @@ -11907,7 +12190,7 @@ name = "substrate-build-script-utils" version = "3.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ - "platforms", + "platforms 2.0.0", ] [[package]] @@ -11916,7 +12199,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "frame-system-rpc-runtime-api", - "futures", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", @@ -12003,9 +12286,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -12073,9 +12356,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -12088,18 +12371,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -12177,9 +12460,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -12231,9 +12514,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" dependencies = [ "autocfg", "bytes", @@ -12246,14 +12529,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -12299,9 +12582,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -12499,9 +12782,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" @@ -12532,9 +12815,9 @@ dependencies = [ [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "twox-hash" @@ -12543,16 +12826,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.5", + "digest 0.10.6", "rand 0.8.5", "static_assertions", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -12562,9 +12845,9 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uint" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -12589,9 +12872,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -12854,7 +13137,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures", + "futures 0.3.25", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -12890,7 +13173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm", + "libm 0.2.6", "memory_units", "num-rational", "num-traits", @@ -12917,7 +13200,7 @@ dependencies = [ "indexmap", "libc", "log", - "object", + "object 0.29.0", "once_cell", "paste", "psm", @@ -12949,7 +13232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", - "base64", + "base64 0.13.1", "bincode", "directories-next", "file-per-thread-logger", @@ -12974,9 +13257,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -12991,10 +13274,10 @@ checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log", - "object", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -13008,14 +13291,14 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "rustc-demangle", "rustix 0.35.13", "serde", @@ -13033,7 +13316,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ - "object", + "object 0.29.0", "once_cell", "rustix 0.35.13", ] @@ -13052,7 +13335,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.6.5", "paste", "rand 0.8.5", "rustix 0.35.13", @@ -13097,9 +13380,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -13298,19 +13581,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.42.1", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" @@ -13326,9 +13609,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" @@ -13344,9 +13627,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" @@ -13362,9 +13645,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" @@ -13380,15 +13663,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" @@ -13404,24 +13687,24 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winreg" -version = "0.7.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -13492,7 +13775,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.4.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "frame-support", "log", @@ -13536,7 +13819,7 @@ dependencies = [ [[package]] name = "xvm-chain-extension-types" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#ce772ccec91d1a26a482acdf99a6a7638601b85a" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#f26ede17d7b063db12cb5520fce9c5e59e4384f5" dependencies = [ "parity-scale-codec", "scale-info", @@ -13550,7 +13833,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures", + "futures 0.3.25", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -13569,9 +13852,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", @@ -13600,10 +13883,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.5+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" dependencies = [ "cc", "libc", + "pkg-config", ] diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 17f2072312..2a0b68bc66 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-collator" -version = "4.44.0" +version = "5.0.0" authors = ["Stake Technologies "] description = "Astar collator implementation in Rust." build = "build.rs" @@ -24,6 +24,7 @@ log = "0.4.17" parity-util-mem = { version = "0.12.0", default-features = false, features = ["jemalloc-global"] } serde = { version = "1.0.140", features = ["derive"] } serde_json = "1.0" +tokio = { version = "1.13.0", features = ["macros", "sync"] } url = "2.2.2" # primitives @@ -124,6 +125,12 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran frame-try-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", optional = true } +# evm-tracing +moonbeam-primitives-ext = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } +moonbeam-rpc-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } +moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } +moonbeam-rpc-trace = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } + [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.33", optional = true } diff --git a/bin/collator/src/cli.rs b/bin/collator/src/cli.rs index b6f8feb2e6..cfedf1464c 100644 --- a/bin/collator/src/cli.rs +++ b/bin/collator/src/cli.rs @@ -12,6 +12,47 @@ pub struct Cli { #[clap(flatten)] pub run: cumulus_client_cli::RunCmd, + /// Enable EVM tracing module on a non-authority node. + #[clap( + long, + conflicts_with = "collator", + conflicts_with = "validator", + value_delimiter = ',' + )] + pub ethapi: Vec, + + /// Number of concurrent tracing tasks. Meant to be shared by both "debug" and "trace" modules. + #[clap(long, default_value = "10")] + pub ethapi_max_permits: u32, + + /// Maximum number of trace entries a single request of `trace_filter` is allowed to return. + /// A request asking for more or an unbounded one going over this limit will both return an + /// error. + #[clap(long, default_value = "500")] + pub ethapi_trace_max_count: u32, + + /// Duration (in seconds) after which the cache of `trace_filter` for a given block will be + /// discarded. + #[clap(long, default_value = "300")] + pub ethapi_trace_cache_duration: u64, + + /// Size in bytes of the LRU cache for block data. + #[clap(long, default_value = "300000000")] + pub eth_log_block_cache: usize, + + /// Size in bytes of the LRU cache for transactions statuses data. + #[clap(long, default_value = "300000000")] + pub eth_statuses_cache: usize, + + /// Size in bytes of data a raw tracing request is allowed to use. + /// Bound the size of memory, stack and storage data. + #[clap(long, default_value = "20000000")] + pub tracing_raw_max_memory_usage: usize, + + /// Maximum number of logs in a query. + #[clap(long, default_value = "10000")] + pub max_past_logs: u32, + /// Relaychain arguments #[clap(raw = true)] pub relaychain_args: Vec, @@ -103,3 +144,53 @@ impl RelayChainCli { } } } + +/// EVM tracing CLI flags. +#[derive(Debug, PartialEq, Clone)] +pub enum EthApi { + /// Enable EVM debug RPC methods. + Debug, + /// Enable EVM trace RPC methods. + Trace, +} + +impl std::str::FromStr for EthApi { + type Err = String; + + fn from_str(s: &str) -> Result { + Ok(match s { + "debug" => Self::Debug, + "trace" => Self::Trace, + _ => { + return Err(format!( + "`{}` is not recognized as a supported Ethereum Api", + s + )) + } + }) + } +} + +/// EVM tracing CLI config. +pub struct EvmTracingConfig { + /// Enabled EVM tracing flags. + pub ethapi: Vec, + /// Number of concurrent tracing tasks. + pub ethapi_max_permits: u32, + /// Maximum number of trace entries a single request of `trace_filter` is allowed to return. + /// A request asking for more or an unbounded one going over this limit will both return an + /// error. + pub ethapi_trace_max_count: u32, + /// Duration (in seconds) after which the cache of `trace_filter` for a given block will be + /// discarded. + pub ethapi_trace_cache_duration: u64, + /// Size in bytes of the LRU cache for block data. + pub eth_log_block_cache: usize, + /// Size in bytes of the LRU cache for transactions statuses data. + pub eth_statuses_cache: usize, + /// Maximum number of logs in a query. + pub max_past_logs: u32, + /// Size in bytes of data a raw tracing request is allowed to use. + /// Bound the size of memory, stack and storage data. + pub tracing_raw_max_memory_usage: usize, +} diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index 140dc70f89..b314ba313c 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -637,9 +637,20 @@ pub fn run() -> Result<()> { let runner = cli.create_runner(&cli.run.normalize())?; let collator_options = cli.run.collator_options(); + let tracing_config = crate::cli::EvmTracingConfig { + ethapi: cli.ethapi, + ethapi_max_permits: cli.ethapi_max_permits, + ethapi_trace_max_count: cli.ethapi_trace_max_count, + ethapi_trace_cache_duration: cli.ethapi_trace_cache_duration, + eth_log_block_cache: cli.eth_log_block_cache, + eth_statuses_cache: cli.eth_statuses_cache, + max_past_logs: cli.max_past_logs, + tracing_raw_max_memory_usage: cli.tracing_raw_max_memory_usage, + }; + runner.run_node_until_exit(|config| async move { if config.chain_spec.is_dev() { - return local::start_node(config).map_err(Into::into); + return local::start_node(config, tracing_config).map_err(Into::into); } let polkadot_cli = RelayChainCli::new( @@ -683,17 +694,17 @@ pub fn run() -> Result<()> { ); if config.chain_spec.is_astar() { - start_astar_node(config, polkadot_config, collator_options, para_id) + start_astar_node(config, polkadot_config, tracing_config, collator_options, para_id) .await .map(|r| r.0) .map_err(Into::into) } else if config.chain_spec.is_shiden() { - start_shiden_node(config, polkadot_config, collator_options, para_id) + start_shiden_node(config, polkadot_config, tracing_config, collator_options, para_id) .await .map(|r| r.0) .map_err(Into::into) } else if config.chain_spec.is_shibuya() { - start_shibuya_node(config, polkadot_config, collator_options, para_id) + start_shibuya_node(config, polkadot_config, tracing_config, collator_options, para_id) .await .map(|r| r.0) .map_err(Into::into) diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 37010e2e2d..1d38f635b7 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -14,17 +14,22 @@ use std::{collections::BTreeMap, sync::Arc, time::Duration}; pub use local_runtime::RuntimeApi; +use crate::cli::{EthApi as EthApiCmd, EvmTracingConfig}; use crate::primitives::*; +use crate::rpc::tracing; /// Local runtime native executor. pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); + type ExtendHostFunctions = moonbeam_primitives_ext::moonbeam_ext::HostFunctions; #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + type ExtendHostFunctions = ( + frame_benchmarking::benchmarking::HostFunctions, + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, + ); fn dispatch(method: &str, data: &[u8]) -> Option> { local_runtime::api::dispatch(method, data) @@ -164,7 +169,10 @@ pub fn new_partial( } /// Builds a new service. -pub fn start_node(config: Configuration) -> Result { +pub fn start_node( + config: Configuration, + tracing_config: EvmTracingConfig, +) -> Result { let sc_service::PartialComponents { client, backend, @@ -209,6 +217,27 @@ pub fn start_node(config: Configuration) -> Result { let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let overrides = crate::rpc::overrides_handle(client.clone()); + let ethapi_cmd = tracing_config.ethapi.clone(); + let tracing_requesters = + if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { + tracing::spawn_tracing_tasks( + &tracing_config, + tracing::SpawnTasksParams { + task_manager: &task_manager, + client: client.clone(), + substrate_backend: backend.clone(), + frontier_backend: frontier_backend.clone(), + filter_pool: Some(filter_pool.clone()), + overrides: overrides.clone(), + }, + ) + } else { + tracing::RpcRequesters { + debug: None, + trace: None, + } + }; + // Frontier offchain DB task. Essential. // Maps emulated ethereum data to substrate native data. task_manager.spawn_essential_handle().spawn( @@ -272,6 +301,10 @@ pub fn start_node(config: Configuration) -> Result { let client = client.clone(); let network = network.clone(); let transaction_pool = transaction_pool.clone(); + let rpc_config = crate::rpc::EvmTracingConfig { + tracing_requesters, + trace_filter_max_count: tracing_config.ethapi_trace_max_count, + }; Box::new(move |deny_unsafe, subscription| { let deps = crate::rpc::FullDeps { @@ -289,7 +322,8 @@ pub fn start_node(config: Configuration) -> Result { overrides: overrides.clone(), }; - crate::rpc::create_full(deps, subscription).map_err::(Into::into) + crate::rpc::create_full(deps, subscription, rpc_config.clone()) + .map_err::(Into::into) }) }; diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index d9a807041e..158b812f4c 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -29,7 +29,9 @@ use std::{collections::BTreeMap, sync::Arc, time::Duration}; use substrate_prometheus_endpoint::Registry; use super::shell_upgrade::*; +use crate::cli::{EthApi as EthApiCmd, EvmTracingConfig}; use crate::primitives::*; +use crate::rpc::tracing; /// Astar network runtime executor. pub mod astar { @@ -39,10 +41,13 @@ pub mod astar { pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); + type ExtendHostFunctions = moonbeam_primitives_ext::moonbeam_ext::HostFunctions; #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + type ExtendHostFunctions = ( + frame_benchmarking::benchmarking::HostFunctions, + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, + ); fn dispatch(method: &str, data: &[u8]) -> Option> { astar_runtime::api::dispatch(method, data) @@ -62,10 +67,13 @@ pub mod shiden { pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); + type ExtendHostFunctions = moonbeam_primitives_ext::moonbeam_ext::HostFunctions; #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + type ExtendHostFunctions = ( + frame_benchmarking::benchmarking::HostFunctions, + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, + ); fn dispatch(method: &str, data: &[u8]) -> Option> { shiden_runtime::api::dispatch(method, data) @@ -85,10 +93,13 @@ pub mod shibuya { pub struct Executor; impl sc_executor::NativeExecutionDispatch for Executor { #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); + type ExtendHostFunctions = moonbeam_primitives_ext::moonbeam_ext::HostFunctions; #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; + type ExtendHostFunctions = ( + frame_benchmarking::benchmarking::HostFunctions, + moonbeam_primitives_ext::moonbeam_ext::HostFunctions, + ); fn dispatch(method: &str, data: &[u8]) -> Option> { shibuya_runtime::api::dispatch(method, data) @@ -279,6 +290,7 @@ async fn build_relay_chain_interface( async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, + tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, build_import_queue: BIQ, @@ -302,6 +314,7 @@ where + sp_block_builder::BlockBuilder + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + + moonbeam_rpc_primitives_debug::DebugRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + fp_rpc::ConvertTransactionRuntimeApi + cumulus_primitives_core::CollectCollationInfo, @@ -396,6 +409,27 @@ where let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let overrides = crate::rpc::overrides_handle(client.clone()); + let ethapi_cmd = tracing_config.ethapi.clone(); + let tracing_requesters = + if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { + tracing::spawn_tracing_tasks( + &tracing_config, + tracing::SpawnTasksParams { + task_manager: &task_manager, + client: client.clone(), + substrate_backend: backend.clone(), + frontier_backend: frontier_backend.clone(), + filter_pool: Some(filter_pool.clone()), + overrides: overrides.clone(), + }, + ) + } else { + tracing::RpcRequesters { + debug: None, + trace: None, + } + }; + // Frontier offchain DB task. Essential. // Maps emulated ethereum data to substrate native data. task_manager.spawn_essential_handle().spawn( @@ -451,6 +485,10 @@ where let client = client.clone(); let network = network.clone(); let transaction_pool = transaction_pool.clone(); + let rpc_config = crate::rpc::EvmTracingConfig { + tracing_requesters, + trace_filter_max_count: tracing_config.ethapi_trace_max_count, + }; Box::new(move |deny_unsafe, subscription| { let deps = crate::rpc::FullDeps { @@ -468,7 +506,7 @@ where overrides: overrides.clone(), }; - crate::rpc::create_full(deps, subscription).map_err(Into::into) + crate::rpc::create_full(deps, subscription, rpc_config.clone()).map_err(Into::into) }) }; @@ -637,6 +675,7 @@ where pub async fn start_astar_node( parachain_config: Configuration, polkadot_config: Configuration, + tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, ) -> sc_service::error::Result<( @@ -646,6 +685,7 @@ pub async fn start_astar_node( start_node_impl::( parachain_config, polkadot_config, + tracing_config, collator_options, id, |client, @@ -765,6 +805,7 @@ pub async fn start_astar_node( pub async fn start_shiden_node( parachain_config: Configuration, polkadot_config: Configuration, + tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, ) -> sc_service::error::Result<( @@ -774,6 +815,7 @@ pub async fn start_shiden_node( start_node_impl::( parachain_config, polkadot_config, + tracing_config, collator_options, id, |client, @@ -893,6 +935,7 @@ pub async fn start_shiden_node( pub async fn start_shibuya_node( parachain_config: Configuration, polkadot_config: Configuration, + tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, ) -> sc_service::error::Result<( @@ -902,6 +945,7 @@ pub async fn start_shibuya_node( start_node_impl::( parachain_config, polkadot_config, + tracing_config, collator_options, id, |client, diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 62d95356ce..bbc29280a8 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -25,8 +25,19 @@ use std::collections::BTreeMap; use std::sync::Arc; use substrate_frame_rpc_system::{System, SystemApiServer}; +use moonbeam_rpc_debug::{Debug, DebugServer}; +use moonbeam_rpc_trace::{Trace, TraceServer}; + use crate::primitives::*; +pub mod tracing; + +#[derive(Clone)] +pub struct EvmTracingConfig { + pub tracing_requesters: tracing::RpcRequesters, + pub trace_filter_max_count: u32, +} + // TODO This is copied from frontier. It should be imported instead after // https://github.com/paritytech/frontier/issues/333 is solved pub fn open_frontier_backend( @@ -120,6 +131,7 @@ pub struct FullDeps { pub fn create_full( deps: FullDeps, subscription_task_executor: SubscriptionTaskExecutor, + tracing_config: EvmTracingConfig, ) -> Result, Box> where C: ProvideRuntimeApi @@ -134,6 +146,7 @@ where C: sc_client_api::BlockBackend, C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + + moonbeam_rpc_primitives_debug::DebugRuntimeApi + fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + BlockBuilder, @@ -205,8 +218,30 @@ where io.merge(sc_rpc::dev::Dev::new(client.clone(), deny_unsafe).into_rpc())?; io.merge( - EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(), + EthPubSub::new( + pool, + client.clone(), + network, + subscription_task_executor, + overrides, + ) + .into_rpc(), )?; + if let Some(trace_filter_requester) = tracing_config.tracing_requesters.trace { + io.merge( + Trace::new( + client, + trace_filter_requester, + tracing_config.trace_filter_max_count, + ) + .into_rpc(), + )?; + } + + if let Some(debug_requester) = tracing_config.tracing_requesters.debug { + io.merge(Debug::new(debug_requester).into_rpc())?; + } + Ok(io) } diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs new file mode 100644 index 0000000000..1ab844c8de --- /dev/null +++ b/bin/collator/src/rpc/tracing.rs @@ -0,0 +1,123 @@ +// Copyright 2019-2022 PureStake Inc. +// This file is part of Moonbeam. + +// Moonbeam 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. + +// Moonbeam 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 Moonbeam. If not, see . + +use crate::cli::EthApi as EthApiCmd; + +use fc_rpc::OverrideHandle; +use fc_rpc_core::types::FilterPool; +use fp_rpc::EthereumRuntimeRPCApi; +use moonbeam_rpc_debug::{DebugHandler, DebugRequester}; +use moonbeam_rpc_trace::{CacheRequester as TraceFilterCacheRequester, CacheTask}; +use sc_client_api::{ + Backend, BlockOf, BlockchainEvents, HeaderBackend, StateBackend, StorageProvider, +}; +use sc_service::TaskManager; +use sp_api::{BlockT, HeaderT, ProvideRuntimeApi}; +use sp_block_builder::BlockBuilder; +use sp_blockchain::{Error as BlockChainError, HeaderMetadata}; +use sp_core::H256; +use sp_runtime::traits::BlakeTwo256; +use std::sync::Arc; +use tokio::sync::Semaphore; + +#[derive(Clone)] +pub struct RpcRequesters { + pub debug: Option, + pub trace: Option, +} + +pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { + pub task_manager: &'a TaskManager, + pub client: Arc, + pub substrate_backend: Arc, + pub frontier_backend: Arc>, + pub filter_pool: Option, + pub overrides: Arc>, +} + +// Spawn the tasks that are required to run a Moonbeam tracing node. +pub fn spawn_tracing_tasks( + rpc_config: &crate::cli::EvmTracingConfig, + params: SpawnTasksParams, +) -> RpcRequesters +where + C: ProvideRuntimeApi + BlockOf, + C: StorageProvider, + C: HeaderBackend + HeaderMetadata + 'static, + C: BlockchainEvents, + C: Send + Sync + 'static, + C::Api: EthereumRuntimeRPCApi + moonbeam_rpc_primitives_debug::DebugRuntimeApi, + C::Api: BlockBuilder, + B: BlockT + Send + Sync + 'static, + B::Header: HeaderT, + BE: Backend + 'static, + BE::State: StateBackend, +{ + let permit_pool = Arc::new(Semaphore::new(rpc_config.ethapi_max_permits as usize)); + + let (trace_filter_task, trace_filter_requester) = + if rpc_config.ethapi.contains(&EthApiCmd::Trace) { + let (trace_filter_task, trace_filter_requester) = CacheTask::create( + Arc::clone(¶ms.client), + Arc::clone(¶ms.substrate_backend), + core::time::Duration::from_secs(rpc_config.ethapi_trace_cache_duration), + Arc::clone(&permit_pool), + Arc::clone(¶ms.overrides), + ); + (Some(trace_filter_task), Some(trace_filter_requester)) + } else { + (None, None) + }; + + let (debug_task, debug_requester) = if rpc_config.ethapi.contains(&EthApiCmd::Debug) { + let (debug_task, debug_requester) = DebugHandler::task( + Arc::clone(¶ms.client), + Arc::clone(¶ms.substrate_backend), + Arc::clone(¶ms.frontier_backend), + Arc::clone(&permit_pool), + Arc::clone(¶ms.overrides), + rpc_config.tracing_raw_max_memory_usage, + ); + (Some(debug_task), Some(debug_requester)) + } else { + (None, None) + }; + + // `trace_filter` cache task. Essential. + // Proxies rpc requests to it's handler. + if let Some(trace_filter_task) = trace_filter_task { + params.task_manager.spawn_essential_handle().spawn( + "trace-filter-cache", + Some("eth-tracing"), + trace_filter_task, + ); + } + + // `debug` task if enabled. Essential. + // Proxies rpc requests to it's handler. + if let Some(debug_task) = debug_task { + params.task_manager.spawn_essential_handle().spawn( + "ethapi-debug", + Some("eth-tracing"), + debug_task, + ); + } + + RpcRequesters { + debug: debug_requester, + trace: trace_filter_requester, + } +} diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index c6e5b60c7d..bfb71df1f7 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "astar-runtime" -version = "4.44.0" +version = "5.0.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" @@ -100,6 +100,11 @@ pallet-xc-asset-config = { git = "https://github.com/AstarNetwork/astar-frame", pallet-xcm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +# Moonbeam tracing +evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } + [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index acbfcb56b1..d4dd589b23 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -103,7 +103,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("astar"), impl_name: create_runtime_str!("astar"), authoring_version: 1, - spec_version: 49, + spec_version: 100, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1244,6 +1244,70 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_debug::DebugRuntimeApi for Runtime { + fn trace_transaction( + extrinsics: Vec<::Extrinsic>, + traced_transaction: &pallet_ethereum::Transaction, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Apply the a subset of extrinsics: all the substrate-specific or ethereum + // transactions that preceded the requested transaction. + for ext in extrinsics.into_iter() { + let _ = match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if transaction == traced_transaction { + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + return Ok(()); + } else { + Executive::apply_extrinsic(ext) + } + } + _ => Executive::apply_extrinsic(ext), + }; + } + Err(sp_runtime::DispatchError::Other( + "Failed to find Ethereum transaction among the extrinsics.", + )) + } + + fn trace_block( + extrinsics: Vec<::Extrinsic>, + known_transactions: Vec, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + let mut config = ::config().clone(); + config.estimate = true; + + // Apply all extrinsics. Ethereum extrinsics are traced. + for ext in extrinsics.into_iter() { + match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if known_transactions.contains(&transaction.hash()) { + // Each known extrinsic is a new call stack. + EvmTracer::emit_new(); + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + } else { + let _ = Executive::apply_extrinsic(ext); + } + } + _ => { + let _ = Executive::apply_extrinsic(ext); + } + }; + } + + Ok(()) + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index 2e625bf985..4b184b99e5 100644 --- a/runtime/local/Cargo.toml +++ b/runtime/local/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "local-runtime" -version = "4.44.0" +version = "5.0.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" @@ -72,6 +72,11 @@ pallet-evm-precompile-xvm = { git = "https://github.com/AstarNetwork/astar-frame pallet-precompile-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } pallet-xvm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false, features = ["evm", "wasm"] } +# Moonbeam tracing +evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } + # chain-extensions pallet-assets-chain-extension = { git = "https://github.com/AstarNetwork/pallet-assets-chain-extension", branch = "polkadot-v0.9.33", default-features = false, features = ["substrate"] } @@ -149,6 +154,9 @@ std = [ "pallet-scheduler/std", "pallet-treasury/std", "pallet-xvm/std", + "evm-tracing-events/std", + "moonbeam-evm-tracer/std", + "moonbeam-rpc-primitives-debug/std", ] runtime-benchmarks = [ "frame-benchmarking", diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index a06605eaeb..7f66b19187 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -820,8 +820,8 @@ impl InstanceFilter for ProxyType { | RuntimeCall::Grandpa(..) // Skip entire Balances pallet | RuntimeCall::Vesting(pallet_vesting::Call::vest{..}) - | RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) - // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` + | RuntimeCall::Vesting(pallet_vesting::Call::vest_other{..}) + // Specifically omitting Vesting `vested_transfer`, and `force_vested_transfer` | RuntimeCall::DappsStaking(..) // Skip entire EVM pallet // Skip entire Ethereum pallet @@ -1448,6 +1448,70 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_debug::DebugRuntimeApi for Runtime { + fn trace_transaction( + extrinsics: Vec<::Extrinsic>, + traced_transaction: &pallet_ethereum::Transaction, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Apply the a subset of extrinsics: all the substrate-specific or ethereum + // transactions that preceded the requested transaction. + for ext in extrinsics.into_iter() { + let _ = match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if transaction == traced_transaction { + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + return Ok(()); + } else { + Executive::apply_extrinsic(ext) + } + } + _ => Executive::apply_extrinsic(ext), + }; + } + Err(sp_runtime::DispatchError::Other( + "Failed to find Ethereum transaction among the extrinsics.", + )) + } + + fn trace_block( + extrinsics: Vec<::Extrinsic>, + known_transactions: Vec, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + let mut config = ::config().clone(); + config.estimate = true; + + // Apply all extrinsics. Ethereum extrinsics are traced. + for ext in extrinsics.into_iter() { + match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if known_transactions.contains(&transaction.hash()) { + // Each known extrinsic is a new call stack. + EvmTracer::emit_new(); + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + } else { + let _ = Executive::apply_extrinsic(ext); + } + } + _ => { + let _ = Executive::apply_extrinsic(ext); + } + }; + } + + Ok(()) + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index c801ff1ca4..ced1808021 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shibuya-runtime" -version = "4.44.0" +version = "5.0.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" @@ -105,6 +105,11 @@ pallet-xcm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "po pallet-xvm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false, features = ["evm", "wasm"] } xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +# Moonbeam tracing +evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } + # chain-extensions pallet-assets-chain-extension = { git = "https://github.com/AstarNetwork/pallet-assets-chain-extension", branch = "polkadot-v0.9.33", default-features = false, features = ["substrate"] } diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 7d2bd072ee..c9f463b510 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -1686,6 +1686,70 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_debug::DebugRuntimeApi for Runtime { + fn trace_transaction( + extrinsics: Vec<::Extrinsic>, + traced_transaction: &pallet_ethereum::Transaction, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Apply the a subset of extrinsics: all the substrate-specific or ethereum + // transactions that preceded the requested transaction. + for ext in extrinsics.into_iter() { + let _ = match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if transaction == traced_transaction { + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + return Ok(()); + } else { + Executive::apply_extrinsic(ext) + } + } + _ => Executive::apply_extrinsic(ext), + }; + } + Err(sp_runtime::DispatchError::Other( + "Failed to find Ethereum transaction among the extrinsics.", + )) + } + + fn trace_block( + extrinsics: Vec<::Extrinsic>, + known_transactions: Vec, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + let mut config = ::config().clone(); + config.estimate = true; + + // Apply all extrinsics. Ethereum extrinsics are traced. + for ext in extrinsics.into_iter() { + match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if known_transactions.contains(&transaction.hash()) { + // Each known extrinsic is a new call stack. + EvmTracer::emit_new(); + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + } else { + let _ = Executive::apply_extrinsic(ext); + } + } + _ => { + let _ = Executive::apply_extrinsic(ext); + } + }; + } + + Ok(()) + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index ef1b916579..e0c6aa96c3 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shiden-runtime" -version = "4.44.0" +version = "5.0.0" authors = ["Stake Technologies "] edition = "2021" build = "build.rs" @@ -104,6 +104,11 @@ pallet-xc-asset-config = { git = "https://github.com/AstarNetwork/astar-frame", pallet-xcm = { git = "https://github.com/AstarNetwork/astar-frame", default-features = false, branch = "polkadot-v0.9.33" } xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +# Moonbeam tracing +evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } + # Remove after migration is done pallet-contracts-migration = { path = "../contracts-migration", default-features = false } diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index ebcd10836c..f1add9d1cf 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -102,7 +102,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shiden"), impl_name: create_runtime_str!("shiden"), authoring_version: 1, - spec_version: 86, + spec_version: 100, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1417,6 +1417,70 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_debug::DebugRuntimeApi for Runtime { + fn trace_transaction( + extrinsics: Vec<::Extrinsic>, + traced_transaction: &pallet_ethereum::Transaction, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + // Apply the a subset of extrinsics: all the substrate-specific or ethereum + // transactions that preceded the requested transaction. + for ext in extrinsics.into_iter() { + let _ = match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if transaction == traced_transaction { + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + return Ok(()); + } else { + Executive::apply_extrinsic(ext) + } + } + _ => Executive::apply_extrinsic(ext), + }; + } + Err(sp_runtime::DispatchError::Other( + "Failed to find Ethereum transaction among the extrinsics.", + )) + } + + fn trace_block( + extrinsics: Vec<::Extrinsic>, + known_transactions: Vec, + ) -> Result< + (), + sp_runtime::DispatchError, + > { + use moonbeam_evm_tracer::tracer::EvmTracer; + + let mut config = ::config().clone(); + config.estimate = true; + + // Apply all extrinsics. Ethereum extrinsics are traced. + for ext in extrinsics.into_iter() { + match &ext.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => { + if known_transactions.contains(&transaction.hash()) { + // Each known extrinsic is a new call stack. + EvmTracer::emit_new(); + EvmTracer::new().trace(|| Executive::apply_extrinsic(ext)); + } else { + let _ = Executive::apply_extrinsic(ext); + } + } + _ => { + let _ = Executive::apply_extrinsic(ext); + } + }; + } + + Ok(()) + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { From 5ff160cae5335729732beea88ccea1aaa521bd6d Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 23 Jan 2023 09:42:36 +0300 Subject: [PATCH 02/10] Fix srtool build --- Cargo.lock | 4 ---- runtime/astar/Cargo.toml | 3 ++- runtime/local/Cargo.toml | 2 -- runtime/shibuya/Cargo.toml | 3 ++- runtime/shiden/Cargo.toml | 3 ++- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dacee1d72d..1d3cb757d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -280,7 +280,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -4758,7 +4757,6 @@ name = "local-runtime" version = "5.0.0" dependencies = [ "array-bytes 6.0.0", - "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -10968,7 +10966,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", @@ -11071,7 +11068,6 @@ dependencies = [ "cumulus-primitives-core", "cumulus-primitives-timestamp", "cumulus-primitives-utility", - "evm-tracing-events", "fp-rpc", "fp-self-contained", "frame-benchmarking", diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index bfb71df1f7..0b9baa2523 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -101,7 +101,6 @@ pallet-xcm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "po xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # Moonbeam tracing -evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } @@ -177,6 +176,8 @@ std = [ "cumulus-pallet-xcm/std", "pallet-collator-selection/std", "frame-benchmarking/std", + "moonbeam-evm-tracer/std", + "moonbeam-rpc-primitives-debug/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index 4b184b99e5..d639ab5fcb 100644 --- a/runtime/local/Cargo.toml +++ b/runtime/local/Cargo.toml @@ -73,7 +73,6 @@ pallet-precompile-dapps-staking = { git = "https://github.com/AstarNetwork/astar pallet-xvm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false, features = ["evm", "wasm"] } # Moonbeam tracing -evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } @@ -154,7 +153,6 @@ std = [ "pallet-scheduler/std", "pallet-treasury/std", "pallet-xvm/std", - "evm-tracing-events/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", ] diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index ced1808021..ec1c78f926 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -106,7 +106,6 @@ pallet-xvm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "po xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # Moonbeam tracing -evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } @@ -213,6 +212,8 @@ std = [ "pallet-collator-selection/std", "frame-benchmarking/std", "frame-try-runtime/std", + "moonbeam-evm-tracer/std", + "moonbeam-rpc-primitives-debug/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index e0c6aa96c3..67cac3179c 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -105,7 +105,6 @@ pallet-xcm = { git = "https://github.com/AstarNetwork/astar-frame", default-feat xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # Moonbeam tracing -evm-tracing-events = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } @@ -187,6 +186,8 @@ std = [ "cumulus-pallet-xcmp-queue/std", "cumulus-pallet-xcm/std", "pallet-collator-selection/std", + "moonbeam-evm-tracer/std", + "moonbeam-rpc-primitives-debug/std", "frame-benchmarking/std", "frame-try-runtime/std", "xcm/std", From 7dcd3fac0766491047d564e85822d0d86a602dc9 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Tue, 24 Jan 2023 08:12:54 +0300 Subject: [PATCH 03/10] [CI] temporary disable aarch64 target --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b11880540..27691c533a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: matrix: target: - x86_64-unknown-linux-gnu - - aarch64-unknown-linux-gnu +# - aarch64-unknown-linux-gnu steps: - name: Checkout the source code From 88cf7d37fe50e25d1a94e48a43c47c0011bdc67c Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Tue, 24 Jan 2023 16:56:03 +0300 Subject: [PATCH 04/10] [CI] fix binaries upload for release pipeline --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27691c533a..c371b3315e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -352,7 +352,7 @@ jobs: strategy: matrix: os: ["ubuntu", "macOS"] - arch: ["x86_64", "aarch64"] + arch: ["x86_64"] exclude: - os: macos arch: x86_64 From 11e1c37cb1d247e5de74019686dc0a21929e7148 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Tue, 31 Jan 2023 06:45:54 +0300 Subject: [PATCH 05/10] Fix CI errors --- bin/collator/src/rpc/tracing.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index 1ab844c8de..aabdcb985a 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -1,18 +1,18 @@ -// Copyright 2019-2022 PureStake Inc. -// This file is part of Moonbeam. +// Copyright (C) 2019-2023 Stake Technologies Pte.Ltd. +// SPDX-License-Identifier: GPL-3.0-or-later -// Moonbeam is free software: you can redistribute it and/or modify +// Astar 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. -// Moonbeam is distributed in the hope that it will be useful, +// Astar 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 Moonbeam. If not, see . +// along with Astar. If not, see . use crate::cli::EthApi as EthApiCmd; From 8deb9b39da57a6e452d9f7a10c684e923fae5410 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Tue, 31 Jan 2023 07:21:34 +0300 Subject: [PATCH 06/10] Update rust toolchain version to 2023-01-11 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 90c811b771..420568123b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2022-10-10" +channel = "nightly-2023-01-11" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] profile = "minimal" From 7953720784e2bee301c78cc457f811c0bd1f184a Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Wed, 1 Feb 2023 13:57:21 +0300 Subject: [PATCH 07/10] Update Cargo.lock --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1e48a05ead..b871857b1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -922,9 +922,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bzip2-sys" @@ -11264,9 +11264,9 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" +checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d" dependencies = [ "aes-gcm", "blake2", @@ -13904,9 +13904,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.5+zstd.1.5.2" +version = "2.0.6+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596" +checksum = "68a3f9792c0c3dc6c165840a75f47ae1f4da402c2d006881129579f6597e801b" dependencies = [ "cc", "libc", From 7bd370b329403aac0606ede25a044b7fbb85545e Mon Sep 17 00:00:00 2001 From: Aleksandr Krupenkin Date: Mon, 13 Feb 2023 12:59:56 +0300 Subject: [PATCH 08/10] Added txpool rpc support (#855) * Added txpool rpc support * Fix licensing * Bump dependencies & runtime versions --- Cargo.lock | 294 ++++++++++++++++---------- bin/collator/Cargo.toml | 2 + bin/collator/src/cli.rs | 3 + bin/collator/src/local/service.rs | 1 + bin/collator/src/parachain/service.rs | 2 + bin/collator/src/rpc.rs | 9 +- bin/collator/src/rpc/tracing.rs | 3 + runtime/astar/Cargo.toml | 2 + runtime/astar/src/lib.rs | 24 +++ runtime/local/Cargo.toml | 2 + runtime/local/src/lib.rs | 24 +++ runtime/shibuya/Cargo.toml | 2 + runtime/shibuya/src/lib.rs | 26 ++- runtime/shiden/Cargo.toml | 2 + runtime/shiden/src/lib.rs | 24 +++ 15 files changed, 310 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b871857b1a..240fb0a97d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,9 +117,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" [[package]] name = "approx" @@ -211,7 +211,9 @@ dependencies = [ "moonbeam-primitives-ext", "moonbeam-rpc-debug", "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-primitives-txpool", "moonbeam-rpc-trace", + "moonbeam-rpc-txpool", "pallet-block-reward", "pallet-ethereum", "pallet-evm", @@ -292,6 +294,7 @@ dependencies = [ "log", "moonbeam-evm-tracer", "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-primitives-txpool", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -879,9 +882,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" dependencies = [ "memchr", "serde", @@ -1985,9 +1988,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322296e2f2e5af4270b54df9e85a02ff037e271af20ba3e7fe1575515dc840b8" +checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9" dependencies = [ "cc", "cxxbridge-flags", @@ -1997,9 +2000,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017a1385b05d631e7875b1f151c9f012d37b53491e2a87f65bff5c262b2111d8" +checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d" dependencies = [ "cc", "codespan-reporting", @@ -2012,15 +2015,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c26bbb078acf09bc1ecda02d4223f03bdd28bd4874edcb0379138efc499ce971" +checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a" [[package]] name = "cxxbridge-macro" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357f40d1f06a24b60ae1fe122542c1fb05d28d32acb2aed064e84bc2ad1e252e" +checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2" dependencies = [ "proc-macro2", "quote", @@ -2030,7 +2033,7 @@ dependencies = [ [[package]] name = "dapps-staking-chain-extension-types" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "parity-scale-codec", @@ -2516,7 +2519,7 @@ dependencies = [ [[package]] name = "evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "environmental", "ethereum", @@ -2763,14 +2766,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3205,12 +3208,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "funty" version = "2.0.0" @@ -3536,9 +3533,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -3558,6 +3555,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -3666,9 +3669,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" dependencies = [ "bytes", "futures-channel", @@ -3857,12 +3860,12 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3891,14 +3894,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" dependencies = [ - "hermit-abi 0.2.6", - "io-lifetimes 1.0.4", - "rustix 0.36.7", - "windows-sys 0.42.0", + "hermit-abi 0.3.1", + "io-lifetimes 1.0.5", + "rustix 0.36.8", + "windows-sys 0.45.0", ] [[package]] @@ -3927,9 +3930,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -4769,6 +4772,7 @@ dependencies = [ "log", "moonbeam-evm-tracer", "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-primitives-txpool", "pallet-assets", "pallet-assets-chain-extension", "pallet-aura", @@ -4935,7 +4939,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.7", + "rustix 0.36.8", ] [[package]] @@ -5071,7 +5075,7 @@ dependencies = [ [[package]] name = "moonbeam-client-evm-tracing" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "evm-tracing-events", @@ -5086,7 +5090,7 @@ dependencies = [ [[package]] name = "moonbeam-evm-tracer" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "evm", @@ -5106,7 +5110,7 @@ dependencies = [ [[package]] name = "moonbeam-primitives-ext" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "evm-tracing-events", @@ -5119,7 +5123,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "futures 0.3.26", @@ -5134,7 +5138,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "futures 0.3.26", @@ -5145,10 +5149,23 @@ dependencies = [ "serde_json", ] +[[package]] +name = "moonbeam-rpc-core-txpool" +version = "0.6.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" +dependencies = [ + "ethereum", + "ethereum-types", + "fc-rpc-core", + "jsonrpsee", + "serde", + "serde_json", +] + [[package]] name = "moonbeam-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum-types", "serde", @@ -5158,7 +5175,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-debug" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum", "ethereum-types", @@ -5187,7 +5204,7 @@ dependencies = [ [[package]] name = "moonbeam-rpc-primitives-debug" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "environmental", "ethereum", @@ -5203,10 +5220,23 @@ dependencies = [ "sp-std", ] +[[package]] +name = "moonbeam-rpc-primitives-txpool" +version = "0.6.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" +dependencies = [ + "ethereum", + "parity-scale-codec", + "sp-api", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "moonbeam-rpc-trace" version = "0.6.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "ethereum", "ethereum-types", @@ -5236,6 +5266,29 @@ dependencies = [ "tracing", ] +[[package]] +name = "moonbeam-rpc-txpool" +version = "0.6.0" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" +dependencies = [ + "ethereum-types", + "fc-rpc", + "frame-system", + "jsonrpsee", + "moonbeam-rpc-core-txpool", + "moonbeam-rpc-primitives-txpool", + "rlp", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sha3 0.10.6", + "sp-api", + "sp-blockchain", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "multiaddr" version = "0.14.0" @@ -5914,7 +5967,7 @@ dependencies = [ [[package]] name = "pallet-block-reward" version = "2.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-benchmarking", "frame-support", @@ -5951,7 +6004,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-dapps-staking" version = "1.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "dapps-staking-chain-extension-types", "frame-support", @@ -5971,7 +6024,7 @@ dependencies = [ [[package]] name = "pallet-chain-extension-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "frame-system", @@ -6010,7 +6063,7 @@ dependencies = [ [[package]] name = "pallet-collator-selection" version = "3.3.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6129,7 +6182,7 @@ dependencies = [ [[package]] name = "pallet-custom-signatures" version = "4.6.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "frame-system", @@ -6145,7 +6198,7 @@ dependencies = [ [[package]] name = "pallet-dapps-staking" version = "3.9.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-benchmarking", "frame-support", @@ -6305,7 +6358,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-assets-erc20" version = "0.5.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "frame-support", @@ -6392,7 +6445,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sr25519" version = "1.2.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "log", @@ -6408,7 +6461,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-substrate-ecdsa" version = "1.2.2" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "log", @@ -6424,7 +6477,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xcm" version = "0.9.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "frame-support", @@ -6447,7 +6500,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-xvm" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "frame-support", @@ -6729,7 +6782,7 @@ dependencies = [ [[package]] name = "pallet-precompile-dapps-staking" version = "3.6.3" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "fp-evm", "frame-support", @@ -7131,7 +7184,7 @@ dependencies = [ [[package]] name = "pallet-xc-asset-config" version = "1.3.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-benchmarking", "frame-support", @@ -7149,7 +7202,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.28" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "frame-system", @@ -7202,7 +7255,7 @@ dependencies = [ [[package]] name = "pallet-xvm" version = "0.2.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "frame-system", @@ -7343,7 +7396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.7", ] [[package]] @@ -7362,15 +7415,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -7411,9 +7464,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.4" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" +checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660" dependencies = [ "thiserror", "ucd-trie", @@ -7421,9 +7474,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.4" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf026e2d0581559db66d837fe5242320f525d85c76283c61f4d51a1238d65ea" +checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69" dependencies = [ "pest", "pest_generator", @@ -7431,9 +7484,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.4" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b27bd18aa01d91c8ed2b61ea23406a676b42d82609c6e2581fba42f0c15f17f" +checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202" dependencies = [ "pest", "pest_meta", @@ -7444,9 +7497,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.4" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02b677c1859756359fc9983c2e56a0237f18624a3789528804406b7e915e5d" +checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616" dependencies = [ "once_cell", "pest", @@ -7455,9 +7508,9 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -8705,7 +8758,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precompile-utils" version = "0.4.3" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "evm", "fp-evm", @@ -8728,7 +8781,7 @@ dependencies = [ [[package]] name = "precompile-utils-macro" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "num_enum", "proc-macro2", @@ -8843,9 +8896,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -9505,16 +9558,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.7" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", - "io-lifetimes 1.0.4", + "io-lifetimes 1.0.5", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -10862,9 +10915,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ "itoa", "ryu", @@ -10986,6 +11039,7 @@ dependencies = [ "log", "moonbeam-evm-tracer", "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-primitives-txpool", "pallet-assets", "pallet-assets-chain-extension", "pallet-aura", @@ -11088,6 +11142,7 @@ dependencies = [ "log", "moonbeam-evm-tracer", "moonbeam-rpc-primitives-debug", + "moonbeam-rpc-primitives-txpool", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -12443,12 +12498,11 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.3+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" dependencies = [ "cc", - "fs_extra", "libc", ] @@ -12512,9 +12566,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -13038,9 +13092,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -13048,9 +13102,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -13063,9 +13117,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -13075,9 +13129,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13085,9 +13139,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -13098,9 +13152,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-instrument" @@ -13381,9 +13435,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -13610,6 +13664,30 @@ dependencies = [ "windows_x86_64_msvc 0.42.1", ] +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.1" @@ -13796,7 +13874,7 @@ dependencies = [ [[package]] name = "xcm-primitives" version = "0.4.1" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "frame-support", "log", @@ -13840,7 +13918,7 @@ dependencies = [ [[package]] name = "xvm-chain-extension-types" version = "0.1.0" -source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#b2f888fafecb7257e68c5e9f0e9e661d1f8007c9" +source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.33#dea8a2135d202023162e3827e1019fb31f4926b7" dependencies = [ "parity-scale-codec", "scale-info", diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml index 2a0b68bc66..fb4c8be25c 100644 --- a/bin/collator/Cargo.toml +++ b/bin/collator/Cargo.toml @@ -129,7 +129,9 @@ try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "p moonbeam-primitives-ext = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } moonbeam-rpc-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } +moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } moonbeam-rpc-trace = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } +moonbeam-rpc-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33" } [build-dependencies] build-script-utils = { package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } diff --git a/bin/collator/src/cli.rs b/bin/collator/src/cli.rs index 4db09b97f5..3e2ea131d6 100644 --- a/bin/collator/src/cli.rs +++ b/bin/collator/src/cli.rs @@ -174,6 +174,8 @@ pub enum EthApi { Debug, /// Enable EVM trace RPC methods. Trace, + /// Enable pending transactions RPC methods. + TxPool, } impl std::str::FromStr for EthApi { @@ -183,6 +185,7 @@ impl std::str::FromStr for EthApi { Ok(match s { "debug" => Self::Debug, "trace" => Self::Trace, + "txpool" => Self::TxPool, _ => { return Err(format!( "`{}` is not recognized as a supported Ethereum Api", diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 9b44c84ce8..285198218b 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -322,6 +322,7 @@ pub fn start_node( let rpc_config = crate::rpc::EvmTracingConfig { tracing_requesters, trace_filter_max_count: tracing_config.ethapi_trace_max_count, + enable_txpool: true, }; Box::new(move |deny_unsafe, subscription| { diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index 7d2b91804d..2dc23a1bae 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -334,6 +334,7 @@ where + substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + moonbeam_rpc_primitives_debug::DebugRuntimeApi + + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + fp_rpc::ConvertTransactionRuntimeApi + cumulus_primitives_core::CollectCollationInfo, @@ -507,6 +508,7 @@ where let rpc_config = crate::rpc::EvmTracingConfig { tracing_requesters, trace_filter_max_count: tracing_config.ethapi_trace_max_count, + enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool), }; Box::new(move |deny_unsafe, subscription| { diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs index 010df318b1..64d39867a8 100644 --- a/bin/collator/src/rpc.rs +++ b/bin/collator/src/rpc.rs @@ -45,6 +45,7 @@ use substrate_frame_rpc_system::{System, SystemApiServer}; use moonbeam_rpc_debug::{Debug, DebugServer}; use moonbeam_rpc_trace::{Trace, TraceServer}; +use moonbeam_rpc_txpool::{TxPool, TxPoolServer}; use crate::primitives::*; @@ -54,6 +55,7 @@ pub mod tracing; pub struct EvmTracingConfig { pub tracing_requesters: tracing::RpcRequesters, pub trace_filter_max_count: u32, + pub enable_txpool: bool, } // TODO This is copied from frontier. It should be imported instead after @@ -167,6 +169,7 @@ where C::Api: substrate_frame_rpc_system::AccountNonceApi + pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi + moonbeam_rpc_primitives_debug::DebugRuntimeApi + + moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi + fp_rpc::ConvertTransactionRuntimeApi + fp_rpc::EthereumRuntimeRPCApi + BlockBuilder, @@ -207,7 +210,7 @@ where Eth::new( client.clone(), pool.clone(), - graph, + graph.clone(), no_tx_converter, network.clone(), Default::default(), @@ -252,6 +255,10 @@ where .into_rpc(), )?; + if tracing_config.enable_txpool { + io.merge(TxPool::new(Arc::clone(&client), graph).into_rpc())?; + } + if let Some(trace_filter_requester) = tracing_config.tracing_requesters.trace { io.merge( Trace::new( diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index aabdcb985a..bfb3c9a6f2 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -1,3 +1,5 @@ +// This file is part of Astar. + // Copyright (C) 2019-2023 Stake Technologies Pte.Ltd. // SPDX-License-Identifier: GPL-3.0-or-later @@ -14,6 +16,7 @@ // You should have received a copy of the GNU General Public License // along with Astar. If not, see . +///! EVM tracing RPC support. use crate::cli::EthApi as EthApiCmd; use fc_rpc::OverrideHandle; diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml index 207ed939a8..805d532fa9 100644 --- a/runtime/astar/Cargo.toml +++ b/runtime/astar/Cargo.toml @@ -103,6 +103,7 @@ xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = # Moonbeam tracing moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } [build-dependencies] substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33" } @@ -178,6 +179,7 @@ std = [ "frame-benchmarking/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", + "moonbeam-rpc-primitives-txpool/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index b3b6021924..44a81ef39b 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -1327,6 +1327,30 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi for Runtime { + fn extrinsic_filter( + xts_ready: Vec<::Extrinsic>, + xts_future: Vec<::Extrinsic>, + ) -> moonbeam_rpc_primitives_txpool::TxPoolResponse { + moonbeam_rpc_primitives_txpool::TxPoolResponse { + ready: xts_ready + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + future: xts_future + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + } + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml index d639ab5fcb..3ec04c6fae 100644 --- a/runtime/local/Cargo.toml +++ b/runtime/local/Cargo.toml @@ -75,6 +75,7 @@ pallet-xvm = { git = "https://github.com/AstarNetwork/astar-frame", branch = "po # Moonbeam tracing moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # chain-extensions pallet-assets-chain-extension = { git = "https://github.com/AstarNetwork/pallet-assets-chain-extension", branch = "polkadot-v0.9.33", default-features = false, features = ["substrate"] } @@ -155,6 +156,7 @@ std = [ "pallet-xvm/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", + "moonbeam-rpc-primitives-txpool/std", ] runtime-benchmarks = [ "frame-benchmarking", diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs index d4c611f910..df3a94a581 100644 --- a/runtime/local/src/lib.rs +++ b/runtime/local/src/lib.rs @@ -1530,6 +1530,30 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi for Runtime { + fn extrinsic_filter( + xts_ready: Vec<::Extrinsic>, + xts_future: Vec<::Extrinsic>, + ) -> moonbeam_rpc_primitives_txpool::TxPoolResponse { + moonbeam_rpc_primitives_txpool::TxPoolResponse { + ready: xts_ready + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + future: xts_future + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + } + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml index 7adc2d6c28..688aef8d39 100644 --- a/runtime/shibuya/Cargo.toml +++ b/runtime/shibuya/Cargo.toml @@ -108,6 +108,7 @@ xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = # Moonbeam tracing moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # chain-extensions pallet-assets-chain-extension = { git = "https://github.com/AstarNetwork/pallet-assets-chain-extension", branch = "polkadot-v0.9.33", default-features = false, features = ["substrate"] } @@ -214,6 +215,7 @@ std = [ "frame-try-runtime/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", + "moonbeam-rpc-primitives-txpool/std", "xcm/std", "xcm-builder/std", "xcm-executor/std", diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 378eb9a693..40ee426462 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -154,7 +154,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("shibuya"), impl_name: create_runtime_str!("shibuya"), authoring_version: 1, - spec_version: 87, + spec_version: 88, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, @@ -1769,6 +1769,30 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi for Runtime { + fn extrinsic_filter( + xts_ready: Vec<::Extrinsic>, + xts_future: Vec<::Extrinsic>, + ) -> moonbeam_rpc_primitives_txpool::TxPoolResponse { + moonbeam_rpc_primitives_txpool::TxPoolResponse { + ready: xts_ready + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + future: xts_future + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + } + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml index bc24e5d6c2..22d4819699 100644 --- a/runtime/shiden/Cargo.toml +++ b/runtime/shiden/Cargo.toml @@ -107,6 +107,7 @@ xcm-primitives = { git = "https://github.com/AstarNetwork/astar-frame", branch = # Moonbeam tracing moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } +moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.33", default-features = false } # Remove after migration is done pallet-contracts-migration = { path = "../contracts-migration", default-features = false } @@ -188,6 +189,7 @@ std = [ "pallet-collator-selection/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", + "moonbeam-rpc-primitives-txpool/std", "frame-benchmarking/std", "frame-try-runtime/std", "xcm/std", diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index 7c12b745eb..7035259735 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -1500,6 +1500,30 @@ impl_runtime_apis! { } } + impl moonbeam_rpc_primitives_txpool::TxPoolRuntimeApi for Runtime { + fn extrinsic_filter( + xts_ready: Vec<::Extrinsic>, + xts_future: Vec<::Extrinsic>, + ) -> moonbeam_rpc_primitives_txpool::TxPoolResponse { + moonbeam_rpc_primitives_txpool::TxPoolResponse { + ready: xts_ready + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + future: xts_future + .into_iter() + .filter_map(|xt| match xt.0.function { + RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction), + _ => None, + }) + .collect(), + } + } + } + #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> (Weight, Weight) { From 6ec6c471d75c2e614bdf40d3388d1c45a327870d Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 20 Feb 2023 11:20:01 +0300 Subject: [PATCH 09/10] Remove outdated migrations from runtimes --- runtime/astar/src/lib.rs | 4 ---- runtime/shibuya/src/lib.rs | 5 ----- runtime/shiden/src/lib.rs | 4 ---- 3 files changed, 13 deletions(-) diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs index 2791c79fae..bd3eb1f881 100644 --- a/runtime/astar/src/lib.rs +++ b/runtime/astar/src/lib.rs @@ -874,10 +874,6 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - ( - pallet_assets::migration::v1::MigrateToV1, - pallet_balances::migration::MigrateToTrackInactive, - ), >; impl fp_self_contained::SelfContainedCall for RuntimeCall { diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs index 62e257e4b1..aeb6fb593b 100644 --- a/runtime/shibuya/src/lib.rs +++ b/runtime/shibuya/src/lib.rs @@ -1270,11 +1270,6 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - ( - pallet_assets::migration::v1::MigrateToV1, - pallet_balances::migration::MigrateToTrackInactive, - pallet_scheduler::migration::v4::CleanupAgendas, - ), >; impl fp_self_contained::SelfContainedCall for RuntimeCall { diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs index c6f228153c..6ab0bbafde 100644 --- a/runtime/shiden/src/lib.rs +++ b/runtime/shiden/src/lib.rs @@ -996,10 +996,6 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - ( - pallet_assets::migration::v1::MigrateToV1, - pallet_balances::migration::MigrateToTrackInactive, - ), >; impl fp_self_contained::SelfContainedCall for RuntimeCall { From a6fc8ad5fcb429713894c156f413641fb1216aa3 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Tue, 7 Mar 2023 05:47:17 +0300 Subject: [PATCH 10/10] Sort review comments --- .github/workflows/release.yml | 2 +- bin/collator/src/command.rs | 10 +++++----- bin/collator/src/local/service.rs | 10 +++++----- bin/collator/src/parachain/service.rs | 20 ++++++++++---------- bin/collator/src/rpc/tracing.rs | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 41f1589cb1..9d87c86aaa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: matrix: target: - x86_64-unknown-linux-gnu -# - aarch64-unknown-linux-gnu + - aarch64-unknown-linux-gnu steps: - name: Checkout the source code diff --git a/bin/collator/src/command.rs b/bin/collator/src/command.rs index 6670c653c4..c45a00250d 100644 --- a/bin/collator/src/command.rs +++ b/bin/collator/src/command.rs @@ -819,7 +819,7 @@ pub fn run() -> Result<()> { let runner = cli.create_runner(&cli.run.normalize())?; let collator_options = cli.run.collator_options(); - let tracing_config = crate::cli::EvmTracingConfig { + let evm_tracing_config = crate::cli::EvmTracingConfig { ethapi: cli.ethapi, ethapi_max_permits: cli.ethapi_max_permits, ethapi_trace_max_count: cli.ethapi_trace_max_count, @@ -832,7 +832,7 @@ pub fn run() -> Result<()> { runner.run_node_until_exit(|config| async move { if config.chain_spec.is_dev() { - return local::start_node(config, tracing_config).map_err(Into::into); + return local::start_node(config, evm_tracing_config).map_err(Into::into); } let polkadot_cli = RelayChainCli::new( @@ -876,17 +876,17 @@ pub fn run() -> Result<()> { ); if config.chain_spec.is_astar() { - start_astar_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc) + start_astar_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc) .await .map(|r| r.0) .map_err(Into::into) } else if config.chain_spec.is_shiden() { - start_shiden_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc) + start_shiden_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc) .await .map(|r| r.0) .map_err(Into::into) } else if config.chain_spec.is_shibuya() { - start_shibuya_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc) + start_shibuya_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc) .await .map(|r| r.0) .map_err(Into::into) diff --git a/bin/collator/src/local/service.rs b/bin/collator/src/local/service.rs index 285198218b..422ef3e3bc 100644 --- a/bin/collator/src/local/service.rs +++ b/bin/collator/src/local/service.rs @@ -189,7 +189,7 @@ pub fn new_partial( /// Builds a new service. pub fn start_node( config: Configuration, - tracing_config: EvmTracingConfig, + evm_tracing_config: EvmTracingConfig, ) -> Result { let sc_service::PartialComponents { client, @@ -235,11 +235,11 @@ pub fn start_node( let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let overrides = crate::rpc::overrides_handle(client.clone()); - let ethapi_cmd = tracing_config.ethapi.clone(); + let ethapi_cmd = evm_tracing_config.ethapi.clone(); let tracing_requesters = if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { tracing::spawn_tracing_tasks( - &tracing_config, + &evm_tracing_config, tracing::SpawnTasksParams { task_manager: &task_manager, client: client.clone(), @@ -321,8 +321,8 @@ pub fn start_node( let transaction_pool = transaction_pool.clone(); let rpc_config = crate::rpc::EvmTracingConfig { tracing_requesters, - trace_filter_max_count: tracing_config.ethapi_trace_max_count, - enable_txpool: true, + trace_filter_max_count: evm_tracing_config.ethapi_trace_max_count, + enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool), }; Box::new(move |deny_unsafe, subscription| { diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs index 9102334454..8d60d58b01 100644 --- a/bin/collator/src/parachain/service.rs +++ b/bin/collator/src/parachain/service.rs @@ -316,7 +316,7 @@ async fn build_relay_chain_interface( async fn start_node_impl( parachain_config: Configuration, polkadot_config: Configuration, - tracing_config: EvmTracingConfig, + evm_tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, enable_evm_rpc: bool, @@ -441,11 +441,11 @@ where let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new())); let overrides = crate::rpc::overrides_handle(client.clone()); - let ethapi_cmd = tracing_config.ethapi.clone(); + let ethapi_cmd = evm_tracing_config.ethapi.clone(); let tracing_requesters = if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) { tracing::spawn_tracing_tasks( - &tracing_config, + &evm_tracing_config, tracing::SpawnTasksParams { task_manager: &task_manager, client: client.clone(), @@ -519,7 +519,7 @@ where let transaction_pool = transaction_pool.clone(); let rpc_config = crate::rpc::EvmTracingConfig { tracing_requesters, - trace_filter_max_count: tracing_config.ethapi_trace_max_count, + trace_filter_max_count: evm_tracing_config.ethapi_trace_max_count, enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool), }; @@ -711,7 +711,7 @@ where pub async fn start_astar_node( parachain_config: Configuration, polkadot_config: Configuration, - tracing_config: EvmTracingConfig, + evm_tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, enable_evm_rpc: bool, @@ -722,7 +722,7 @@ pub async fn start_astar_node( start_node_impl::( parachain_config, polkadot_config, - tracing_config, + evm_tracing_config, collator_options, id, enable_evm_rpc, @@ -843,7 +843,7 @@ pub async fn start_astar_node( pub async fn start_shiden_node( parachain_config: Configuration, polkadot_config: Configuration, - tracing_config: EvmTracingConfig, + evm_tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, enable_evm_rpc: bool, @@ -854,7 +854,7 @@ pub async fn start_shiden_node( start_node_impl::( parachain_config, polkadot_config, - tracing_config, + evm_tracing_config, collator_options, id, enable_evm_rpc, @@ -1001,7 +1001,7 @@ pub async fn start_shiden_node( pub async fn start_shibuya_node( parachain_config: Configuration, polkadot_config: Configuration, - tracing_config: EvmTracingConfig, + evm_tracing_config: EvmTracingConfig, collator_options: CollatorOptions, id: ParaId, enable_evm_rpc: bool, @@ -1012,7 +1012,7 @@ pub async fn start_shibuya_node( start_node_impl::( parachain_config, polkadot_config, - tracing_config, + evm_tracing_config, collator_options, id, enable_evm_rpc, diff --git a/bin/collator/src/rpc/tracing.rs b/bin/collator/src/rpc/tracing.rs index bfb3c9a6f2..1c514aa747 100644 --- a/bin/collator/src/rpc/tracing.rs +++ b/bin/collator/src/rpc/tracing.rs @@ -51,7 +51,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> { pub overrides: Arc>, } -// Spawn the tasks that are required to run a Moonbeam tracing node. +/// Spawn the tasks that are required to run a EVM tracing. pub fn spawn_tracing_tasks( rpc_config: &crate::cli::EvmTracingConfig, params: SpawnTasksParams,