diff --git a/Cargo.lock b/Cargo.lock index 7ff23900..5388c9f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,8 +14,9 @@ dependencies = [ [[package]] name = "ac-compose-macros" -version = "0.18.0" -source = "git+https://github.com/encointer/substrate-api-client.git?branch=crates-io-v0.18.0-sdk-v1.14#938c40437b74507c3c42efe306db59abbdf0dedf" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "547748311b7a98c54169ab6aea0bab9776a9773e6bc11c1edbfdbae2cdd89082" dependencies = [ "ac-primitives", "log", @@ -24,8 +25,9 @@ dependencies = [ [[package]] name = "ac-keystore" -version = "0.18.0" -source = "git+https://github.com/encointer/substrate-api-client.git?branch=crates-io-v0.18.0-sdk-v1.14#938c40437b74507c3c42efe306db59abbdf0dedf" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb9b95eb7be9718f346f4a6192c70150969a38fbd07f5f657e1fbf5a4d78c3c1" dependencies = [ "array-bytes", "async-trait", @@ -40,8 +42,9 @@ dependencies = [ [[package]] name = "ac-node-api" -version = "0.18.0" -source = "git+https://github.com/encointer/substrate-api-client.git?branch=crates-io-v0.18.0-sdk-v1.14#938c40437b74507c3c42efe306db59abbdf0dedf" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "939c45635506e5e4918ceda74254bbd92a56bb7f0864b211a2a1703d785a39d7" dependencies = [ "ac-primitives", "bitvec", @@ -68,8 +71,9 @@ dependencies = [ [[package]] name = "ac-primitives" -version = "0.18.0" -source = "git+https://github.com/encointer/substrate-api-client.git?branch=crates-io-v0.18.0-sdk-v1.14#938c40437b74507c3c42efe306db59abbdf0dedf" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353ae8dc3b509ba385b814453c7ab583fde60925b1d60371309238e0a3e5e854" dependencies = [ "frame-system", "impl-serde", @@ -654,15 +658,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" -dependencies = [ - "serde", -] - [[package]] name = "bincode" version = "1.3.3" @@ -688,7 +683,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.77", ] @@ -1977,7 +1972,7 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encointer-api-client-extension" -version = "13.3.2" +version = "14.4.0" dependencies = [ "ac-keystore", "async-trait", @@ -1998,9 +1993,9 @@ dependencies = [ [[package]] name = "encointer-balances-tx-payment" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0a21785d37fcc1d2bc52c4b962ed0ecc1ea0ad7b1421c84c57edb9e11a3d34" +checksum = "1f7fcaa7f5fc5cd9493884a4020a9b1d50cb3d26ad1a921e68a6c50310aff144" dependencies = [ "encointer-primitives", "frame-support", @@ -2015,9 +2010,9 @@ dependencies = [ [[package]] name = "encointer-balances-tx-payment-rpc" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be52dbf60dfd2fb559b495667ec20dc426fc61486e7aecf92ad668240cdfee8" +checksum = "267090e494d63a996e62673d02d5055098f599737989d6402f78d14712bfe0a7" dependencies = [ "encointer-balances-tx-payment-rpc-runtime-api", "encointer-primitives", @@ -2040,9 +2035,9 @@ dependencies = [ [[package]] name = "encointer-balances-tx-payment-rpc-runtime-api" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449bca6d70a53456d223f2da58189e56a69eff96249b3d660d7d6123d0c824e9" +checksum = "584f431b0780640fa3fa7f6637f2661cc317cd126a345bf4bba6809c7c0f891f" dependencies = [ "encointer-primitives", "frame-support", @@ -2054,9 +2049,9 @@ dependencies = [ [[package]] name = "encointer-ceremonies-assignment" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b698a2f681dee5795ef660661df3165d3287807ba4e78fcc874880b18b3f7ec" +checksum = "7d3890b05d20d81cd72e461b4e4a40e574f357bd8bd93095d60196bf85f0ca2b" dependencies = [ "encointer-primitives", "sp-runtime", @@ -2065,7 +2060,7 @@ dependencies = [ [[package]] name = "encointer-client-notee" -version = "1.14.5" +version = "1.16.0" dependencies = [ "ac-keystore", "array-bytes", @@ -2076,7 +2071,7 @@ dependencies = [ "encointer-ceremonies-assignment", "encointer-node-notee-runtime", "encointer-primitives", - "env_logger 0.9.3", + "env_logger", "frame-support", "frame-system", "futures", @@ -2103,9 +2098,9 @@ dependencies = [ [[package]] name = "encointer-meetup-validation" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf1aa5d61d721fdee928075eac65a2e457d9f63043d3ad43904dab6b4e16938" +checksum = "722b39de0c811f628d8f4667b9d10f119b7219b2fef4bd8e58f4c06ea2e25b02" dependencies = [ "encointer-primitives", "parity-scale-codec", @@ -2117,7 +2112,7 @@ dependencies = [ [[package]] name = "encointer-node-notee" -version = "1.14.5" +version = "1.16.0" dependencies = [ "clap 4.5.16", "encointer-balances-tx-payment-rpc", @@ -2177,7 +2172,7 @@ dependencies = [ [[package]] name = "encointer-node-notee-runtime" -version = "1.14.361" +version = "1.16.370" dependencies = [ "encointer-balances-tx-payment", "encointer-balances-tx-payment-rpc-runtime-api", @@ -2241,9 +2236,9 @@ dependencies = [ [[package]] name = "encointer-primitives" -version = "13.3.0" +version = "14.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f3cfb30d32e288aee27656132ebac5cc30b82ffb7e82eba92e568cdd0b1f25" +checksum = "a1b76f82da748ef0839a33162583133f9c9084d6469169ef7f9111242ebd9e73" dependencies = [ "bs58 0.5.1", "crc", @@ -2262,9 +2257,9 @@ dependencies = [ [[package]] name = "encointer-rpc" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e395feb33949c57d56411323afe3691f55c1ab2065f3b5b7b5102b338b96b679" +checksum = "056691be9935bef3baf16136467bf72d079b5470de95d08f283e6d35ad60f1d6" dependencies = [ "jsonrpsee", "jsonrpsee-core", @@ -2296,19 +2291,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.2" @@ -2330,9 +2312,9 @@ checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "ep-core" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "764f4e44c23280f490bcc465af0f0f790f860f2cb1a378d8caf6da4c3cc5c013" +checksum = "7252d3d17ddaf02f1f1dccce29db2de5d76fb94ed046c7b1e5a7d74e0b636cf5" dependencies = [ "array-bytes", "impl-serde", @@ -2473,7 +2455,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.10.2", + "env_logger", "log", ] @@ -2589,9 +2571,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709b26657ebbba53dc7bb616577375ca462b20fef1b00e8d9b20d2435e87f7bc" +checksum = "a01bdd47c2d541b38bd892da647d1e972c9d85b4ecd7094ad64f7600175da54d" dependencies = [ "frame-support", "frame-support-procedural", @@ -2608,16 +2590,15 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface", - "sp-std", "sp-storage", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "40.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49302558cac41cba0a28aa784615daea85c49253ecc6d6a6c4a8ee2f2303655a" +checksum = "c9767c33709062605ba6876fcc3e5f31fb37da393c1ab384813614870209dd94" dependencies = [ "Inflector", "array-bytes", @@ -2666,9 +2647,9 @@ dependencies = [ [[package]] name = "frame-executive" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d878830330eaa9e8b886279c338556b05702d0059989cb51cfb226b70bf3fa4" +checksum = "c365bf3879de25bbee28e9584096955a02fbe8d7e7624e10675800317f1cee5b" dependencies = [ "aquamarine", "frame-support", @@ -2680,7 +2661,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", "sp-tracing", ] @@ -2709,9 +2689,9 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf37fc730bf4b51e82a34c6357eebe32c04dbacf6525e0a7b9726f6a17ec9427" +checksum = "56ac71dbd97039c49fdd69f416a4dd5d8da3652fdcafc3738b45772ad79eb4ec" dependencies = [ "array-bytes", "docify", @@ -2725,9 +2705,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "36.0.1" +version = "38.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4d08149c28010bfa568dcfa832aea628fb794d4243794a13b1bdef1aa66fb1" +checksum = "f7dd8b9f161a8289e3b9fe6c1068519358dbff2270d38097a923d3d1b4459dca" dependencies = [ "aquamarine", "array-bytes", @@ -2767,9 +2747,9 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "30.0.2" +version = "30.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4662a809f559aea6234bd90940fa29df583a3c8124a3cf923f66a0d21126b7" +checksum = "5e8f9b6bc1517a6fcbf0b2377e5c8c6d39f5bb7862b191a59a9992081d63972d" dependencies = [ "Inflector", "cfg-expr", @@ -2811,9 +2791,9 @@ dependencies = [ [[package]] name = "frame-system" -version = "36.1.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6a0e7bb6503facdcc6f8e19c83cd0bfc8bbbd268522b1a50e107dfc6b972d" +checksum = "e3c7fa02f8c305496d2ae52edaecdb9d165f11afa965e05686d7d7dd1ce93611" dependencies = [ "cfg-if", "docify", @@ -2832,9 +2812,9 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15afc91c7780e18274dcea58ed1edb700c48d10e086a9785e3f6708099cd3250" +checksum = "9693b2a736beb076e673520e1e8dee4fc128b8d35b020ef3e8a4b1b5ad63d9f2" dependencies = [ "frame-benchmarking", "frame-support", @@ -2843,30 +2823,29 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9e2b7b85e451e367f4fb85ff3295bd039e17f64de1906154d3976e2638ee8" +checksum = "475c4f8604ba7e4f05cd2c881ba71105093e638b9591ec71a8db14a64b3b4ec3" dependencies = [ + "docify", "parity-scale-codec", "sp-api", ] [[package]] name = "frame-try-runtime" -version = "0.42.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6ba8b36a52775ad39ccfb45ff4ad814c3cb45ec74d0a4271889e00bd791c6c" +checksum = "83c811a5a1f5429c7fb5ebbf6cf9502d8f9b673fd395c12cf46c44a30a7daf0e" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std", ] [[package]] @@ -3857,9 +3836,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" +checksum = "c5c71d8c1a731cc4227c2f698d377e7848ca12c8a48866fc5e6951c43a4db843" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3872,9 +3851,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" +checksum = "548125b159ba1314104f5bb5f38519e03a41862786aa3925cf349aae9cdd546e" dependencies = [ "base64 0.22.1", "futures-util", @@ -3895,13 +3874,11 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" +checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280" dependencies = [ - "anyhow", "async-trait", - "beef", "bytes", "futures-timer", "futures-util", @@ -3912,7 +3889,7 @@ dependencies = [ "parking_lot 0.12.3", "pin-project", "rand", - "rustc-hash", + "rustc-hash 2.1.0", "serde", "serde_json", "thiserror", @@ -3923,9 +3900,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" +checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.2.0", @@ -3936,11 +3913,10 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" +checksum = "82ad8ddc14be1d4290cd68046e7d1d37acd408efed6d3ca08aefcc3ad6da069c" dependencies = [ - "anyhow", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -3964,11 +3940,10 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.23.2" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" +checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1" dependencies = [ - "beef", "http 1.1.0", "serde", "serde_json", @@ -4819,15 +4794,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -5563,9 +5529,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-asset-tx-payment" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100a180dfbf30a1c872100ec2dae8a61c0f5e8b3f2d3a5cbb34093826293e2ab" +checksum = "406a486466d15acc48c99420191f96f1af018f3381fde829c467aba489030f18" dependencies = [ "frame-benchmarking", "frame-support", @@ -5577,14 +5543,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-assets" -version = "37.0.0" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79ef6a7763fc08177f014052469ee12aefcdad0d99a747372360c2f648d2cc4" +checksum = "f45f4eb6027fc34c4650e0ed6a7e57ed3335cc364be74b4531f714237676bcee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5595,14 +5560,13 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-aura" -version = "35.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0861b2a1ad6526948567bb59a3fdc4c7f02ee79b07be8b931a544350ec35ab0c" +checksum = "b31da6e794d655d1f9c4da6557a57399538d75905a7862a2ed3f7e5fb711d7e4" dependencies = [ "frame-support", "frame-system", @@ -5613,14 +5577,13 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-authorship" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38885846dbcf03b025fdbd7edb3649046dbc68fa0b419ffe8837ef853a10d31f" +checksum = "625d47577cabbe1318ccec5d612e2379002d1b6af1ab6edcef3243c66ec246df" dependencies = [ "frame-support", "frame-system", @@ -5628,14 +5591,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-balances" -version = "37.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878e240962d3887f0e0654ac343a18845adb95ad493c9d4d5e803c015d4a4c3" +checksum = "5c6945b078919acb14d126490e4b0973a688568b30142476ca69c6df2bed27ad" dependencies = [ "docify", "frame-benchmarking", @@ -5645,14 +5607,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-encointer-balances" -version = "13.1.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fe03301d9f19ce476b6ce91e0531c6c91b6cb26df88ff4a490ab7493afe026" +checksum = "31e340c46f76c8d0c3d88868f817ee3f82e738b125fd6089af402c44af445803" dependencies = [ "approx", "encointer-primitives", @@ -5670,9 +5631,9 @@ dependencies = [ [[package]] name = "pallet-encointer-bazaar" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d38c490fdd90b649b3ec68a8bb25d3cdfaa11223122482737114e00e29f8a5" +checksum = "8119cf4debfaa60ee94b6a57868c6a5e8491a1aa5e129c51d9093852e90907b2" dependencies = [ "encointer-primitives", "frame-benchmarking", @@ -5688,9 +5649,9 @@ dependencies = [ [[package]] name = "pallet-encointer-bazaar-rpc" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a5d30a0befb2ecf70e6685799b6df7d6dfc41d090667955ac78b17eb7b2345" +checksum = "eb52ae7d9250d727451e8033abccb4c7023e52ccf459a6d3b944ec8412583516" dependencies = [ "encointer-primitives", "encointer-rpc", @@ -5709,9 +5670,9 @@ dependencies = [ [[package]] name = "pallet-encointer-bazaar-rpc-runtime-api" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfc381df1d6346e244994d4a5729b79b60f964ba4c13e29ea2f057627e1db25" +checksum = "e298ebe7c5b8f36ae47d470c6065bfa7b8aec1953c93358ab11004d1e0988632" dependencies = [ "encointer-primitives", "frame-support", @@ -5722,9 +5683,9 @@ dependencies = [ [[package]] name = "pallet-encointer-ceremonies" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b76d07f98908e1528413fc4f07162adaaadec0ebe8043fe1beb23ccd2b571b7a" +checksum = "2ee2cee62c5c2a816f5a5604f51c69d3db5818f47dbe9c98a6275f30fa8e2cb3" dependencies = [ "encointer-ceremonies-assignment", "encointer-meetup-validation", @@ -5748,9 +5709,9 @@ dependencies = [ [[package]] name = "pallet-encointer-ceremonies-rpc" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256f3d3dfc1cc47f0907a25799bb341ff24fc330fe7cd5e520bced57f1aaab35" +checksum = "b1942acaeca17b208dac37bc25394e8459c38db70a6af6270befcaf71ed25dbb" dependencies = [ "encointer-primitives", "encointer-rpc", @@ -5769,9 +5730,9 @@ dependencies = [ [[package]] name = "pallet-encointer-ceremonies-rpc-runtime-api" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c186e855a19f98ba75ef8d674e71533584620a3d7a8ff653631c391f7a4a9b79" +checksum = "8a1d61b552aab2114b3635c8c950c8dcf8f2af585477a43d06b3316fb238742d" dependencies = [ "encointer-primitives", "frame-support", @@ -5782,9 +5743,9 @@ dependencies = [ [[package]] name = "pallet-encointer-communities" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbd4cb15599fc47c662234cfdb2c1c63f39106c4099383d84c981fe5c40af0e" +checksum = "6f4fdd122abdd8d046adbb23699c305885a6cb2142bc4297cd801fc0cb8179f3" dependencies = [ "encointer-primitives", "frame-benchmarking", @@ -5802,9 +5763,9 @@ dependencies = [ [[package]] name = "pallet-encointer-communities-rpc" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "386da89b693e17af39c43c929a08f06e70311eecf97f666394e5c0a3bc47ccb5" +checksum = "9659c75d0cc80ec121523d631bb25051c214b5cd87c459e871d51f58453cca97" dependencies = [ "encointer-primitives", "encointer-rpc", @@ -5824,9 +5785,9 @@ dependencies = [ [[package]] name = "pallet-encointer-communities-rpc-runtime-api" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf0ab6667ef6adb7712810f90301e3047e2b7d18ef0e81017dfc9b823d8696f" +checksum = "a3485d8ecd6899a3c9d2e29ad9fcf404eea3c21b6a3c59fe62b767b4e1d7e61b" dependencies = [ "encointer-primitives", "parity-scale-codec", @@ -5836,9 +5797,9 @@ dependencies = [ [[package]] name = "pallet-encointer-democracy" -version = "13.3.1" +version = "14.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c965285fcc2af6c45c8c542df717cc0d45cd4186a4f78ec894819c14b22e92a2" +checksum = "199fb9312215f58acc26f63089e0d803327991c0fc4be66d97ac8c641fa9c465" dependencies = [ "encointer-primitives", "frame-benchmarking", @@ -5862,9 +5823,9 @@ dependencies = [ [[package]] name = "pallet-encointer-faucet" -version = "13.2.0" +version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3493685d55804d44c674429c7f6eae641700542a4295eea9604677a006ecd46" +checksum = "55868ee5af69fbda4c9e846b7fb1d1b5818a70aeb378ca7b8859694c65e36cf5" dependencies = [ "approx", "encointer-primitives", @@ -5883,9 +5844,9 @@ dependencies = [ [[package]] name = "pallet-encointer-reputation-commitments" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb74f5a90b77739db9829a5aa640afc002fd9ebe05ecf07dd61898a98909d5d" +checksum = "8cf93d7e68eedbd6a9bac69cfdf6d7ade00fbd1d08523361f0733b7b2441241d" dependencies = [ "approx", "encointer-primitives", @@ -5906,9 +5867,9 @@ dependencies = [ [[package]] name = "pallet-encointer-scheduler" -version = "13.1.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc3be9d4a09bd65fad4968354b320cd3cd1913950891293e00fbc879fc09b5d6" +checksum = "a1db5f74ee0a201eb39f08d769b1c9578fd6d68c619cf41f6acf927f765b6072" dependencies = [ "encointer-primitives", "frame-benchmarking", @@ -5925,9 +5886,9 @@ dependencies = [ [[package]] name = "pallet-encointer-treasuries" -version = "13.3.0" +version = "14.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f42991fce5d96f04106e5d27d4c12c77250d70da9ac95497e8fb17a3ebe99f" +checksum = "c7f402c461d1c79f74fc1e10cddc0599788767bb587c9ba536a84b595d095c33" dependencies = [ "approx", "encointer-primitives", @@ -5935,8 +5896,10 @@ dependencies = [ "frame-support", "frame-system", "log", + "pallet-encointer-balances", "pallet-encointer-communities", "pallet-encointer-reputation-commitments", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-core", @@ -5946,9 +5909,9 @@ dependencies = [ [[package]] name = "pallet-encointer-treasuries-rpc" -version = "13.3.0" +version = "14.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658ed30fe3057ca0fe7dcae5036710bfab4a90c9b48dc306f2d0c441c75ed26c" +checksum = "1d037a38a99c0e8380c1e0250cc51cc1ab211424789b899e3d9ad2c5848e9d26" dependencies = [ "encointer-primitives", "encointer-rpc", @@ -5969,9 +5932,9 @@ dependencies = [ [[package]] name = "pallet-encointer-treasuries-rpc-runtime-api" -version = "13.3.0" +version = "14.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8bcfc738dde3b75aba337d33ffb9cc109ac5c9f3fed24ce32f1f8c0ee39ab0" +checksum = "928962dcd8404a9bc6bfbca33f4fe5799f299455033efd44c75eb7c0f44b80f1" dependencies = [ "encointer-primitives", "frame-support", @@ -5983,9 +5946,9 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8244b686d5cae6a8af1557ed0f49db08f812f0e7942a8d2da554b4da8a69daf0" +checksum = "6d3a570a4aac3173ea46b600408183ca2bcfdaadc077f802f11e6055963e2449" dependencies = [ "frame-benchmarking", "frame-support", @@ -6002,14 +5965,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std", ] [[package]] name = "pallet-insecure-randomness-collective-flip" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30555c1b6d76cca7266b639f127a055a4974f5a0796859933cbfebc9a75753a2" +checksum = "dce7ad80675d78bd38a7a66ecbbf2d218dd32955e97f8e301d0afe6c87b0f251" dependencies = [ "frame-support", "frame-system", @@ -6017,14 +5979,13 @@ dependencies = [ "safe-mix", "scale-info", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-proxy" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4e12680e176607815a78a0cd10a52af50790292cb950404f30a885e2a7229e9" +checksum = "d39df395f0dbcf07dafe842916adea3266a87ce36ed87b5132184b6bcd746393" dependencies = [ "frame-benchmarking", "frame-support", @@ -6033,14 +5994,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-scheduler" -version = "37.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b170d6aa191197d3f50b1193925546972ffc394376ead4d2739eb40909b73c85" +checksum = "26899a331e7ab5f7d5966cbf203e1cf5bd99cd110356d7ddcaa7597087cdc0b5" dependencies = [ "docify", "frame-benchmarking", @@ -6051,15 +6011,14 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", "sp-weights", ] [[package]] name = "pallet-session" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c92b24c911c2cfa5351616edc7f2f93427ea6f4f95efdb13f0f5d51997939c3" +checksum = "8474b62b6b7622f891e83d922a589e2ad5be5471f5ca47d45831a797dba0b3f4" dependencies = [ "frame-support", "frame-system", @@ -6074,15 +6033,14 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std", "sp-trie", ] [[package]] name = "pallet-sudo" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd2a8797c1bb3d3897b4f87a7716111da5eeb8561345277b6e6d70349ec8b35" +checksum = "1574fe2aed3d52db4a389b77b53d8c9758257b121e3e7bbe24c4904e11681e0e" dependencies = [ "docify", "frame-benchmarking", @@ -6092,14 +6050,13 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-timestamp" -version = "35.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae789d344be857679b0b98b28a67c747119724847f81d704d3fd03ee13fb6841" +checksum = "a9ba9b71bbfd33ae672f23ba7efaeed2755fdac37b8f946cb7474fc37841b7e1" dependencies = [ "docify", "frame-benchmarking", @@ -6111,16 +6068,15 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std", "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" -version = "36.0.0" +version = "38.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74fb6114223c8d967c3c2f21cbc845e8ea604ff7e21a8e59d119d5a9257ba886" +checksum = "6cdb86580c72b58145f9cddba21a0c1814742ca56abc9caac3c1ac72f6bde649" dependencies = [ "frame-support", "frame-system", @@ -6130,14 +6086,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "38.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82898085607c7b00ef20fdce7c621790bf2b644c134918a172fe0a8f7f08e6c" +checksum = "291a021e6828d43b5165042d31691c5c20b5748ea8d5fc51e0359752482a04c2" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6152,9 +6107,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4bad1700ad7eb5ab254189e1df894d1d16b3626a3c4b9c45259ec4d9efc262c" +checksum = "49fdf5ab71e9dbcadcf7139736b6ea6bac8ec4a83985d46cbd130e1eec770e41" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6165,9 +6120,9 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "35.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c502615bb4fdd02856a131cb2a612ad40c26435ec938f65f11cae4ff230812b" +checksum = "98bfdd3bb9b58fb010bcd419ff5bf940817a8e404cdbf7886a53ac730f5dda2b" dependencies = [ "docify", "frame-benchmarking", @@ -6180,14 +6135,13 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std", ] [[package]] name = "pallet-utility" -version = "36.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3238fe6ad00da6a137be115904c39cab97eb5c7f03da0bb1a20de1bef03f0c71" +checksum = "2fdcade6efc0b66fc7fc4138964802c02d0ffb7380d894e26b9dd5073727d2b3" dependencies = [ "frame-benchmarking", "frame-support", @@ -6197,7 +6151,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std", ] [[package]] @@ -6973,7 +6926,7 @@ dependencies = [ "pin-project-lite", "quinn-proto 0.9.6", "quinn-udp 0.3.2", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.20.9", "thiserror", "tokio", @@ -6992,7 +6945,7 @@ dependencies = [ "pin-project-lite", "quinn-proto 0.10.6", "quinn-udp 0.4.1", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.21.12", "thiserror", "tokio", @@ -7008,7 +6961,7 @@ dependencies = [ "bytes", "rand", "ring 0.16.20", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.20.9", "slab", "thiserror", @@ -7026,7 +6979,7 @@ dependencies = [ "bytes", "rand", "ring 0.16.20", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.21.12", "slab", "thiserror", @@ -7240,7 +7193,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -7403,6 +7356,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -7663,9 +7622,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c31a124aa02343a17cb86cc714bc2b66ce18c7f17530178767388de8a37b152" +checksum = "2d3f4152eda19b140abc876a3b7434fce27c4c8cd47eff4095af0398d82f8141" dependencies = [ "futures", "futures-timer", @@ -7686,9 +7645,9 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.40.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6345fb862e10aaa7d88d6689a7c247448c40ae465253c83566dc76a17ec1426" +checksum = "f666f8ff11f96bf6d90676739eb7ccb6a156a4507634b7af83b94f0aa8195a50" dependencies = [ "parity-scale-codec", "sp-api", @@ -7702,9 +7661,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "35.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04100ec7ff9cf1f2052b05086c77cc216ff7268b8c4fe41007de420bc1f70be" +checksum = "3534c5dc910e6c9e0f25871948e7bb683852d1aef44b8b7753062feef4235e7c" dependencies = [ "array-bytes", "docify", @@ -7742,9 +7701,9 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.44.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a50b5a5de473b38de8a909b125b9747a30158900159e59251bb716f80d6d22" +checksum = "55a161ee7bf9d571c567f208b89ef4f2fd3c082180a54399403f7fdc44e94da5" dependencies = [ "array-bytes", "chrono", @@ -7784,9 +7743,9 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "35.1.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb517f4418644aeefd7c29bbe34bfc56ba8b5ea56e0b661a48a4d4d6afef40b" +checksum = "e73f1673cdfe658c4be6ffd5113b71c0de74616717e604455dcfd29e15781729" dependencies = [ "fnv", "futures", @@ -7812,9 +7771,9 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.42.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3c685871877f39df000ec446f65fc8d502a7cecfc437cdac59866349642dc3" +checksum = "5517718f03357325c6f51a780710fac652f125316f3577d1a25a7fbdc1816db2" dependencies = [ "hash-db", "kvdb", @@ -7839,9 +7798,9 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2927954d83d4c055a8699cad8ae093fc921ce73694da6773bd06d195e9a8dd" +checksum = "f64e538ab9edefbf0ddc105ff5b088344c88bc86f21650a2d2020be04a957730" dependencies = [ "async-trait", "futures", @@ -7864,9 +7823,9 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017320849a7fce8200da88ccf07785d461c4d144032788f09eb4316742649a38" +checksum = "067552bcf461c0089272b2575b2ac512fd8ca7a7bd7098aee49ccc4d67041787" dependencies = [ "async-trait", "futures", @@ -7894,9 +7853,9 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.27.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c6c62a03b54973f1a608a405908af0fe957fefaf77483cce96bd213eee7ed0" +checksum = "a3aaab70cf6f93ceea829ef0a4980ce95d84d5c7f4b5419b29bbed17fa04e1a6" dependencies = [ "ahash", "array-bytes", @@ -7939,9 +7898,9 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dca112d43c7785193362b33aa7941947bb84d65db9187abe72f1f7a969474c0" +checksum = "30fcce6ff513c2479c57eac880ba8d4254c146b678a0072d90f81796d47091df" dependencies = [ "async-trait", "futures", @@ -7963,9 +7922,9 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f5767bf6a6bad29365d6d08fcf940ee453d31457ed034cf14f0392877daafd" +checksum = "3f0cc0a3728fd033589183460c5a49b2e7545d09dc89a098216ef9e9aadcd9dc" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -8032,11 +7991,11 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c3751acd690bc469b859d0ad899b076642db9b107e31c28cbd99749b6ecb91" +checksum = "3c24f636bccd2df534d75b75bd61d96d8abb68a5fe6f6c427e9faee7d7a07a96" dependencies = [ - "ansi_term", + "console", "futures", "futures-timer", "log", @@ -8050,9 +8009,9 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "32.0.0" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267c8cfaceaeecb25484bad8668c17036016e46053a23509d44486474dbf44d3" +checksum = "4ebd4b5b5713006117641c049cb082e8a439dd6ac5e7b171e5cef5ce1c9f8af8" dependencies = [ "array-bytes", "parking_lot 0.12.3", @@ -8065,9 +8024,9 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.12.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a72a92dc72572a0facd73b410855d7f6edf38b32aef46c4798c74f25e595d5" +checksum = "781a1ffd953074e060a5f9e253f7a029bedd935fe9621bb7483cc2d442a6b1d1" dependencies = [ "array-bytes", "arrayvec", @@ -8095,9 +8054,9 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.42.0" +version = "0.45.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04be75f35cea819bae84be99cde138872b17494acf0e54f5f0ae8b0ed3fbe51a" +checksum = "a5d837e5375d0527829f7a272ed45d75e2d233b6d34fcfe8c1a8517c84a3ad58" dependencies = [ "array-bytes", "async-channel", @@ -8147,9 +8106,9 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec0c3c5629a418fb26b56963d40c5ca3fd02dd94eb5753e9eb72cea5c2eeb2f" +checksum = "dbff059c0ca497757f633cfa13625fbaa3028f23a77a9696e94e700008f8dd5a" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -8166,9 +8125,9 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae1836528495b6aa5140da39ed0278f5086c21ce530c37964db1b2e2c101ab1" +checksum = "d4086f4ac6b94ff2efd24f1776280c580454c5990b8665aa9f293fcd33c80630" dependencies = [ "ahash", "futures", @@ -8186,9 +8145,9 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.41.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e6deda277664336c26ea251cc1ebff7a165df0e3ad4ae23113380d9863ea40" +checksum = "8150e7a09695c60b09939a7815be4cc3fb48592779c197ba9442d29c0a98f8ad" dependencies = [ "array-bytes", "async-channel", @@ -8208,9 +8167,9 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.41.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9ab31b84534c487b9fb84e83db47890fcbd350f354b1e6484892d3d42d0020" +checksum = "82cb3b9939d57083495b3ed1304094b939c99ebdc651fb779ab6d2c83428679e" dependencies = [ "array-bytes", "async-channel", @@ -8246,9 +8205,9 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.41.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2eb55e29b0ca52ad3e209fe569b72dfe6b44cc1da7d722446d5a8333dff8e1" +checksum = "67c5bcf5f5437194d5fa9277fd4b832e187a595798f08b8df154bc62d88bbae2" dependencies = [ "array-bytes", "futures", @@ -8284,9 +8243,9 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "37.0.0" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038d77ad5f923ec4183d6b31c7432fdb56d12ee69cad2cff17d4a39caf933bcb" +checksum = "9185b82ad10f21f3eb977a079f772219bd216bf4eafedad7d5e4a0ff32383c75" dependencies = [ "array-bytes", "bytes", @@ -8329,9 +8288,9 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "37.0.0" +version = "40.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9cb792ddb5d0c3df89018e80290de4c769315fa59271bda0a0d29b2d182fdc" +checksum = "7137ecfd837c9b6e57244b59a99320a53c7e31f160b5581a325734f3c169aaba" dependencies = [ "futures", "jsonrpsee", @@ -8362,9 +8321,9 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b8adf62a207985cf7534abf0d940b335fda0a68eb902da05b7270ee30a6293" +checksum = "147274633577e55db73dbdc64168c25b54cca6cac4fcde118bd9946cf7b24838" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8383,10 +8342,11 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "16.0.2" +version = "17.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c14c236a01e03f55f16b92d89fd902cf2e4e9887357a3c36827a1e39b799c6b" +checksum = "4c769d12d80dcdfdad00890d7cf25923d5cf6e7594d91909ebcee8b1076a3c1c" dependencies = [ + "dyn-clone", "forwarded-header-value", "futures", "governor", @@ -8396,6 +8356,7 @@ dependencies = [ "ip_network", "jsonrpsee", "log", + "sc-rpc-api", "serde", "serde_json", "substrate-prometheus-endpoint", @@ -8406,9 +8367,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4242d30df623f68d5b937ae264cce85e734c35922e0bf196d7a59b8e7f7843c2" +checksum = "6ca6bcb95e13ca0d87bd2b2e23dcc4040b671b467f5cc647169fc9c37b0ce1f7" dependencies = [ "array-bytes", "futures", @@ -8439,9 +8400,9 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.43.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718b7e3a3963b09c2ab18ce13dbc43c0afa8b53169b67372fbcc4c4147b77e05" +checksum = "f438103f736c3fb4baddd3e40122191c878496671c76ca968a9fad9fcc107a28" dependencies = [ "async-trait", "directories", @@ -8516,9 +8477,9 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "35.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c00ab3d8f51c1905cc3c53cf441b9d94403c67f27968002ff7765248b0f3e6b" +checksum = "d78810e8fd4a91716eff951f2e80744a08efcc34f53446e60ca055d2cef2e0aa" dependencies = [ "derive_more", "futures", @@ -8538,9 +8499,9 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "22.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fc8e8ad7f84f2ca864ee361b6207fe21e18c8182c60f209732b2a7c0dcbd31" +checksum = "e9e28cab12625bcdb8828f9a1177b8d061972f90fda89a70c10763da50e0aaa5" dependencies = [ "chrono", "futures", @@ -8559,20 +8520,19 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "35.0.0" +version = "37.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61151f2d6b7ce3d7174484414dbc4e2f64b05a144c8f0a59ea02284e6c748a19" +checksum = "2604130246c4f6c2a2633f320bde95e7122383385c779b263eb03b714d92758a" dependencies = [ - "ansi_term", "chrono", + "console", "is-terminal", "lazy_static", "libc", "log", "parity-scale-codec", "parking_lot 0.12.3", - "regex", - "rustc-hash", + "rustc-hash 1.1.0", "sc-client-api", "sc-tracing-proc-macro", "serde", @@ -8584,8 +8544,8 @@ dependencies = [ "sp-tracing", "thiserror", "tracing", - "tracing-log 0.2.0", - "tracing-subscriber 0.3.18", + "tracing-log", + "tracing-subscriber", ] [[package]] @@ -8602,9 +8562,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "35.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "800e35d0d2f2b8e17170ec961d58756fe7891026b19d889be388b9585cb12f90" +checksum = "f716ef0dc78458f6ecb831cdb3b60ec804c1ed93313d7f98661beb5438dbbf71" dependencies = [ "async-trait", "futures", @@ -8630,9 +8590,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "35.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de6f60df6706970061e225e87d77aab9a764b258fe151b896a700419bc6b9d" +checksum = "f02936289a079360935685eee5400311994b25e9edb2420a3c4247d419a77f46" dependencies = [ "async-trait", "futures", @@ -9256,10 +9216,11 @@ dependencies = [ [[package]] name = "sp-api" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e43fbf034e9dbaa8ffc6a238a22808777eb38c580f66fc6736d8511631789e" +checksum = "bbce492e0482134128b7729ea36f5ef1a9f9b4de2d48ff8dde7b5e464e28ce75" dependencies = [ + "docify", "hash-db", "log", "parity-scale-codec", @@ -9271,7 +9232,6 @@ dependencies = [ "sp-runtime", "sp-runtime-interface", "sp-state-machine", - "sp-std", "sp-trie", "sp-version", "thiserror", @@ -9294,16 +9254,15 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "37.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d96d1fc0f1c741bbcbd0dd5470eff7b66f011708cc1942b088ebf0d4efb3d93" +checksum = "0d8133012faa5f75b2f0b1619d9f720c1424ac477152c143e5f7dbde2fe1a958" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std", ] [[package]] @@ -9324,9 +9283,9 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cf199dc4f9f77abd3fd91c409759118159ce6ffcd8bc90b229b684ccc8c981f" +checksum = "74738809461e3d4bd707b5b94e0e0c064a623a74a6a8fe5c98514417a02858dd" dependencies = [ "sp-api", "sp-inherents", @@ -9335,28 +9294,29 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "35.1.0" +version = "37.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27eb18b6ddf7d663f4886f7edba3eb73bd102d68cf10802c1f862e3b3db32ab" +checksum = "a309eecd6b5689f57e67181deaa628d9c8951db1ba0d26f07c69e14dffdc4765" dependencies = [ "futures", - "log", "parity-scale-codec", "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", + "sp-core", "sp-database", "sp-runtime", "sp-state-machine", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" -version = "0.39.1" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab094e8a7e9e5c7f05f8d90592aa1d1cf9b3f547d0dd401daff7ed98af942e12" +checksum = "ce75efd1e164be667a53c20182c45b4c2abe325abcbd21fc292b82be5b9240f7" dependencies = [ "async-trait", "futures", @@ -9370,9 +9330,9 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ebb90bf00f331b898eb729a1f707251846c1d5582d7467f083884799a69b89" +checksum = "7a8faaa05bbcb9c41f0cc535c4c1315abf6df472b53eae018678d1b4d811ac47" dependencies = [ "async-trait", "parity-scale-codec", @@ -9387,9 +9347,9 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "20.0.0" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dd06bf366c60f69411668b26d6ab3c55120aa6d423e6af0373ec23d8957300" +checksum = "587b791efe6c5f18e09dbbaf1ece0ee7b5fe51602c233e7151a3676b0de0260b" dependencies = [ "finality-grandpa", "log", @@ -9405,9 +9365,9 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ca60d713f8ddb03bbebcc755d5e6463fdc0b6259fabfc4221b20a5f1e428fd" +checksum = "bbafb7ed44f51c22fa277fb39b33dc601fa426133a8e2b53f3f46b10f07fba43" dependencies = [ "parity-scale-codec", "scale-info", @@ -9521,9 +9481,9 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd065854d96fd81521c103d0aaa287d4f08b9b15c9fae2a3bfb208b0812bf44" +checksum = "32a646ed222fd86d5680faa4a8967980eb32f644cae6c8523e1c689a6deda3e8" dependencies = [ "parity-scale-codec", "scale-info", @@ -9534,9 +9494,9 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53407ba38ec22ca4a16381722c4bd0b559a0428bc1713079b0d5163ada63186a" +checksum = "afffbddc380d99a90c459ba1554bbbc01d62e892de9f1485af6940b89c4c0d57" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9548,11 +9508,12 @@ dependencies = [ [[package]] name = "sp-io" -version = "37.0.0" +version = "38.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5036cad2e48d41f5caf6785226c8be1a7db15bec14a9fd7aa6cca84f34cf689f" +checksum = "59ef7eb561bb4839cc8424ce58c5ea236cbcca83f26fcc0426d8decfe8aa97d4" dependencies = [ "bytes", + "docify", "ed25519-dalek", "libsecp256k1", "log", @@ -9566,7 +9527,6 @@ dependencies = [ "sp-keystore", "sp-runtime-interface", "sp-state-machine", - "sp-std", "sp-tracing", "sp-trie", "tracing", @@ -9575,9 +9535,9 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "38.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03536e1ff3ec2bd8181eeaa26c0d682ebdcbd01548a055cf591077188b8c3f0" +checksum = "7c0e20624277f578b27f44ecfbe2ebc2e908488511ee2c900c5281599f700ab3" dependencies = [ "sp-core", "sp-runtime", @@ -9619,9 +9579,9 @@ dependencies = [ [[package]] name = "sp-mixnet" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f65a570519da820ce3dc35053497a65f9fbd3f5a7dc81fa03078ca263e9311e" +checksum = "3b0b017dd54823b6e62f9f7171a1df350972e5c6d0bf17e0c2f78680b5c31942" dependencies = [ "parity-scale-codec", "scale-info", @@ -9631,9 +9591,9 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbe721c367760bddf10fcfa24fb48edd64c442f71db971f043c8ac73f51aa6e9" +checksum = "2d9de237d72ecffd07f90826eef18360208b16d8de939d54e61591fac0fcbf99" dependencies = [ "sp-api", "sp-core", @@ -9657,16 +9617,16 @@ version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45458f0955870a92b3969098d4f1f4e9b55b4282d9f1dc112a51bb5bb6584900" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", "serde", "sp-core", ] [[package]] name = "sp-runtime" -version = "38.0.1" +version = "39.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5273900f0b0bef48b2e1ff9c4fb5e188b8168ee5891418a427f4be2af92ee40f" +checksum = "b1e00503b83cf48fffe48746b91b9b832d6785d4e2eeb0941558371eac6baac6" dependencies = [ "docify", "either", @@ -9725,9 +9685,9 @@ dependencies = [ [[package]] name = "sp-session" -version = "34.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4daf2e40ffc7e7e8de08efb860eb9534faf614a49c53dc282f430faedb4aed13" +checksum = "00a3a307fedc423fb8cd2a7726a3bbb99014f1b4b52f26153993e2aae3338fe6" dependencies = [ "parity-scale-codec", "scale-info", @@ -9740,9 +9700,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "33.0.0" +version = "36.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0b7abfe66c07a3b6eb99e1286dfa9b6f3b057b0e986e7da2ccbf707f6c781a" +checksum = "2a73eedb4b85f4cd420d31764827546aa22f82ce1646d0fd258993d051de7a90" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9754,9 +9714,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211e528aa6e902261a343f7b40840aa3d66fe4ad3aadbd04a035f10baf96dbc5" +checksum = "930104d6ae882626e8880d9b1578da9300655d337a3ffb45e130c608b6c89660" dependencies = [ "hash-db", "log", @@ -9775,9 +9735,9 @@ dependencies = [ [[package]] name = "sp-statement-store" -version = "17.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03aa86b1b46549889d32348bc85a8135c725665115567507231a6d85712aaac" +checksum = "c219bc34ef4d1f9835f3ed881f965643c32034fcc030eb33b759dadbc802c1c2" dependencies = [ "aes-gcm", "curve25519-dalek", @@ -9819,9 +9779,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78becf144a76f6fd108dfe94a90e20a185b38c0b310dc5482328196143c8266b" +checksum = "72a1cb4df653d62ccc0dbce1db45d1c9443ec60247ee9576962d24da4c9c6f07" dependencies = [ "async-trait", "parity-scale-codec", @@ -9832,21 +9792,21 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "17.0.0" +version = "17.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b3decf116db9f1dfaf1f1597096b043d0e12c952d3bcdc018c6d6b77deec7e" +checksum = "cf641a1d17268c8fcfdb8e0fa51a79c2d4222f4cfda5f3944dbdbc384dced8d5" dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3c9d1604aadc15b70e95f4388d0b1aa380215520b7ddfd372531a6d8262269c" +checksum = "fc4bf251059485a7dd38fe4afeda8792983511cc47f342ff4695e2dcae6b5247" dependencies = [ "sp-api", "sp-runtime", @@ -9854,9 +9814,9 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5a891cb913015bb99401e372255193cc3848c6fe5c2f6fe2383ef9588cb190" +checksum = "c765c2e9817d95f13d42a9f2295c60723464669765c6e5acbacebd2f54932f67" dependencies = [ "async-trait", "parity-scale-codec", @@ -9869,9 +9829,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "36.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d717c0f465f5371569e6fdc25b6f32d47c15d6e4c92b3b779e1c9b18b951d" +checksum = "6282aef9f4b6ecd95a67a45bcdb67a71f4a4155c09a53c10add4ffe823db18cd" dependencies = [ "ahash", "hash-db", @@ -9893,9 +9853,9 @@ dependencies = [ [[package]] name = "sp-version" -version = "36.0.0" +version = "37.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bccf96fefae339dee7c4453f91be64eb28cce4c2fe82130445cf096b18b2c081" +checksum = "d521a405707b5be561367cd3d442ff67588993de24062ce3adefcf8437ee9fe1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9923,9 +9883,9 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "21.0.0" +version = "21.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b04b919e150b4736d85089d49327eab65507deb1485eec929af69daa2278eb3" +checksum = "b066baa6d57951600b14ffe1243f54c47f9c23dd89c262e17ca00ae8dca58be9" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -10116,8 +10076,9 @@ dependencies = [ [[package]] name = "substrate-api-client" -version = "0.18.0" -source = "git+https://github.com/encointer/substrate-api-client.git?branch=crates-io-v0.18.0-sdk-v1.14#938c40437b74507c3c42efe306db59abbdf0dedf" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf106f871adbf78dc80502d8e426c7a667c0f4cc6d69a677ee0988af4c8590" dependencies = [ "ac-compose-macros", "ac-node-api", @@ -10177,9 +10138,9 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" -version = "36.0.0" +version = "39.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b8837de37f5ea6316846a63dc48489b63ebde05df73ba7d7077b3135487560" +checksum = "d071d325decc80d906afd957ee83673d1cbd27b7b421a7f1c9f6132a437e17fd" dependencies = [ "docify", "frame-system-rpc-runtime-api", @@ -10232,9 +10193,9 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "23.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dc993ad871b63fbba60362f3ea86583f5e7e1256e8fdcb3b5b249c9ead354bf" +checksum = "cf035ffe7335fb24053edfe4d0a5780250eda772082a1b80ae25835dd4c09265" dependencies = [ "array-bytes", "build-helper", @@ -10242,6 +10203,7 @@ dependencies = [ "console", "filetime", "frame-metadata 16.0.0", + "jobserver", "merkleized-metadata", "parity-scale-codec", "parity-wasm", @@ -10727,17 +10689,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -10749,45 +10700,13 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "parking_lot 0.12.3", @@ -10795,9 +10714,10 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", + "time", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 87fddece..fbf0c397 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,127 +13,127 @@ panic = 'unwind' [workspace.dependencies] async-trait = "0.1.68" clap = { version = "4.5.1", features = ["derive"] } -env_logger = "0.9.0" +env_logger = "0.10.2" futures = { version = "0.3.30", features = ["thread-pool"] } geojson = "0.22.2" hex = "0.4.3" log = "0.4.20" maybe-async = { version = "0.2.7" } -parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] } -scale-info = { version = "2.11.0", default-features = false, features = ["derive", "serde"] } -serde = { version = "1.0.197", default-features = false, features = ["alloc", "derive"] } +parity-scale-codec = { version = "3.6.12", default-features = false, features = ["derive"] } +scale-info = { version = "2.11.3", default-features = false, features = ["derive", "serde"] } +serde = { version = "1.0.209", default-features = false, features = ["alloc", "derive"] } serde_derive = { version = "1.0.117" } -serde_json = { version = "1.0.121", default-features = false, features = ["alloc"] } +serde_json = { version = "1.0.127", default-features = false, features = ["alloc"] } tokio = { version = "1.37", features = ["rt-multi-thread", "macros", "time"] } # encointer deps -encointer-balances-tx-payment = { default-features = false, version = "~13.1.0" } -encointer-balances-tx-payment-rpc = { version = "~13.1.0" } -encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~13.1.0" } -encointer-ceremonies-assignment = { version = "~13.1.0" } -encointer-primitives = { default-features = false, version = "~13.3.0" } -pallet-encointer-balances = { default-features = false, version = "~13.1.0" } -pallet-encointer-bazaar = { default-features = false, version = "~13.1.0" } -pallet-encointer-bazaar-rpc = { version = "~13.1.0" } -pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~13.1.0" } -pallet-encointer-ceremonies = { default-features = false, version = "~13.1.0" } -pallet-encointer-ceremonies-rpc = { version = "~13.1.0" } -pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~13.1.0" } -pallet-encointer-communities = { default-features = false, version = "~13.1.0" } -pallet-encointer-communities-rpc = { version = "~13.1.0" } -pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~13.1.0" } -pallet-encointer-democracy = { default-features = false, version = "~13.3.1" } -pallet-encointer-faucet = { default-features = false, version = "~13.2.0" } -pallet-encointer-reputation-commitments = { default-features = false, version = "~13.1.0" } -pallet-encointer-scheduler = { default-features = false, version = "~13.1.0" } -pallet-encointer-treasuries = { default-features = false, version = "~13.3.0" } -pallet-encointer-treasuries-rpc = { version = "~13.3.0" } -pallet-encointer-treasuries-rpc-runtime-api = { default-features = false, version = "~13.3.0" } +encointer-balances-tx-payment = { default-features = false, version = "~14.1.0" } +encointer-balances-tx-payment-rpc = { version = "~14.1.0" } +encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~14.1.0" } +encointer-ceremonies-assignment = { version = "~14.1.0" } +encointer-primitives = { default-features = false, version = "~14.4.0" } +pallet-encointer-balances = { default-features = false, version = "~14.2.0" } +pallet-encointer-bazaar = { default-features = false, version = "~14.1.0" } +pallet-encointer-bazaar-rpc = { version = "~14.1.0" } +pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~14.1.0" } +pallet-encointer-ceremonies = { default-features = false, version = "~14.1.0" } +pallet-encointer-ceremonies-rpc = { version = "~14.1.0" } +pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~14.1.0" } +pallet-encointer-communities = { default-features = false, version = "~14.1.0" } +pallet-encointer-communities-rpc = { version = "~14.1.0" } +pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~14.1.0" } +pallet-encointer-democracy = { default-features = false, version = "~14.4.0" } +pallet-encointer-faucet = { default-features = false, version = "~14.2.0" } +pallet-encointer-reputation-commitments = { default-features = false, version = "~14.1.0" } +pallet-encointer-scheduler = { default-features = false, version = "~14.1.0" } +pallet-encointer-treasuries = { default-features = false, version = "~14.4.1" } +pallet-encointer-treasuries-rpc = { version = "~14.3.0" } +pallet-encointer-treasuries-rpc-runtime-api = { default-features = false, version = "~14.3.0" } # substrate deps -frame-benchmarking = { version = "36.0.0", default-features = false } -frame-benchmarking-cli = { version = "40.0.0" } -frame-executive = { version = "36.0.0", default-features = false } -frame-metadata-hash-extension = { version = "0.4.0", default-features = false } -frame-support = { version = "36.0.0", default-features = false } -frame-system = { version = "36.1.0", default-features = false } -frame-system-benchmarking = { version = "36.0.0", default-features = false } -frame-system-rpc-runtime-api = { version = "33.0.0", default-features = false } -frame-try-runtime = { version = "0.42.0", default-features = false } +frame-benchmarking = { version = "38.0.0", default-features = false } +frame-benchmarking-cli = { version = "43.0.0" } +frame-executive = { version = "38.0.0", default-features = false } +frame-metadata-hash-extension = { version = "0.6.0", default-features = false } +frame-support = { version = "38.2.0", default-features = false } +frame-system = { version = "38.0.0", default-features = false } +frame-system-benchmarking = { version = "38.0.0", default-features = false } +frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false } +frame-try-runtime = { version = "0.44.0", default-features = false } hex-literal = { version = "0.4.1" } -jsonrpsee = { version = "0.23", features = ["server"] } -pallet-asset-tx-payment = { version = "36.0.0", default-features = false } -pallet-aura = { version = "35.0.0", default-features = false } -pallet-balances = { version = "37.0.0", default-features = false } -pallet-grandpa = { version = "36.0.0", default-features = false } -pallet-insecure-randomness-collective-flip = { version = "24.0.0", default-features = false } -pallet-proxy = { version = "36.0.0", default-features = false } -pallet-scheduler = { version = "37.0.0", default-features = false } -pallet-sudo = { version = "36.0.0", default-features = false } -pallet-timestamp = { version = "35.0.0", default-features = false } -pallet-transaction-payment = { version = "36.0.0", default-features = false } -pallet-transaction-payment-rpc = { version = "38.0.0" } -pallet-transaction-payment-rpc-runtime-api = { version = "36.0.0", default-features = false } -pallet-treasury = { version = "35.0.0", default-features = false } -pallet-utility = { version = "36.0.0", default-features = false } -sc-basic-authorship = { version = "0.42.0" } -sc-chain-spec = "35.0.0" -sc-cli = { version = "0.44.0" } -sc-client-api = { version = "35.1.0" } -sc-consensus = { version = "0.41.0" } -sc-consensus-aura = { version = "0.42.0" } -sc-consensus-grandpa = { version = "0.27.0" } -sc-executor = { version = "0.39.0" } -sc-keystore = { version = "32.0.0" } -sc-network = { version = "0.42.0" } -sc-offchain = { version = "37.0.0" } -sc-rpc = "37.0.0" -sc-rpc-api = "0.41.0" -sc-service = { version = "0.43.0" } -sc-telemetry = { version = "22.0.0" } -sc-transaction-pool = { version = "35.0.0" } -sc-transaction-pool-api = { version = "35.0.0" } -sp-api = { version = "33.0.0", default-features = false } -sp-application-crypto = { version = "37.0.0", default-features = false } +jsonrpsee = { version = "0.24.7", features = ["server"] } +pallet-asset-tx-payment = { version = "38.0.0", default-features = false } +pallet-aura = { version = "37.0.0", default-features = false } +pallet-balances = { version = "39.0.0", default-features = false } +pallet-grandpa = { version = "38.0.0", default-features = false } +pallet-insecure-randomness-collective-flip = { version = "26.0.0", default-features = false } +pallet-proxy = { version = "38.0.0", default-features = false } +pallet-scheduler = { version = "39.0.0", default-features = false } +pallet-sudo = { version = "38.0.0", default-features = false } +pallet-timestamp = { version = "37.0.0", default-features = false } +pallet-transaction-payment = { version = "38.0.2", default-features = false } +pallet-transaction-payment-rpc = { version = "41.0.0" } +pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false } +pallet-treasury = { version = "37.0.0", default-features = false } +pallet-utility = { version = "38.0.0", default-features = false } +sc-basic-authorship = { version = "0.45.0" } +sc-chain-spec = "38.0.0" +sc-cli = { version = "0.47.0" } +sc-client-api = { version = "37.0.0" } +sc-consensus = { version = "0.44.0" } +sc-consensus-aura = { version = "0.45.0" } +sc-consensus-grandpa = { version = "0.30.0" } +sc-executor = { version = "0.40.1" } +sc-keystore = { version = "33.0.0" } +sc-network = { version = "0.45.3" } +sc-offchain = { version = "40.0.0" } +sc-rpc = "40.0.0" +sc-rpc-api = "0.44.0" +sc-service = { version = "0.46.0" } +sc-telemetry = { version = "25.0.0" } +sc-transaction-pool = { version = "37.0.0" } +sc-transaction-pool-api = { version = "37.0.0" } +sp-api = { version = "34.0.0", default-features = false } +sp-application-crypto = { version = "38.0.0", default-features = false } sp-arithmetic = { version = "26.0.0", default-features = false } -sp-block-builder = { version = "33.0.0", default-features = false } -sp-blockchain = { version = "35.1.0", default-features = false } -sp-consensus = { version = "0.39.1", default-features = false } -sp-consensus-aura = { version = "0.39.0", default-features = false, features = ["serde"] } -sp-consensus-grandpa = { version = "20.0.0", default-features = false, features = ["serde"] } +sp-block-builder = { version = "34.0.0", default-features = false } +sp-blockchain = { version = "37.0.1", default-features = false } +sp-consensus = { version = "0.40.0", default-features = false } +sp-consensus-aura = { version = "0.40.0", default-features = false, features = ["serde"] } +sp-consensus-grandpa = { version = "21.0.0", default-features = false, features = ["serde"] } sp-core = { version = "34.0.0", default-features = false, features = ["serde"] } -sp-genesis-builder = { version = "0.14.0", default-features = false } -sp-inherents = { version = "33.0.0", default-features = false } -sp-io = { version = "37.0.0", default-features = false } -sp-keyring = { version = "38.0.0", default-features = false } +sp-genesis-builder = { version = "0.15.1", default-features = false } +sp-inherents = { version = "34.0.0", default-features = false } +sp-io = { version = "38.0.0", default-features = false } +sp-keyring = { version = "39.0.0", default-features = false } sp-keystore = { version = "0.40.0", default-features = false } -sp-offchain = { version = "33.0.0", default-features = false } +sp-offchain = { version = "34.0.0", default-features = false } sp-rpc = { version = "32.0.0", default-features = false } -sp-runtime = { version = "38.0.0", default-features = false, features = ["serde"] } -sp-session = { version = "34.0.0", default-features = false } -sp-staking = { version = "33.0.0", default-features = false } +sp-runtime = { version = "39.0.5", default-features = false, features = ["serde"] } +sp-session = { version = "36.0.0", default-features = false } +sp-staking = { version = "36.0.0", default-features = false } sp-std = { version = "14.0.0", default-features = false } sp-storage = { version = "21.0.0", default-features = false } -sp-timestamp = { version = "33.0.0", default-features = false } -sp-transaction-pool = { version = "33.0.0", default-features = false } -sp-version = { version = "36.0.0", default-features = false, features = ["serde"] } -substrate-frame-rpc-system = { version = "36.0.0", default-features = false } +sp-timestamp = { version = "34.0.0", default-features = false } +sp-transaction-pool = { version = "34.0.0", default-features = false } +sp-version = { version = "37.0.0", default-features = false, features = ["serde"] } +substrate-frame-rpc-system = { version = "39.0.0", default-features = false } -substrate-wasm-builder = "23.0.0" +substrate-wasm-builder = "24.0.1" substrate-build-script-utils = "11.0.0" -substrate-api-client = { version = "0.18.0", features = ["jsonrpsee-client", "disable-metadata-hash-check"] } -ac-keystore = { version = "0.18.0" } +substrate-api-client = { version = "1.16.0", features = ["jsonrpsee-client", "disable-metadata-hash-check"] } +ac-keystore = { version = "1.16.0" } [patch.crates-io] ## api client # patch needed because release 0.18 isn't depending on sdk 1.14 -ac-compose-macros = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } -ac-keystore = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } -ac-node-api = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } -ac-primitives = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } -substrate-api-client = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } +#ac-compose-macros = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } +#ac-keystore = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } +#ac-node-api = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } +#ac-primitives = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } +#substrate-api-client = { git = "https://github.com/encointer/substrate-api-client.git", branch = "crates-io-v0.18.0-sdk-v1.14" } ## local patching #ac-compose-macros = { path = "../../substrate-api-client/compose-macros" } #ac-node-api = { path = "../../substrate-api-client/node-api" } diff --git a/client/Cargo.toml b/client/Cargo.toml index b3216264..464d46db 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -3,7 +3,7 @@ name = "encointer-client-notee" authors = ["encointer.org "] edition = "2021" #keep with node version. major, minor and patch -version = "1.14.5" +version = "1.16.0" [dependencies] # todo migrate to clap >=3 https://github.com/encointer/encointer-node/issues/107 diff --git a/client/encointer-api-client-extension/Cargo.toml b/client/encointer-api-client-extension/Cargo.toml index 56083b02..c77f29ab 100644 --- a/client/encointer-api-client-extension/Cargo.toml +++ b/client/encointer-api-client-extension/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "encointer-api-client-extension" # align with encointer pallet crates versions -version = "13.3.2" +version = "14.4.0" edition = "2021" [dependencies] diff --git a/client/encointer-api-client-extension/src/ceremonies.rs b/client/encointer-api-client-extension/src/ceremonies.rs index dc550a4b..53e3a1ac 100644 --- a/client/encointer-api-client-extension/src/ceremonies.rs +++ b/client/encointer-api-client-extension/src/ceremonies.rs @@ -259,13 +259,13 @@ impl CeremoniesApi for Api { }; if let Some(p_index) = index_query("BootstrapperIndex").await? { - return Ok(Registration::new(p_index, RegistrationType::Bootstrapper)) + return Ok(Registration::new(p_index, RegistrationType::Bootstrapper)); } else if let Some(p_index) = index_query("ReputableIndex").await? { - return Ok(Registration::new(p_index, RegistrationType::Reputable)) + return Ok(Registration::new(p_index, RegistrationType::Reputable)); } else if let Some(p_index) = index_query("EndorseeIndex").await? { - return Ok(Registration::new(p_index, RegistrationType::Endorsee)) + return Ok(Registration::new(p_index, RegistrationType::Endorsee)); } else if let Some(p_index) = index_query("NewbieIndex").await? { - return Ok(Registration::new(p_index, RegistrationType::Newbie)) + return Ok(Registration::new(p_index, RegistrationType::Newbie)); } Err(ApiClientError::Other( @@ -294,7 +294,7 @@ impl CeremoniesApi for Api { if meetup_count == 0 { warn!("Meetup Count is 0."); - return Ok(None) + return Ok(None); } let assignments = self.get_assignments(community_ceremony, maybe_at).await?; @@ -355,7 +355,7 @@ impl CeremoniesApi for Api { "Invalid meetup index > meetup count: {meetup_index_zero_based}, {meetup_count}" ) .into(), - )) + )); } let params = self.get_assignments(community_ceremony, maybe_at).await?; @@ -564,11 +564,11 @@ async fn get_bootstrapper_or_reputable( maybe_at: Option, ) -> Result> { if p_index < assigned.bootstrappers { - return api.get_bootstrapper(community_ceremony, &(p_index + 1), maybe_at).await + return api.get_bootstrapper(community_ceremony, &(p_index + 1), maybe_at).await; } else if p_index < assigned.bootstrappers + assigned.reputables { return api .get_reputable(community_ceremony, &(p_index - assigned.bootstrappers + 1), maybe_at) - .await + .await; } Ok(None) diff --git a/client/encointer-api-client-extension/src/extrinsic_params.rs b/client/encointer-api-client-extension/src/extrinsic_params.rs index 13d57020..0463a724 100644 --- a/client/encointer-api-client-extension/src/extrinsic_params.rs +++ b/client/encointer-api-client-extension/src/extrinsic_params.rs @@ -1,5 +1,5 @@ use crate::{Api, CommunitiesApi, ExtrinsicAddress}; -use encointer_node_notee_runtime::{Hash, Index, Signature}; +use encointer_node_notee_runtime::{Hash, Nonce, Signature}; use encointer_primitives::communities::CommunityIdentifier; use parity_scale_codec::{Decode, Encode}; use substrate_api_client::ac_primitives::{ @@ -18,7 +18,7 @@ pub type EncointerXt = UncheckedExtrinsicV4< ExtrinsicAddress, Call, Signature, - GenericSignedExtra, + GenericSignedExtra, >; /// A tip payment made in the form of a specific asset. diff --git a/client/src/commands/encointer_core.rs b/client/src/commands/encointer_core.rs index 44620b98..49121731 100644 --- a/client/src/commands/encointer_core.rs +++ b/client/src/commands/encointer_core.rs @@ -303,12 +303,12 @@ async fn listen(matches: &ArgMatches<'_>) { if matches.is_present("events") && count >= value_t!(matches.value_of("events"), u32).unwrap() { - return + return; }; if matches.is_present("blocks") && blocks > value_t!(matches.value_of("blocks"), u32).unwrap() { - return + return; }; let event_results = subscription.next_events::().await.unwrap(); blocks += 1; diff --git a/client/src/commands/encointer_democracy.rs b/client/src/commands/encointer_democracy.rs index c7abdba6..61b968a8 100644 --- a/client/src/commands/encointer_democracy.rs +++ b/client/src/commands/encointer_democracy.rs @@ -47,7 +47,7 @@ pub fn submit_set_inactivity_timeout_proposal( api, "EncointerDemocracy", "submit_proposal", - ProposalAction::::SetInactivityTimeout(inactivity_timeout) + ProposalAction::::SetInactivityTimeout(inactivity_timeout) ) .unwrap(); ensure_payment(&api, &xt.encode().into(), tx_payment_cid_arg).await; @@ -78,7 +78,7 @@ pub fn submit_update_nominal_income_proposal( api, "EncointerDemocracy", "submit_proposal", - ProposalAction::::UpdateNominalIncome(cid, new_income) + ProposalAction::::UpdateNominalIncome(cid, new_income) ) .unwrap(); ensure_payment(&api, &xt.encode().into(), tx_payment_cid_arg).await; @@ -111,7 +111,10 @@ pub fn submit_update_demurrage_proposal( api, "EncointerDemocracy", "submit_proposal", - ProposalAction::::UpdateDemurrage(cid, new_demurrage_per_block) + ProposalAction::::UpdateDemurrage( + cid, + new_demurrage_per_block + ) ) .unwrap(); ensure_payment(&api, &xt.encode().into(), tx_payment_cid_arg).await; @@ -142,7 +145,7 @@ pub fn submit_petition(_args: &str, matches: &ArgMatches<'_>) -> Result<(), clap api, "EncointerDemocracy", "submit_proposal", - ProposalAction::::Petition(maybecid, demand.clone()) + ProposalAction::::Petition(maybecid, demand.clone()) ) .unwrap(); ensure_payment(&api, &xt.encode().into(), tx_payment_cid_arg).await; @@ -180,7 +183,7 @@ pub fn submit_spend_native_proposal( api, "EncointerDemocracy", "submit_proposal", - ProposalAction::::SpendNative(maybecid, to.clone(), amount) + ProposalAction::::SpendNative(maybecid, to.clone(), amount) ) .unwrap(); ensure_payment(&api, &xt.encode().into(), tx_payment_cid_arg).await; @@ -436,7 +439,7 @@ async fn get_relevant_electorate( api.get_global_reputation_count(c, maybe_at).await.unwrap_or(0), }; } - return count + return count; } else { panic!("couldn't fetch some values") } diff --git a/node/Cargo.toml b/node/Cargo.toml index 215eed7d..423425da 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/encointer/encointer-node" # * Align major and minor version with polkadot-sdk major.minor. # * Bump patch version for new releases, and make it the release tag. # * The client should follow this version. -version = "1.14.5" +version = "1.16.0" [[bin]] name = "encointer-node-notee" diff --git a/node/src/cli.rs b/node/src/cli.rs index 98037eb8..b2c53aa7 100644 --- a/node/src/cli.rs +++ b/node/src/cli.rs @@ -41,11 +41,6 @@ pub enum Subcommand { #[command(subcommand)] Benchmark(frame_benchmarking_cli::BenchmarkCmd), - /// Try-runtime has migrated to a standalone CLI - /// (). The subcommand exists as a stub and - /// deprecation notice. It will be removed entirely some time after Janurary 2024. - TryRuntime, - /// Db meta columns information. ChainInfo(sc_cli::ChainInfoCmd), } diff --git a/node/src/command.rs b/node/src/command.rs index ef1e3388..508cf30a 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -1,20 +1,3 @@ -// This file is part of Substrate. - -// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - use crate::{ benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder}, chain_spec, @@ -45,7 +28,7 @@ impl SubstrateCli for Cli { } fn support_url() -> String { - "CARGO_PKG_HOMEPAGE".into() + env!("CARGO_PKG_HOMEPAGE").into() } fn copyright_start_year() -> i32 { @@ -131,7 +114,7 @@ pub fn run() -> sc_cli::Result<()> { "Runtime benchmarking wasn't enabled when building the node. \ You can enable it with `--features runtime-benchmarks`." .into(), - ) + ); } cmd.run_with_spec::, ()>(Some( @@ -187,8 +170,6 @@ pub fn run() -> sc_cli::Result<()> { } }) }, - Some(Subcommand::TryRuntime) => - Err("TryRuntime is deprecated. use standalone cli instead".into()), Some(Subcommand::ChainInfo(cmd)) => { let runner = cli.create_runner(cmd)?; runner.sync_run(|config| cmd.run::(&config)) diff --git a/node/src/rpc.rs b/node/src/rpc.rs index a2ebc028..22bc5884 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use encointer_node_notee_runtime::{ - opaque::Block, AccountId, AssetBalance, AssetId, Balance, BlockNumber, Index, Moment, + opaque::Block, AccountId, AssetBalance, AssetId, Balance, BlockNumber, Moment, Nonce, }; use jsonrpsee::RpcModule; use sc_transaction_pool_api::TransactionPool; @@ -16,8 +16,6 @@ use sp_api::ProvideRuntimeApi; use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; -pub use sc_rpc_api::DenyUnsafe; - /// Full client dependencies. /// /// Note: `backend` and `offchain_indexing_enabled` are encointer customizations. @@ -30,8 +28,6 @@ pub struct FullDeps { pub backend: Arc, /// whether offchain-indexing is enabled pub offchain_indexing_enabled: bool, - /// Whether to deny unsafe calls - pub deny_unsafe: DenyUnsafe, } /// Instantiate all full RPC extensions. @@ -42,7 +38,7 @@ where C: ProvideRuntimeApi, C: HeaderBackend + HeaderMetadata + 'static, C: Send + Sync + 'static, - C::Api: substrate_frame_rpc_system::AccountNonceApi, + C::Api: substrate_frame_rpc_system::AccountNonceApi, C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, C::Api: BlockBuilder, C::Api: pallet_encointer_ceremonies_rpc_runtime_api::CeremoniesApi, @@ -69,9 +65,9 @@ where use substrate_frame_rpc_system::{System, SystemApiServer}; let mut module = RpcModule::new(()); - let FullDeps { client, pool, backend, offchain_indexing_enabled, deny_unsafe } = deps; + let FullDeps { client, pool, backend, offchain_indexing_enabled } = deps; - module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + module.merge(System::new(client.clone(), pool).into_rpc())?; module.merge(TransactionPayment::new(client.clone()).into_rpc())?; module.merge(BalancesTxPaymentRpc::new(client.clone()).into_rpc())?; @@ -95,7 +91,7 @@ where .merge(CeremoniesRpc::new(client, storage, offchain_indexing_enabled).into_rpc())?; }, None => log::warn!( - "Offchain caching disabled, due to lack of offchain storage support in backend. \n + "Offchain caching disabled, due to lack of offchain storage support in backend. \n Will not initialize custom RPCs for 'CommunitiesApi' and 'CeremoniesApi'" ), }; diff --git a/node/src/service.rs b/node/src/service.rs index 8ca4590c..071c50aa 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -5,7 +5,7 @@ use futures::FutureExt; use sc_client_api::{Backend, BlockBackend}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; use sc_consensus_grandpa::SharedVoterState; -use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams}; +use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncConfig}; use sc_telemetry::{Telemetry, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; @@ -48,7 +48,7 @@ pub fn new_partial(config: &Configuration) -> Result { }) .transpose()?; - let executor = sc_service::new_wasm_executor::(config); + let executor = sc_service::new_wasm_executor::(&config.executor); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( config, @@ -144,7 +144,7 @@ pub fn new_full< Block, ::Hash, N, - >::new(&config.network); + >::new(&config.network, config.prometheus_registry().cloned()); let metrics = N::register_notification_metrics(config.prometheus_registry()); let peer_store_handle = net_config.peer_store_handle(); @@ -175,7 +175,7 @@ pub fn new_full< spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)), + warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)), block_relay: None, metrics, })?; @@ -201,7 +201,7 @@ pub fn new_full< ); } - let role = config.role.clone(); + let role = config.role; let force_authoring = config.force_authoring; let backoff_authoring_blocks: Option<()> = None; let name = config.network.node_name.clone(); @@ -215,13 +215,12 @@ pub fn new_full< let offchain_indexing_enabled = config.offchain_worker.indexing_enabled; // `backend` and offchain_indexing_enabled` are encointer customizations. - Box::new(move |deny_unsafe, _| { + Box::new(move |_| { let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), backend: backend.clone(), offchain_indexing_enabled, - deny_unsafe, }; crate::rpc::create_full(deps).map_err(Into::into) diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 596c555b..37ef7650 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -7,7 +7,7 @@ name = "encointer-node-notee-runtime" repository = "https://github.com/encointer/encointer-node/" # minor revision must match node/client # patch revision must match runtime spec_version -version = "1.14.361" +version = "1.16.370" [dependencies] log = { workspace = true } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 9952a788..e29f1794 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -91,7 +91,7 @@ pub type AccountId = <::Signer as IdentifyAccount>::Account pub type Balance = u128; /// Index of a transaction in the chain. -pub type Index = u32; +pub type Nonce = u32; /// A hash of some data used by the chain. pub type Hash = sp_core::H256; @@ -137,7 +137,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("encointer-node-notee"), impl_name: create_runtime_str!("encointer-node-notee"), authoring_version: 0, - spec_version: 361, + spec_version: 370, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 5, @@ -272,7 +272,7 @@ impl frame_system::Config for Runtime { /// The identifier used to distinguish between accounts. type AccountId = AccountId; /// The index type for storing how many extrinsics an account has signed. - type Nonce = Index; + type Nonce = Nonce; /// The type for hashing blocks and tries. type Hash = Hash; /// Maximum number of block number to block hash mappings to keep (oldest pruned first). @@ -544,6 +544,7 @@ impl pallet_encointer_treasuries::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Currency = pallet_balances::Pallet; type PalletId = TreasuriesPalletId; + type WeightInfo = weights::pallet_encointer_treasuries::WeightInfo; } // Create the runtime by composing the FRAME pallets that were previously configured. @@ -576,7 +577,7 @@ construct_runtime!( EncointerReputationCommitments: pallet_encointer_reputation_commitments::{Pallet, Call, Storage, Event} = 65, EncointerFaucet: pallet_encointer_faucet::{Pallet, Call, Storage, Config, Event} = 66, EncointerDemocracy: pallet_encointer_democracy::{Pallet, Call, Storage, Config, Event} = 67, - EncointerTreasuries: pallet_encointer_treasuries::{Pallet, Event} = 68, + EncointerTreasuries: pallet_encointer_treasuries::{Pallet, Call, Storage, Event} = 68, } ); @@ -636,7 +637,7 @@ mod benches { [pallet_encointer_faucet, EncointerFaucet] [pallet_encointer_reputation_commitments, EncointerReputationCommitments] [pallet_encointer_scheduler, EncointerScheduler] - + [pallet_encointer_treasuries, EncointerTreasuries] ); } @@ -772,8 +773,8 @@ impl_runtime_apis! { } } - impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { - fn account_nonce(account: AccountId) -> Index { + impl frame_system_rpc_runtime_api::AccountNonceApi for Runtime { + fn account_nonce(account: AccountId) -> Nonce { System::account_nonce(account) } } diff --git a/runtime/src/weights/mod.rs b/runtime/src/weights/mod.rs index 42cb7397..638a226d 100644 --- a/runtime/src/weights/mod.rs +++ b/runtime/src/weights/mod.rs @@ -9,4 +9,5 @@ pub mod pallet_encointer_democracy; pub mod pallet_encointer_faucet; pub mod pallet_encointer_reputation_commitments; pub mod pallet_encointer_scheduler; -// pub mod pallet_treasury; + +pub mod pallet_encointer_treasuries; diff --git a/runtime/src/weights/pallet_encointer_treasuries.rs b/runtime/src/weights/pallet_encointer_treasuries.rs new file mode 100644 index 00000000..092a8366 --- /dev/null +++ b/runtime/src/weights/pallet_encointer_treasuries.rs @@ -0,0 +1,49 @@ +//! Autogenerated weights for `pallet_encointer_treasuries` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0 +//! DATE: 2025-01-14, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `caribe`, CPU: `12th Gen Intel(R) Core(TM) i7-1260P` +//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("./encointer-kusama-chain-spec.json")`, DB CACHE: 1024 + +// Executed Command: +// ./polkadot-omni-node-stable2412-runtime-benchmarks +// benchmark +// pallet +// --chain +// ./encointer-kusama-chain-spec.json +// --pallet=pallet-encointer-treasuries +// --extrinsic=* +// --output +// pallet_encointer_treasuries.rs + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] +#![allow(missing_docs)] + +use frame_support::{traits::Get, weights::Weight}; +use core::marker::PhantomData; + +/// Weight functions for `pallet_encointer_treasuries`. +pub struct WeightInfo(PhantomData); +impl pallet_encointer_treasuries::WeightInfo for WeightInfo { + /// Storage: `EncointerTreasuries::SwapNativeOptions` (r:1 w:1) + /// Proof: `EncointerTreasuries::SwapNativeOptions` (`max_values`: None, `max_size`: Some(134), added: 2609, mode: `MaxEncodedLen`) + /// Storage: `System::Account` (r:2 w:2) + /// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`) + /// Storage: `EncointerBalances::Balance` (r:2 w:2) + /// Proof: `EncointerBalances::Balance` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`) + /// Storage: `EncointerBalances::DemurragePerBlock` (r:1 w:0) + /// Proof: `EncointerBalances::DemurragePerBlock` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`) + fn swap_native() -> Weight { + // Proof Size summary in bytes: + // Measured: `733` + // Estimated: `6196` + // Minimum execution time: 70_344_000 picoseconds. + Weight::from_parts(72_445_000, 0) + .saturating_add(Weight::from_parts(0, 6196)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(5)) + } +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 90162a55..302ac766 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.78.0" +channel = "1.81.0" profile = "default" # include rustfmt, clippy components = [ "cargo",