From d45d6c35363bd4fed335fa80013e797c78938690 Mon Sep 17 00:00:00 2001 From: kukabi Date: Thu, 22 Feb 2024 14:09:14 +0300 Subject: [PATCH] Dependency updates. --- Cargo.lock | 559 ++++++++++++------ subvt-network-status-server/Cargo.toml | 2 +- subvt-persistence/src/postgres/app/user.rs | 6 +- .../src/postgres/network/onekv.rs | 4 +- .../src/postgres/network/staking.rs | 14 +- .../src/postgres/network/telemetry.rs | 2 +- subvt-substrate-client/Cargo.toml | 6 +- subvt-telemetry-processor/Cargo.toml | 2 +- subvt-types/Cargo.toml | 2 +- subvt-validator-details-server/Cargo.toml | 4 +- subvt-validator-list-server/Cargo.toml | 2 +- 11 files changed, 389 insertions(+), 214 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 66c74a2c..3c85e0cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -789,9 +789,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3609af4bbf701ddaf1f6bb4e6257dff4ff8932327d0e685d3f653724c258b1ac" +checksum = "ef0f8d64ef9351752fbe5462f242c625d9c4910d2bc3f7ec44c43857ca123f5d" dependencies = [ "futures-io", "futures-util", @@ -805,13 +805,23 @@ dependencies = [ [[package]] name = "atoi" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" dependencies = [ "num-traits", ] +[[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix", + "rand 0.8.5", +] + [[package]] name = "autocfg" version = "0.1.8" @@ -1102,9 +1112,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" [[package]] name = "bus" @@ -1114,7 +1124,7 @@ checksum = "4b7118d0221d84fada881b657c2ddb7cd55108db79c8764c9ee212c0c259b783" dependencies = [ "crossbeam-channel", "num_cpus", - "parking_lot_core 0.9.9", + "parking_lot_core", ] [[package]] @@ -1158,11 +1168,10 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" dependencies = [ - "jobserver", "libc", ] @@ -1278,10 +1287,11 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.1.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ + "is-terminal", "lazy_static", "windows-sys 0.48.0", ] @@ -1664,6 +1674,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", + "pem-rfc7468", "zeroize", ] @@ -1747,26 +1758,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dleq_vrf" version = "0.0.2" @@ -1915,6 +1906,9 @@ name = "either" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +dependencies = [ + "serde", +] [[package]] name = "elliptic-curve" @@ -2153,6 +2147,17 @@ dependencies = [ "backtrace", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -2306,6 +2311,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2634,13 +2650,13 @@ dependencies = [ [[package]] name = "futures-intrusive" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -3020,6 +3036,15 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3283,15 +3308,6 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "integer-sqrt" version = "0.1.5" @@ -3318,6 +3334,17 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3353,15 +3380,6 @@ dependencies = [ "uuid 0.8.2", ] -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -3390,9 +3408,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2" +checksum = "16fcc9dd231e72d22993f1643d5f7f0db785737dbe3c3d7ca222916ab4280795" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3408,9 +3426,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220" +checksum = "0476c96eb741b40d39dcb39d0124e3b9be9840ec77653c42a0996563ae2a53f7" dependencies = [ "futures-channel", "futures-util", @@ -3432,9 +3450,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c" +checksum = "b974d8f6139efbe8425f32cb33302aba6d5e049556b5bfc067874e7a0da54a2e" dependencies = [ "anyhow", "async-lock", @@ -3444,7 +3462,7 @@ dependencies = [ "futures-util", "hyper", "jsonrpsee-types", - "parking_lot 0.12.1", + "parking_lot", "pin-project", "rand 0.8.5", "rustc-hash", @@ -3459,9 +3477,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" +checksum = "19dc795a277cff37f27173b3ca790d042afcc0372c34a7ca068d2e76de2cb6d1" dependencies = [ "async-trait", "hyper", @@ -3479,12 +3497,12 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94b7505034e2737e688e1153bf81e6f93ad296695c43958d6da2e4321f0a990" +checksum = "68e79a7109506831bf0cbeaad08729cdf0e592300c00f626bccd6d479974221e" dependencies = [ "heck", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -3492,9 +3510,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc7c6d1a2c58f6135810284a390d9f823d0f508db74cd914d8237802de80f98" +checksum = "344440ccd8492c1ca65f1391c5aa03f91189db38d602d189b9266a1a5c6a4d22" dependencies = [ "futures-util", "http 0.2.11", @@ -3516,9 +3534,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b" +checksum = "b13dac43c1a9fc2648b37f306b0a5b0e29b2a6e1c36a33b95c1948da2494e9c5" dependencies = [ "anyhow", "beef", @@ -3529,9 +3547,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f36d27503d0efc0355c1630b74ecfb367050847bf7241a0ed75fab6dfa96c0" +checksum = "30593c401de5940c0267a3c5e9c7eb76d8a1b80590d6ccaa59d910ea688b4d5e" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -3540,9 +3558,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073c077471e89c4b511fa88b3df9a0f0abdf4a0a2e6683dd2ab36893af87bb2d" +checksum = "b1bbaaf4ce912654081d997ade417c3155727db106c617c0612e85f504c2f744" dependencies = [ "http 0.2.11", "jsonrpsee-client-transport", @@ -3603,6 +3621,9 @@ name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] [[package]] name = "lettre" @@ -3668,17 +3689,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall 0.4.1", -] - [[package]] name = "libsecp256k1" version = "0.7.1" @@ -3727,6 +3737,17 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -4018,9 +4039,9 @@ dependencies = [ [[package]] name = "mockito" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b" +checksum = "a8c84fe1f1d8c56dc157f79942056fad4b9efceebba374a01b222428b553facb" dependencies = [ "assert-json-diff", "colored", @@ -4080,6 +4101,17 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -4122,6 +4154,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.4.5" @@ -4156,6 +4205,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.4.1" @@ -4174,6 +4234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg 1.1.0", + "libm", ] [[package]] @@ -4259,9 +4320,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.100" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae94056a791d0e1217d18b6cbdccb02c61e3054fc69893607f4067e3bb0b1fd1" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -4744,17 +4805,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -4762,21 +4812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -4787,7 +4823,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -4822,6 +4858,15 @@ dependencies = [ "crypto-mac 0.11.0", ] +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + [[package]] name = "percent-encoding" version = "2.3.1" @@ -4949,6 +4994,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + [[package]] name = "pkcs8" version = "0.10.2" @@ -5335,7 +5391,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "parking_lot 0.12.1", + "parking_lot", "procfs", "protobuf", "thiserror", @@ -5588,15 +5644,6 @@ dependencies = [ "url", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -5606,17 +5653,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - [[package]] name = "ref-cast" version = "1.0.22" @@ -5835,6 +5871,26 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "rsa" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core 0.6.4", + "signature", + "spki", + "subtle", + "zeroize", +] + [[package]] name = "rust-ini" version = "0.19.0" @@ -6062,12 +6118,13 @@ dependencies = [ [[package]] name = "scale-bits" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" +checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" dependencies = [ "parity-scale-codec", "scale-info", + "scale-type-resolver", "serde", ] @@ -6097,6 +6154,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-type-resolver" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10b800069bfd43374e0f96f653e0d46882a2cb16d6d961ac43bea80f26c76843" + [[package]] name = "schannel" version = "0.1.23" @@ -6689,7 +6752,7 @@ dependencies = [ "log", "merlin 3.0.0", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot", "paste", "primitive-types", "rand 0.8.5", @@ -6715,7 +6778,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -6769,7 +6832,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "proc-macro2", "quote", @@ -6790,7 +6853,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "environmental", "parity-scale-codec", @@ -6854,7 +6917,7 @@ version = "0.34.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.7.1#70e569d5112f879001a987e94402ff70f9683cb5" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot", "sp-core", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.7.1)", "thiserror", @@ -6940,7 +7003,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -6972,7 +7035,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "Inflector", "expander", @@ -7019,7 +7082,7 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot", "rand 0.8.5", "smallvec", "sp-core", @@ -7040,7 +7103,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.7.1 [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" [[package]] name = "sp-storage" @@ -7058,7 +7121,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "impl-serde", "parity-scale-codec", @@ -7096,7 +7159,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "parity-scale-codec", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", @@ -7116,7 +7179,7 @@ dependencies = [ "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot", "rand 0.8.5", "scale-info", "schnellru", @@ -7173,7 +7236,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#ca382f32033d8350d49934b30680d8c30dd9bdfc" +source = "git+https://github.com/paritytech/polkadot-sdk#822082807fd6f146cd1c0561dc340dedab463c40" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -7209,6 +7272,9 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] [[package]] name = "spki" @@ -7233,92 +7299,198 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.2" -source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#8afb44dc08d686e088f4205de7b4a76a87eb0a23" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" dependencies = [ "sqlx-core", "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", ] [[package]] name = "sqlx-core" -version = "0.6.2" -source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#8afb44dc08d686e088f4205de7b4a76a87eb0a23" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" dependencies = [ - "ahash 0.7.8", + "ahash 0.8.9", "atoi", - "base64 0.13.1", - "bitflags 1.3.2", "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", - "dirs", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", "futures-core", "futures-intrusive", + "futures-io", "futures-util", "hashlink", "hex", - "hkdf", - "hmac 0.12.1", - "indexmap 1.9.3", - "itoa", - "libc", + "indexmap 2.2.3", "log", - "md-5", "memchr", "once_cell", "paste", "percent-encoding", - "rand 0.8.5", - "rustls 0.20.9", + "rustls 0.21.10", "rustls-pemfile 1.0.4", "serde", "serde_json", - "sha1", "sha2 0.10.8", "smallvec", "sqlformat", - "sqlx-rt", - "stringprep", "thiserror", + "tokio", "tokio-stream", + "tracing", "url", - "webpki-roots 0.22.6", - "whoami", + "webpki-roots 0.25.4", ] [[package]] name = "sqlx-macros" -version = "0.6.2" -source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#8afb44dc08d686e088f4205de7b4a76a87eb0a23" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck", + "hex", "once_cell", "proc-macro2", "quote", + "serde", + "serde_json", "sha2 0.10.8", "sqlx-core", - "sqlx-rt", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", "syn 1.0.109", + "tempfile", + "tokio", "url", ] [[package]] -name = "sqlx-rt" -version = "0.6.2" -source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#8afb44dc08d686e088f4205de7b4a76a87eb0a23" +name = "sqlx-mysql" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" +dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "bytes", + "chrono", + "crc", + "digest 0.10.7", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array 0.14.7", + "hex", + "hkdf", + "hmac 0.12.1", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" dependencies = [ + "atoi", + "base64 0.21.7", + "bitflags 2.4.2", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac 0.12.1", + "home", + "itoa", + "log", + "md-5", + "memchr", "once_cell", - "tokio", - "tokio-rustls 0.23.4", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.3" +source = "git+https://github.com/helikon-labs/sqlx.git?branch=helikon-increased-field-count#cf5b50c727b96f9b0d7daf70cf49659b36e895ee" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "tracing", + "url", + "urlencoding", ] [[package]] @@ -8142,9 +8314,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" @@ -8217,9 +8389,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -8328,7 +8500,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -8398,6 +8570,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -8802,9 +8975,9 @@ checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-segmentation" @@ -8853,6 +9026,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "usvg" version = "0.40.0" @@ -9294,10 +9473,6 @@ name = "whoami" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" -dependencies = [ - "wasm-bindgen", - "web-sys", -] [[package]] name = "wide" diff --git a/subvt-network-status-server/Cargo.toml b/subvt-network-status-server/Cargo.toml index 9f523ec3..1ec3b4d6 100644 --- a/subvt-network-status-server/Cargo.toml +++ b/subvt-network-status-server/Cargo.toml @@ -13,7 +13,7 @@ bus = "2.3" chrono = "0.4" env_logger = "0.11" futures-util = "0.3" -jsonrpsee = { version = "0.21", features = ["full"] } +jsonrpsee = { version = "0.22", features = ["full"] } lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" diff --git a/subvt-persistence/src/postgres/app/user.rs b/subvt-persistence/src/postgres/app/user.rs index 91b2639b..cef9af1a 100644 --- a/subvt-persistence/src/postgres/app/user.rs +++ b/subvt-persistence/src/postgres/app/user.rs @@ -610,7 +610,7 @@ impl PostgreSQLAppStorage { ) .bind(user_notification_rule_id) .bind(*user_validator_id as i32) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } // insert channel ids @@ -623,7 +623,7 @@ impl PostgreSQLAppStorage { ) .bind(user_notification_rule_id) .bind(*user_notification_channel_id as i32) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } // insert params @@ -637,7 +637,7 @@ impl PostgreSQLAppStorage { .bind(user_notification_rule_id) .bind(param.parameter_type_id as i32) .bind(¶m.value) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; diff --git a/subvt-persistence/src/postgres/network/onekv.rs b/subvt-persistence/src/postgres/network/onekv.rs index 6e71e745..e03f5d04 100644 --- a/subvt-persistence/src/postgres/network/onekv.rs +++ b/subvt-persistence/src/postgres/network/onekv.rs @@ -101,7 +101,7 @@ impl PostgreSQLNetworkStorage { .bind(validity.is_valid) .bind(&validity.ty) .bind(validity.updated_at as i64) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; @@ -254,7 +254,7 @@ impl PostgreSQLNetworkStorage { .bind(nominator_save_result.0) .bind(stash_account_id.to_string()) .bind(&nominee.name) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; diff --git a/subvt-persistence/src/postgres/network/staking.rs b/subvt-persistence/src/postgres/network/staking.rs index 6da4dbb9..2cc9dcaa 100644 --- a/subvt-persistence/src/postgres/network/staking.rs +++ b/subvt-persistence/src/postgres/network/staking.rs @@ -139,7 +139,7 @@ impl PostgreSQLNetworkStorage { "#, ) .bind(validator_account_id.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; // create controller account id (if not exists) let maybe_controller_account_id = bonded_account_id_map.get(validator_account_id); @@ -152,7 +152,7 @@ impl PostgreSQLNetworkStorage { "#, ) .bind(controller_account_id.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } let maybe_active_validator_index = active_validator_account_ids @@ -181,7 +181,7 @@ impl PostgreSQLNetworkStorage { .bind(maybe_validator_stake.map(|validator_stake| validator_stake.self_stake.to_string())) .bind(maybe_validator_stake.map(|validator_stake| validator_stake.total_stake.to_string())) .bind(maybe_validator_stake.map(|validator_stake| validator_stake.nominators.len() as i32)) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; @@ -199,7 +199,7 @@ impl PostgreSQLNetworkStorage { "#, ) .bind(validator_stake.account.id.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; for nominator_stake in &validator_stake.nominators { // create nominator account (if not exists) @@ -211,7 +211,7 @@ impl PostgreSQLNetworkStorage { "#, ) .bind(nominator_stake.account.id.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; sqlx::query( r#" @@ -224,7 +224,7 @@ impl PostgreSQLNetworkStorage { .bind(validator_stake.account.id.to_string()) .bind(nominator_stake.account.id.to_string()) .bind(nominator_stake.stake.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } } @@ -325,7 +325,7 @@ impl PostgreSQLNetworkStorage { .bind(reward_points as i64) .bind(era_index as i64) .bind(validator_account_id.to_string()) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; diff --git a/subvt-persistence/src/postgres/network/telemetry.rs b/subvt-persistence/src/postgres/network/telemetry.rs index 1ebd5c1e..730af77d 100644 --- a/subvt-persistence/src/postgres/network/telemetry.rs +++ b/subvt-persistence/src/postgres/network/telemetry.rs @@ -177,7 +177,7 @@ impl PostgreSQLNetworkStorage { .bind(node_id as i64) .bind(data.1[i]) .bind(data.0[i]) - .execute(&mut transaction) + .execute(&mut *transaction) .await?; } transaction.commit().await?; diff --git a/subvt-substrate-client/Cargo.toml b/subvt-substrate-client/Cargo.toml index b3ee2268..b769e284 100644 --- a/subvt-substrate-client/Cargo.toml +++ b/subvt-substrate-client/Cargo.toml @@ -13,9 +13,9 @@ byteorder = { version = "1.5", default-features = false } chrono = "0.4" frame-metadata = { version = "15.0", features = ["std", "v14"] } hex = "0.4" -jsonrpsee = { version = "0.21", features = ["full"] } -jsonrpsee-core = "0.21" -jsonrpsee-types = "0.21" +jsonrpsee = { version = "0.22", features = ["full"] } +jsonrpsee-core = "0.22" +jsonrpsee-types = "0.22" log = { workspace = true } parity-scale-codec = { version = "3.6", default-features = false, features = ["derive", "full"] } rustc-hash = "1.1" diff --git a/subvt-telemetry-processor/Cargo.toml b/subvt-telemetry-processor/Cargo.toml index 3b7366d8..525e6fcc 100644 --- a/subvt-telemetry-processor/Cargo.toml +++ b/subvt-telemetry-processor/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.67.0" anyhow = { workspace = true } async-lock = "3.3" async-trait = "0.1" -async-tungstenite = { version = "0.24", features = ["tokio-runtime", "tokio-native-tls"] } +async-tungstenite = { version = "0.25", features = ["tokio-runtime", "tokio-native-tls"] } futures = "0.3" lazy_static = { workspace = true } log = { workspace = true } diff --git a/subvt-types/Cargo.toml b/subvt-types/Cargo.toml index be12900c..b6dc7e38 100644 --- a/subvt-types/Cargo.toml +++ b/subvt-types/Cargo.toml @@ -38,5 +38,5 @@ sp-staking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "po sqlx = { git = "https://github.com/helikon-labs/sqlx.git", branch = "helikon-increased-field-count", features = ["postgres", "runtime-tokio-rustls", "chrono"] } subvt-proc-macro = { path = "../subvt-proc-macro" } subvt-utility = { path = "../subvt-utility" } -scale-bits = "0.4" +scale-bits = "0.5" thiserror = { workspace = true } diff --git a/subvt-validator-details-server/Cargo.toml b/subvt-validator-details-server/Cargo.toml index 42dd810e..a0cf69e5 100644 --- a/subvt-validator-details-server/Cargo.toml +++ b/subvt-validator-details-server/Cargo.toml @@ -11,8 +11,8 @@ anyhow = { workspace = true } async-trait = "0.1" bus = "2.4" futures-util = "0.3" -jsonrpsee = { version = "0.21", features = ["full"] } -jsonrpsee-core = "0.21" +jsonrpsee = { version = "0.22", features = ["full"] } +jsonrpsee-core = "0.22" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" diff --git a/subvt-validator-list-server/Cargo.toml b/subvt-validator-list-server/Cargo.toml index 28420f75..37c9d27c 100644 --- a/subvt-validator-list-server/Cargo.toml +++ b/subvt-validator-list-server/Cargo.toml @@ -14,7 +14,7 @@ chrono = "0.4" clap = "4.4" env_logger = "0.11" futures-util = "0.3" -jsonrpsee = { version = "0.21", features = ["full"] } +jsonrpsee = { version = "0.22", features = ["full"] } lazy_static = { workspace = true } log = { workspace = true } once_cell = "1"